external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-12-24 07:37:04 +00:00
Code Issues Releases Wiki Activity

now really merge 2204 changes

Browse Source
This commit is contained in:
KiekerJan 2022-05-25 22:26:08 +02:00
commit 2a6ecd38b3
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup/dkim.sh
View File

@ -120,9 +120,6 @@ tools/editconf.py /etc/postfix/main.cf \
# We need to explicitly enable the opendmarc service, or it will not start # We need to explicitly enable the opendmarc service, or it will not start
hide_output systemctl enable opendmarc hide_output systemctl enable opendmarc
# There is a fault in the dkim code for Ubuntu 20.04, let's fix it. Not necessary for Ubuntu 21.04 or newer
sed -i 's/return b""\.join(r\.items\[0\]\.strings)/return b""\.join(list(r\.items)\[0\]\.strings)/' /usr/lib/python3/dist-packages/dkim/dnsplug.py
# Restart services. # Restart services.
restart_service dkimpy-milter restart_service dkimpy-milter
restart_service opendmarc restart_service opendmarc

6
setup/nextcloud.sh
View File

@ -46,7 +46,7 @@ apt-get purge -qq -y owncloud* # we used to use the package manager
apt_install php php-fpm \ apt_install php php-fpm \
php-cli php-sqlite3 php-gd php-imap php-curl php-pear curl \ php-cli php-sqlite3 php-gd php-imap php-curl php-pear curl \
php-dev php-gd php-xml php-mbstring php-zip php-apcu php-json \ php-dev php-xml php-mbstring php-zip php-apcu php-json \
php-intl php-imagick php-gmp php-bcmath php-intl php-imagick php-gmp php-bcmath
# Enable apc is required before installing nextcloud # Enable apc is required before installing nextcloud
@ -324,7 +324,7 @@ php <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $STORAGE_ROOT/owncloud/config.php;
<?php <?php
include("$STORAGE_ROOT/owncloud/config.php"); include("$STORAGE_ROOT/owncloud/config.php");
\$CONFIG['config_is_read_only'] = false; # should prevent warnings from occ tool but doesn't \$CONFIG['config_is_read_only'] = true; # should prevent warnings from occ tool but doesn't
\$CONFIG['trusted_domains'] = array('$PRIMARY_HOSTNAME'); \$CONFIG['trusted_domains'] = array('$PRIMARY_HOSTNAME');
@ -346,8 +346,6 @@ echo ";";
EOF EOF
chown www-data.www-data $STORAGE_ROOT/owncloud/config.php chown www-data.www-data $STORAGE_ROOT/owncloud/config.php
# Need to change config if external_user is version 3.0.0 or higher, above works only on new installs
# Enable/disable apps. Note that this must be done after the Nextcloud setup. # Enable/disable apps. Note that this must be done after the Nextcloud setup.
# The firstrunwizard gave Josh all sorts of problems, so disabling that. # The firstrunwizard gave Josh all sorts of problems, so disabling that.
# user_external is what allows Nextcloud to use IMAP for login. The contacts # user_external is what allows Nextcloud to use IMAP for login. The contacts

3
setup/ssl.sh
View File

@ -40,6 +40,9 @@ apt_install openssl
mkdir -p $STORAGE_ROOT/ssl mkdir -p $STORAGE_ROOT/ssl
# make directory readable
chmod 755 $STORAGE_ROOT/ssl
# Generate a new private key. # Generate a new private key.
# #
# The key is only as good as the entropy available to openssl so that it # The key is only as good as the entropy available to openssl so that it

18
setup/system.sh
View File

@ -251,17 +251,13 @@ EOF
# Adjust apt update and upgrade timers such that they're always before daily status # Adjust apt update and upgrade timers such that they're always before daily status
# checks and thus never report upgrades unless user intervention is necessary. # checks and thus never report upgrades unless user intervention is necessary.
if [ ! -d /etc/systemd/system/apt-daily.timer.d ]; then mkdir -p /etc/systemd/system/apt-daily.timer.d
mkdir /etc/systemd/system/apt-daily.timer.d
fi
cat > /etc/systemd/system/apt-daily.timer.d/override.conf <<EOF; cat > /etc/systemd/system/apt-daily.timer.d/override.conf <<EOF;
[Timer] [Timer]
RandomizedDelaySec=5h RandomizedDelaySec=5h
EOF EOF
if [ ! -d /etc/systemd/system/apt-daily-upgrade.timer.d ]; then mkdir -p /etc/systemd/system/apt-daily-upgrade.timer.d
mkdir /etc/systemd/system/apt-daily-upgrade.timer.d
fi
cat > /etc/systemd/system/apt-daily-upgrade.timer.d/override.conf <<EOF; cat > /etc/systemd/system/apt-daily-upgrade.timer.d/override.conf <<EOF;
[Timer] [Timer]
OnCalendar= OnCalendar=
@ -336,15 +332,15 @@ fi #NODOC
# remove bind9 in case it is still there # remove bind9 in case it is still there
apt-get purge -qq -y bind9 bind9-utils apt-get purge -qq -y bind9 bind9-utils
# Install unbound and dns utils (e.g. dig)
apt_install unbound python3-unbound bind9-dnsutils
# Configure unbound # Configure unbound
cp -f conf/unbound.conf /etc/unbound/unbound.conf.d/miabunbound.conf cp -f conf/unbound.conf /etc/unbound/unbound.conf.d/miabunbound.conf
if [ ! -d /etc/unbound/lists.d ]; then mkdir -p /etc/unbound/lists.d
mkdir /etc/unbound/lists.d
fi
# Install unbound and dns utils (e.g. dig) systemctl restart unbound
apt_install unbound python3-unbound bind9-dnsutils
unbound-control -q status unbound-control -q status