Merge branch 'stretch' of https://github.com/bashrc/freedombone

src/freedombone-app-riot

@@ -32,9 +32,9 @@ IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
 NOT_ON_ONION=1
 
-RIOT_VERSION='0.13.3'
+RIOT_VERSION='0.15.3'
 RIOT_FILENAME="riot-v${RIOT_VERSION}"
-RIOT_HASH='bcd6c2f4be018612ac76a71b58749a5edab1e02de7d145a22d9b9aa6e6a89129'
+RIOT_HASH='0aecaa1c0d1e387c1730fea33cdb01b1a296e6146b7aef6a819fa90d9efc026e'
 RIOT_DOWNLOAD_URL="https://github.com/vector-im/riot-web/releases/download/v${RIOT_VERSION}"
 RIOT_ONION_PORT=8115
 RIOT_ONION_HOSTNAME=

src/freedombone-base-email

@@ -1694,4 +1694,34 @@ function install_email {
     mark_completed "${FUNCNAME[0]}"
 }
 
+function remove_ip_addresses_from_email_logs {
+    { echo '#!/bin/bash';
+      echo '';
+      echo 'if grep -q "= /dev/null" /etc/php/7.0/fpm/php-fpm.conf; then';
+      echo '    if [ -f /var/log/exim4/mainlog ]; then';
+      echo '        rm /var/log/exim4/mainlog';
+      echo '    fi';
+      echo '    if [ -f /var/log/exim4/rejectlog ]; then';
+      echo '        rm /var/log/exim4/rejectlog';
+      echo '    fi';
+      echo 'else';
+      echo '    if [ -f /var/log/exim4/mainlog ]; then';
+      echo "        if grep -q '\\[' /var/log/exim4/mainlog; then";
+      echo "            tail -n 50 /var/log/exim4/mainlog | sed 's/\\[[^][]*\\]//g' > /tmp/.exim4_mainlog";
+      echo '            chown Debian-exim:adm /tmp/.exim4_mainlog';
+      echo '            mv /tmp/.exim4_mainlog /var/log/exim4/mainlog';
+      echo '        fi';
+      echo '    fi';
+      echo '    if [ -f /var/log/exim4/rejectlog ]; then';
+      echo "        if grep -q '\\[' /var/log/exim4/rejectlog; then";
+      echo "            tail -n 50 /var/log/exim4/rejectlog | sed 's/\\[[^][]*\\]//g' > /tmp/.exim4_rejectlog";
+      echo '            chown Debian-exim:adm /tmp/.exim4_rejectlog';
+      echo '            mv /tmp/.exim4_rejectlog /var/log/exim4/rejectlog';
+      echo '        fi';
+      echo '    fi';
+      echo 'fi'; } > /usr/bin/exim_log_tidy
+    chmod +x /usr/bin/exim_log_tidy
+    cron_add_mins 1 '/usr/bin/exim_log_tidy'
+}
+
 # NOTE: deliberately no exit 0

src/freedombone-upgrade

@@ -107,6 +107,7 @@ if [ -d "$PROJECT_DIR" ]; then
         apt-get -yq -t stretch-backports install certbot
         email_install_tls
         email_disable_chunking
+        remove_ip_addresses_from_email_logs
         rm /etc/exim4/exim4.conf.template.bak*
         email_update_onion_domain
         prevent_mail_process_overrun

src/freedombone-utils-setup

@@ -1096,6 +1096,9 @@ function setup_email {
     function_check install_email
     install_email
 
+    function_check remove_ip_addresses_from_email_logs
+    remove_ip_addresses_from_email_logs
+
     function_check create_procmail
     create_procmail