From d017c8b04c1dcfae518008f1ac9eee275150a040 Mon Sep 17 00:00:00 2001 From: "github@kiekerjan.isdronken.nl" Date: Tue, 1 Feb 2022 22:48:09 +0100 Subject: [PATCH] fixes to installer --- setup/dkim.sh | 20 ++++++++++---------- setup/nextcloud.sh | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/setup/dkim.sh b/setup/dkim.sh index 0fa303e2..ee3efa8a 100755 --- a/setup/dkim.sh +++ b/setup/dkim.sh @@ -26,16 +26,16 @@ touch /etc/dkim/KeyTable touch /etc/dkim/SigningTable tools/editconf.py /etc/dkimpy-milter/dkimpy-milter.conf -s \ - "MacroList=daemon_name|ORIGINATING" - "MacroListVerify=daemon_name|VERIFYING" - "Canonicalization=relaxed/simple" - "MinimumKeyBits=1024" - "ExternalIgnoreList=refile:/etc/dkim/TrustedHosts" - "InternalHosts=refile:/etc/dkim/TrustedHosts" - "KeyTable=refile:/etc/dkim/KeyTable" - "KeyTableEd25519=refile:/etc/dkim/KeyTableEd25519" - "SigningTable=refile:/etc/dkim/SigningTable" - "Socket=inet:8892@127.0.0.1" + "MacroList=daemon_name|ORIGINATING" \ + "MacroListVerify=daemon_name|VERIFYING" \ + "Canonicalization=relaxed/simple" \ + "MinimumKeyBits=1024" \ + "ExternalIgnoreList=refile:/etc/dkim/TrustedHosts" \ + "InternalHosts=refile:/etc/dkim/TrustedHosts" \ + "KeyTable=refile:/etc/dkim/KeyTable" \ + "KeyTableEd25519=refile:/etc/dkim/KeyTableEd25519" \ + "SigningTable=refile:/etc/dkim/SigningTable" \ + "Socket=inet:8892@127.0.0.1" \ "RequireSafeKeys=false" # Create a new DKIM key. This creates mail.private and mail.txt diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh index 5a06fef6..ff7175cb 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -349,17 +349,17 @@ sudo -u www-data \ # Install interesting apps installed=$(sudo -u www-data php /usr/local/lib/owncloud/occ app:list | grep "notes") -if [ -z "$installed" ]; then +#if [ -z "$installed" ]; then sudo -u www-data php /usr/local/lib/owncloud/occ app:install notes -fi +#fi hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable notes installed=$(sudo -u www-data php /usr/local/lib/owncloud/occ app:list | grep 'twofactor_totp') -if [ -z "$installed" ]; then +#if [ -z "$installed" ]; then sudo -u www-data php /usr/local/lib/owncloud/occ app:install twofactor_totp -fi +#fi hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable twofactor_totp