From 5396437852627a4d602b6fc15fcc73fbddf9a787 Mon Sep 17 00:00:00 2001 From: kiekerjan Date: Sun, 15 May 2022 09:56:46 +0200 Subject: [PATCH 1/5] remove obsolete fix to dkimpy --- setup/dkim.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup/dkim.sh b/setup/dkim.sh index 7929260e..52ed809d 100755 --- a/setup/dkim.sh +++ b/setup/dkim.sh @@ -120,9 +120,6 @@ tools/editconf.py /etc/postfix/main.cf \ # We need to explicitly enable the opendmarc service, or it will not start 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_service dkimpy-milter restart_service opendmarc From 4457eaf3a4de42ddb7e286365208788b81c8bb8d Mon Sep 17 00:00:00 2001 From: KiekerJan Date: Sun, 15 May 2022 22:16:48 +0200 Subject: [PATCH 2/5] fixes to installation --- setup/nextcloud.sh | 2 +- setup/system.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh index ae12cccd..a90a8ed6 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -326,7 +326,7 @@ php < $CONFIG_TEMP && mv $CONFIG_TEMP $STORAGE_ROOT/owncloud/config.php; Date: Mon, 16 May 2022 08:34:40 +0200 Subject: [PATCH 3/5] nginx needs read access to provide letsencrypt challenges --- setup/ssl.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup/ssl.sh b/setup/ssl.sh index d4ec6d7f..69114033 100755 --- a/setup/ssl.sh +++ b/setup/ssl.sh @@ -40,6 +40,9 @@ apt_install openssl mkdir -p $STORAGE_ROOT/ssl +# make directory readable +chmod 755 $STORAGE_ROOT/ssl + # Generate a new private key. # # The key is only as good as the entropy available to openssl so that it From 90f0a0ae1deb6b8a81ce486f3ac1c174a5d440bc Mon Sep 17 00:00:00 2001 From: KiekerJan Date: Mon, 16 May 2022 08:42:00 +0200 Subject: [PATCH 4/5] simpler directory creation --- setup/system.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/setup/system.sh b/setup/system.sh index b2ee6f67..03b0d9df 100755 --- a/setup/system.sh +++ b/setup/system.sh @@ -251,17 +251,13 @@ EOF # 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. -if [ ! -d /etc/systemd/system/apt-daily.timer.d ]; then - mkdir /etc/systemd/system/apt-daily.timer.d -fi +mkdir -p /etc/systemd/system/apt-daily.timer.d cat > /etc/systemd/system/apt-daily.timer.d/override.conf < /etc/systemd/system/apt-daily-upgrade.timer.d/override.conf < Date: Tue, 24 May 2022 22:10:48 +0200 Subject: [PATCH 5/5] nextcloud update --- setup/nextcloud.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh index a90a8ed6..3869a367 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -46,7 +46,7 @@ apt-get purge -qq -y owncloud* # we used to use the package manager apt_install php php-fpm \ 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 # Enable apc is required before installing nextcloud @@ -54,8 +54,6 @@ tools/editconf.py /etc/php/$(php_version)/mods-available/apcu.ini -c ';' \ apc.enabled=1 \ apc.enable_cli=1 -restart_service php$(php_version)-fpm - InstallNextcloud() { version=$1 @@ -348,8 +346,6 @@ echo ";"; EOF 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. # The firstrunwizard gave Josh all sorts of problems, so disabling that. # user_external is what allows Nextcloud to use IMAP for login. The contacts