fixes to installer

This commit is contained in:
github@kiekerjan.isdronken.nl 2022-02-01 22:48:09 +01:00
parent 4f600cee15
commit d017c8b04c
2 changed files with 14 additions and 14 deletions

View File

@ -26,16 +26,16 @@ touch /etc/dkim/KeyTable
touch /etc/dkim/SigningTable touch /etc/dkim/SigningTable
tools/editconf.py /etc/dkimpy-milter/dkimpy-milter.conf -s \ tools/editconf.py /etc/dkimpy-milter/dkimpy-milter.conf -s \
"MacroList=daemon_name|ORIGINATING" "MacroList=daemon_name|ORIGINATING" \
"MacroListVerify=daemon_name|VERIFYING" "MacroListVerify=daemon_name|VERIFYING" \
"Canonicalization=relaxed/simple" "Canonicalization=relaxed/simple" \
"MinimumKeyBits=1024" "MinimumKeyBits=1024" \
"ExternalIgnoreList=refile:/etc/dkim/TrustedHosts" "ExternalIgnoreList=refile:/etc/dkim/TrustedHosts" \
"InternalHosts=refile:/etc/dkim/TrustedHosts" "InternalHosts=refile:/etc/dkim/TrustedHosts" \
"KeyTable=refile:/etc/dkim/KeyTable" "KeyTable=refile:/etc/dkim/KeyTable" \
"KeyTableEd25519=refile:/etc/dkim/KeyTableEd25519" "KeyTableEd25519=refile:/etc/dkim/KeyTableEd25519" \
"SigningTable=refile:/etc/dkim/SigningTable" "SigningTable=refile:/etc/dkim/SigningTable" \
"Socket=inet:8892@127.0.0.1" "Socket=inet:8892@127.0.0.1" \
"RequireSafeKeys=false" "RequireSafeKeys=false"
# Create a new DKIM key. This creates mail.private and mail.txt # Create a new DKIM key. This creates mail.private and mail.txt

View File

@ -349,17 +349,17 @@ sudo -u www-data \
# Install interesting apps # Install interesting apps
installed=$(sudo -u www-data php /usr/local/lib/owncloud/occ app:list | grep "notes") 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 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 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') 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 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 hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable twofactor_totp