From 606e66fe8079f88980572ae4261284d21319a2ea Mon Sep 17 00:00:00 2001 From: KiekerJan Date: Tue, 22 Jun 2021 23:33:11 +0200 Subject: [PATCH] fixes --- setup/dovecot-fts-xapian.sh | 2 +- setup/mail-postfix.sh | 8 ++++---- setup/nextcloud.sh | 8 ++++++-- 3 files changed, 11 insertions(+), 7 deletions(-) mode change 100644 => 100755 setup/dovecot-fts-xapian.sh diff --git a/setup/dovecot-fts-xapian.sh b/setup/dovecot-fts-xapian.sh old mode 100644 new mode 100755 index df370c67..4ba84096 --- a/setup/dovecot-fts-xapian.sh +++ b/setup/dovecot-fts-xapian.sh @@ -76,7 +76,7 @@ restart_service dovecot # and compare those to what actually exist in mailboxes. # This removes mails from the index that have already been expunged and makes # sure that the next doveadm index will index all the missing mails (if any). -doveadm fts rescan -A +# doveadm fts rescan -A # Adds unindexed files to the fts database # * `-q`: Queues the indexing to be run by indexer process. (will background the indexing) diff --git a/setup/mail-postfix.sh b/setup/mail-postfix.sh index ec0f72a2..208613cb 100755 --- a/setup/mail-postfix.sh +++ b/setup/mail-postfix.sh @@ -132,7 +132,7 @@ tools/editconf.py /etc/postfix/main.cf \ smtpd_tls_protocols="!SSLv2,!SSLv3,!TLSv1,!TLSv1.1" \ smtpd_tls_ciphers=medium \ tls_medium_cipherlist=ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA \ - smtpd_tls_exclude_ciphers=MD5, DES, ADH, RC4, PSD, SRP, 3DES, eNULL, aNULL \ + smtpd_tls_exclude_ciphers="MD5, DES, ADH, RC4, PSD, SRP, 3DES, eNULL, aNULL" \ tls_preempt_cipherlist=yes \ smtpd_tls_received_header=yes @@ -143,7 +143,7 @@ tools/editconf.py /etc/postfix/main.cf \ smtpd_tls_mandatory_protocols="!SSLv2,!SSLv3,!TLSv1,!TLSv1.1" \ smtpd_tls_mandatory_ciphers=high \ tls_high_cipherlist=ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384 \ - smtpd_tls_mandatory_exclude_ciphers=MD5, DES, ADH, RC4, PSD, SRP, 3DES, eNULL, aNULL + smtpd_tls_mandatory_exclude_ciphers="MD5, DES, ADH, RC4, PSD, SRP, 3DES, eNULL, aNULL" # Add block_root_external to block mail send to root@PRIMARY_HOSTNAME. This mail address is only supposed to be used for local # mail delivery (cron etc) @@ -192,8 +192,8 @@ tools/editconf.py /etc/postfix/main.cf \ tools/editconf.py /etc/postfix/main.cf \ smtp_tls_protocols="!SSLv2,!SSLv3,!TLSv1,!TLSv1.1" \ smtp_tls_ciphers=medium \ - smtp_tls_exclude_ciphers=MD5, DES, ADH, RC4, PSD, SRP, 3DES, eNULL, aNULL \ - smtp_tls_mandatory_exclude_ciphers = MD5, DES, ADH, RC4, PSD, SRP, 3DES, eNULL, aNULL \ + smtp_tls_exclude_ciphers="MD5, DES, ADH, RC4, PSD, SRP, 3DES, eNULL, aNULL" \ + smtp_tls_mandatory_exclude_ciphers="MD5, DES, ADH, RC4, PSD, SRP, 3DES, eNULL, aNULL" \ smtp_tls_security_level=dane \ smtp_dns_support_level=dnssec \ smtp_tls_mandatory_protocols="!SSLv2,!SSLv3,!TLSv1,!TLSv1.1" \ diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh index 6e14e289..3c471756 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -307,7 +307,6 @@ hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:disable hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable user_external hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable contacts hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable calendar -hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:install notes # When upgrading, run the upgrade script again now that apps are enabled. It seems like # the first upgrade at the top won't work because apps may be disabled during upgrade? @@ -320,7 +319,12 @@ sudo -u www-data \ php /usr/local/lib/owncloud/occ app:disable photos dashboard activity \ | (grep -v "No such app enabled" || /bin/true) # Install interesting apps -sudo -u www-data php /usr/local/lib/owncloud/occ app:install notes +installed=$(sudo -u www-data php /usr/local/lib/owncloud/occ app:list | grep 'notes') + +if [ -z "$installed" ]; then + sudo -u www-data php /usr/local/lib/owncloud/occ app:install notes +fi + # upgrade apps sudo -u www-data php /usr/local/lib/owncloud/occ app:update --all