fixes to installer
This commit is contained in:
parent
4f600cee15
commit
d017c8b04c
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue