From c0e54f87d70cd4b33b5e20e26d3ab454f0c0724f Mon Sep 17 00:00:00 2001 From: lamberete <74853880+lamberete@users.noreply.github.com> Date: Sat, 26 Mar 2022 13:45:49 +0100 Subject: [PATCH 01/14] Sorting ds records on report. When building the part of the report about the current DS records founded, they are added in the same order as they were received when calling query_dns(), which can differ from run to run. This was making the difflib.SequenceMatcher() method to find the same line removed and added one line later, and sending an Status Checks Change Notice email with the same line added and removed when there was actually no real changes. --- management/status_checks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/management/status_checks.py b/management/status_checks.py index d3c642c6..d45a2bcc 100755 --- a/management/status_checks.py +++ b/management/status_checks.py @@ -658,7 +658,7 @@ def check_dnssec(domain, env, output, dns_zonefiles, is_checking_primary=False): if len(ds) > 0: output.print_line("") output.print_line("The DS record is currently set to:") - for rr in ds: + for rr in sorted(ds): output.print_line("Key Tag: {0}, Algorithm: {1}, Digest Type: {2}, Digest: {3}".format(*rr)) def check_mail_domain(domain, env, output): From 6e40c69cb5e04b633384135417c451882dc594a9 Mon Sep 17 00:00:00 2001 From: lamberete <74853880+lamberete@users.noreply.github.com> Date: Sat, 26 Mar 2022 13:50:24 +0100 Subject: [PATCH 02/14] Error message using IPv4 instead of failing IPv6. One of the error messages around IPv6 was using the IPv4 for the output, making the error message confusing. --- management/status_checks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/management/status_checks.py b/management/status_checks.py index d45a2bcc..c66bf9b3 100755 --- a/management/status_checks.py +++ b/management/status_checks.py @@ -135,7 +135,7 @@ def check_service(i, service, env): # IPv4 ok but IPv6 failed. Try the PRIVATE_IPV6 address to see if the service is bound to the interface. elif service["port"] != 53 and try_connect(env["PRIVATE_IPV6"]): - output.print_error("%s is running (and available over IPv4 and the local IPv6 address), but it is not publicly accessible at %s:%d." % (service['name'], env['PUBLIC_IP'], service['port'])) + output.print_error("%s is running (and available over IPv4 and the local IPv6 address), but it is not publicly accessible at %s:%d." % (service['name'], env['PUBLIC_IPV6'], service['port'])) else: output.print_error("%s is running and available over IPv4 but is not accessible over IPv6 at %s port %d." % (service['name'], env['PUBLIC_IPV6'], service['port'])) From 6c58403616fa739c9f595027fa0101a1d98b143e Mon Sep 17 00:00:00 2001 From: KiekerJan Date: Sat, 23 Apr 2022 01:20:41 +0200 Subject: [PATCH 03/14] fixes to installation and compatibility with 22.04 --- setup/dovecot-fts-xapian.sh | 4 ++-- setup/nextcloud.sh | 10 ++++++---- setup/system.sh | 10 ++++------ setup/webmail.sh | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/setup/dovecot-fts-xapian.sh b/setup/dovecot-fts-xapian.sh index 47afda8d..67e553b5 100755 --- a/setup/dovecot-fts-xapian.sh +++ b/setup/dovecot-fts-xapian.sh @@ -17,7 +17,7 @@ source /etc/mailinabox.conf # load global vars echo "Installing fts-xapian..." -apt_install libxapian30 +apt_install dovecot-fts-xapian # Update the dovecot plugin configuration # @@ -35,7 +35,7 @@ if [ ! -f /usr/lib/dovecot/decode2text.sh ]; then cp -f /usr/share/doc/dovecot-core/examples/decode2text.sh /usr/lib/dovecot fi -cp -f lib/lib21_fts_xapian_plugin.so /usr/lib/dovecot/modules/ +#cp -f lib/lib21_fts_xapian_plugin.so /usr/lib/dovecot/modules/ # Create configuration file cat > /etc/dovecot/conf.d/90-plugin-fts.conf << EOF; diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh index 676eab9c..8e91977f 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -21,8 +21,8 @@ echo "Installing Nextcloud (contacts/calendar)..." # we automatically install intermediate versions as needed. # * The hash is the SHA1 hash of the ZIP package, which you can find by just running this script and # copying it from the error message when it doesn't match what is below. -nextcloud_ver=23.0.2 -nextcloud_hash=645cba42cab57029ebe29fb93906f58f7abea5f8 +nextcloud_ver=23.0.4 +nextcloud_hash=87afec0bf90b3c66289e6fedd851867bc5a58f01 # Nextcloud apps # -------------- @@ -37,7 +37,9 @@ contacts_ver=4.0.8 contacts_hash=9f368bb2be98c5555b7118648f4cc9fa51e8cb30 calendar_ver=3.0.6 calendar_hash=ca49bb1ce23f20e10911e39055fd59d7f7a84c30 -user_external_ver=3.0.0 +#user_external_ver=3.0.0 +#user_external_hash=6e5afe7f36f398f864bfdce9cad72200e70322aa +user_external_ver=2.1.0 user_external_hash=6e5afe7f36f398f864bfdce9cad72200e70322aa # Clear prior packages and install dependencies from apt. @@ -105,7 +107,7 @@ InstallNextcloud() { rm /tmp/user_external.tgz # (Temporary?) workaround to get user_external working with Nextcloud 23 (see https://github.com/nextcloud/user_external/issues/186) - # sed -i "s/nextcloud min-version=\"21\" max-version=\"22\"/nextcloud min-version=\"21\" max-version=\"23\"/g" /usr/local/lib/owncloud/apps/user_external/appinfo/info.xml + sed -i "s/nextcloud min-version=\"21\" max-version=\"22\"/nextcloud min-version=\"21\" max-version=\"23\"/g" /usr/local/lib/owncloud/apps/user_external/appinfo/info.xml fi # Fix weird permissions. diff --git a/setup/system.sh b/setup/system.sh index ef0f4870..4a43e616 100755 --- a/setup/system.sh +++ b/setup/system.sh @@ -262,7 +262,7 @@ EOF if [ ! -d /etc/systemd/system/apt-daily-upgrade.timer.d ]; then mkdir /etc/systemd/system/apt-daily-upgrade.timer.d fi -cat /etc/systemd/system/apt-daily-upgrade.timer.d/override.conf < /etc/systemd/system/apt-daily-upgrade.timer.d/override.conf < Date: Wed, 4 May 2022 16:09:53 -0500 Subject: [PATCH 04/14] Switched to using tags over releases for NextCloud contacts/calendar (#2105) See [mailinabox issue #2088](https://github.com/mail-in-a-box/mailinabox/issues/2088). This also updates the commit hashes to for anyone updating from NextCloud version 17 (as shown in the related issue) since a different hash is used for tags vs releases. This was tested and verified to work on a setup previously running v0.44 and then updating to the latest version (v56). --- setup/nextcloud.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh index d8ce7635..7116c172 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -34,9 +34,9 @@ nextcloud_hash=92cac708915f51ee2afc1787fd845476fd090c81 # * The hash is the SHA1 hash of the ZIP package, which you can find by just running this script and # copying it from the error message when it doesn't match what is below. contacts_ver=4.0.7 -contacts_hash=8ab31d205408e4f12067d8a4daa3595d46b513e3 +contacts_hash=45e7cf4bfe99cd8d03625cf9e5a1bb2e90549136 calendar_ver=3.0.4 -calendar_hash=6fb1e998d307c53245faf1c37a96eb982bbee8ba +calendar_hash=d0284b68135777ec9ca713c307216165b294d0fe user_external_ver=1.0.0 user_external_hash=3bf2609061d7214e7f0f69dd8883e55c4ec8f50a @@ -79,11 +79,11 @@ InstallNextcloud() { # their github repositories. mkdir -p /usr/local/lib/owncloud/apps - wget_verify https://github.com/nextcloud-releases/contacts/releases/download/v$version_contacts/contacts-v$version_contacts.tar.gz $hash_contacts /tmp/contacts.tgz + wget_verify https://github.com/nextcloud-releases/contacts/archive/refs/tags/v$version_contacts.tar.gz $hash_contacts /tmp/contacts.tgz tar xf /tmp/contacts.tgz -C /usr/local/lib/owncloud/apps/ rm /tmp/contacts.tgz - wget_verify https://github.com/nextcloud-releases/calendar/releases/download/v$version_calendar/calendar-v$version_calendar.tar.gz $hash_calendar /tmp/calendar.tgz + wget_verify https://github.com/nextcloud-releases/calendar/archive/refs/tags/v$version_calendar.tar.gz $hash_calendar /tmp/calendar.tgz tar xf /tmp/calendar.tgz -C /usr/local/lib/owncloud/apps/ rm /tmp/calendar.tgz @@ -183,25 +183,25 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc # During the upgrade from Nextcloud 14 to 15, user_external may cause the upgrade to fail. # We will disable it here before the upgrade and install it again after the upgrade. hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:disable user_external - InstallNextcloud 15.0.8 4129d8d4021c435f2e86876225fb7f15adf764a3 3.3.0 e55d0357c6785d3b1f3b5f21780cb6d41d32443a 2.0.3 9d9717b29337613b72c74e9914c69b74b346c466 0.7.0 555a94811daaf5bdd336c5e48a78aa8567b86437 + InstallNextcloud 15.0.8 4129d8d4021c435f2e86876225fb7f15adf764a3 3.3.0 e55d0357c6785d3b1f3b5f21780cb6d41d32443a 2.0.3 a1f3835c752929e3598eb94f22300516867ac6ab 0.7.0 555a94811daaf5bdd336c5e48a78aa8567b86437 CURRENT_NEXTCLOUD_VER="15.0.8" fi if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^15 ]]; then - InstallNextcloud 16.0.6 0bb3098455ec89f5af77a652aad553ad40a88819 3.3.0 e55d0357c6785d3b1f3b5f21780cb6d41d32443a 2.0.3 9d9717b29337613b72c74e9914c69b74b346c466 0.7.0 555a94811daaf5bdd336c5e48a78aa8567b86437 + InstallNextcloud 16.0.6 0bb3098455ec89f5af77a652aad553ad40a88819 3.3.0 e55d0357c6785d3b1f3b5f21780cb6d41d32443a 2.0.3 a1f3835c752929e3598eb94f22300516867ac6ab 0.7.0 555a94811daaf5bdd336c5e48a78aa8567b86437 CURRENT_NEXTCLOUD_VER="16.0.6" fi if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^16 ]]; then - InstallNextcloud 17.0.6 50b98d2c2f18510b9530e558ced9ab51eb4f11b0 3.3.0 e55d0357c6785d3b1f3b5f21780cb6d41d32443a 2.0.3 9d9717b29337613b72c74e9914c69b74b346c466 0.7.0 555a94811daaf5bdd336c5e48a78aa8567b86437 + InstallNextcloud 17.0.6 50b98d2c2f18510b9530e558ced9ab51eb4f11b0 3.3.0 e55d0357c6785d3b1f3b5f21780cb6d41d32443a 2.0.3 a1f3835c752929e3598eb94f22300516867ac6ab 0.7.0 555a94811daaf5bdd336c5e48a78aa8567b86437 CURRENT_NEXTCLOUD_VER="17.0.6" fi if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^17 ]]; then # Don't exit the install if this column already exists (see #2076) (echo "ALTER TABLE oc_flow_operations ADD COLUMN entity VARCHAR;" | sqlite3 $STORAGE_ROOT/owncloud/owncloud.db 2>/dev/null) || true - InstallNextcloud 18.0.10 39c0021a8b8477c3f1733fddefacfa5ebf921c68 3.4.1 aee680a75e95f26d9285efd3c1e25cf7f3bfd27e 2.0.3 9d9717b29337613b72c74e9914c69b74b346c466 1.0.0 3bf2609061d7214e7f0f69dd8883e55c4ec8f50a + InstallNextcloud 18.0.10 39c0021a8b8477c3f1733fddefacfa5ebf921c68 3.4.1 8f685e7dc99758636d660d595e389c324e51e9d1 2.0.3 a1f3835c752929e3598eb94f22300516867ac6ab 1.0.0 3bf2609061d7214e7f0f69dd8883e55c4ec8f50a CURRENT_NEXTCLOUD_VER="18.0.10" fi if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^18 ]]; then - InstallNextcloud 19.0.4 01e98791ba12f4860d3d4047b9803f97a1b55c60 3.4.1 aee680a75e95f26d9285efd3c1e25cf7f3bfd27e 2.0.3 9d9717b29337613b72c74e9914c69b74b346c466 1.0.0 3bf2609061d7214e7f0f69dd8883e55c4ec8f50a + InstallNextcloud 19.0.4 01e98791ba12f4860d3d4047b9803f97a1b55c60 3.4.1 8f685e7dc99758636d660d595e389c324e51e9d1 2.0.3 a1f3835c752929e3598eb94f22300516867ac6ab 1.0.0 3bf2609061d7214e7f0f69dd8883e55c4ec8f50a CURRENT_NEXTCLOUD_VER="19.0.4" fi fi From 314955a648fd9e35d7a7c16d867dc203e7cf3c05 Mon Sep 17 00:00:00 2001 From: KiekerJan Date: Thu, 12 May 2022 23:09:31 +0200 Subject: [PATCH 05/14] update nextcloud to 24 --- setup/nextcloud.sh | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh index 549f609d..ae12cccd 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -21,8 +21,8 @@ echo "Installing Nextcloud (contacts/calendar)..." # we automatically install intermediate versions as needed. # * The hash is the SHA1 hash of the ZIP package, which you can find by just running this script and # copying it from the error message when it doesn't match what is below. -nextcloud_ver=23.0.2 -nextcloud_hash=645cba42cab57029ebe29fb93906f58f7abea5f8 +nextcloud_ver=24.0.0 +nextcloud_hash=f072f5863a15cefe577b47f72bb3e41d2a339335 # Nextcloud apps # -------------- @@ -34,11 +34,11 @@ nextcloud_hash=645cba42cab57029ebe29fb93906f58f7abea5f8 # * The hash is the SHA1 hash of the ZIP package, which you can find by just running this script and # copying it from the error message when it doesn't match what is below. contacts_ver=4.0.8 -contacts_hash=9f368bb2be98c5555b7118648f4cc9fa51e8cb30 +contacts_hash=fc626ec02732da13a4c600baae64ab40557afdca calendar_ver=3.0.6 -calendar_hash=ca49bb1ce23f20e10911e39055fd59d7f7a84c30 +calendar_hash=e40d919b4b7988b46671a78cb32a43d8c7cba332 user_external_ver=3.0.0 -user_external_hash=6e5afe7f36f398f864bfdce9cad72200e70322aa +user_external_hash=9e7aaf7288032bd463c480bc368ff91869122950 # Clear prior packages and install dependencies from apt. @@ -100,12 +100,9 @@ InstallNextcloud() { # Starting with Nextcloud 15, the app user_external is no longer included in Nextcloud core, # we will install from their github repository. if [ -n "$version_user_external" ]; then - wget_verify https://github.com/nextcloud/user_external/releases/download/v$version_user_external/user_external-$version_user_external.tar.gz $hash_user_external /tmp/user_external.tgz + wget_verify https://github.com/nextcloud/user_external/archive/refs/tags/v$version_user_external.tar.gz $hash_user_external /tmp/user_external.tgz tar -xf /tmp/user_external.tgz -C /usr/local/lib/owncloud/apps/ rm /tmp/user_external.tgz - - # (Temporary?) workaround to get user_external working with Nextcloud 23 (see https://github.com/nextcloud/user_external/issues/186) - # sed -i "s/nextcloud min-version=\"21\" max-version=\"22\"/nextcloud min-version=\"21\" max-version=\"23\"/g" /usr/local/lib/owncloud/apps/user_external/appinfo/info.xml fi # Fix weird permissions. @@ -232,6 +229,10 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc InstallNextcloud 22.2.3 58d2d897ba22a057aa03d29c762c5306211fefd2 4.0.7 8ab31d205408e4f12067d8a4daa3595d46b513e3 3.0.4 6fb1e998d307c53245faf1c37a96eb982bbee8ba 2.1.0 6e5afe7f36f398f864bfdce9cad72200e70322aa CURRENT_NEXTCLOUD_VER="22.2.3" fi + if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^22 ]]; then + InstallNextcloud 23.0.2 645cba42cab57029ebe29fb93906f58f7abea5f8 4.0.8 9f368bb2be98c5555b7118648f4cc9fa51e8cb30 3.0.6 ca49bb1ce23f20e10911e39055fd59d7f7a84c30 2.1.0 6e5afe7f36f398f864bfdce9cad72200e70322aa + CURRENT_NEXTCLOUD_VER="23.0.2" + fi fi InstallNextcloud $nextcloud_ver $nextcloud_hash $contacts_ver $contacts_hash $calendar_ver $calendar_hash $user_external_ver $user_external_hash @@ -325,7 +326,7 @@ php < $CONFIG_TEMP && mv $CONFIG_TEMP $STORAGE_ROOT/owncloud/config.php; 'OC_User_IMAP','arguments' => array('127.0.0.1', 143, null),),); +\$CONFIG['user_backends'] = array(array('class' => '\OCA\UserExternal\IMAP','arguments' => array('127.0.0.1', 143, null),),); echo " Date: Sun, 15 May 2022 09:56:46 +0200 Subject: [PATCH 06/14] 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 07/14] 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 08/14] 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 09/14] 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: Sat, 21 May 2022 20:10:13 +0200 Subject: [PATCH 10/14] nextcloud 23 needs user_external 3.0.0 --- setup/nextcloud.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh index ae12cccd..6df16bba 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -230,7 +230,7 @@ if [ ! -d /usr/local/lib/owncloud/ ] || [[ ! ${CURRENT_NEXTCLOUD_VER} =~ ^$nextc CURRENT_NEXTCLOUD_VER="22.2.3" fi if [[ ${CURRENT_NEXTCLOUD_VER} =~ ^22 ]]; then - InstallNextcloud 23.0.2 645cba42cab57029ebe29fb93906f58f7abea5f8 4.0.8 9f368bb2be98c5555b7118648f4cc9fa51e8cb30 3.0.6 ca49bb1ce23f20e10911e39055fd59d7f7a84c30 2.1.0 6e5afe7f36f398f864bfdce9cad72200e70322aa + InstallNextcloud 23.0.2 645cba42cab57029ebe29fb93906f58f7abea5f8 4.0.8 9f368bb2be98c5555b7118648f4cc9fa51e8cb30 3.0.6 ca49bb1ce23f20e10911e39055fd59d7f7a84c30 3.0.0 9e7aaf7288032bd463c480bc368ff91869122950 CURRENT_NEXTCLOUD_VER="23.0.2" fi fi From fccbb591e3e6dd11be52f6bf4f54de166a2a1518 Mon Sep 17 00:00:00 2001 From: KiekerJan Date: Sun, 22 May 2022 00:17:29 +0200 Subject: [PATCH 11/14] remove superfluous command --- setup/nextcloud.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh index 6df16bba..e11d9195 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -53,8 +53,6 @@ apt_install php php-fpm \ 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() { From 81ff820e8412e8fb259fd6b42b4dcf74b4a3b0f1 Mon Sep 17 00:00:00 2001 From: KiekerJan Date: Sun, 22 May 2022 00:30:21 +0200 Subject: [PATCH 12/14] config changes to contacts --- setup/webmail.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index 708f8dff..670500c0 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -156,7 +156,7 @@ EOF cat > ${RCM_PLUGIN_DIR}/carddav/config.inc.php < 'ownCloud', @@ -165,7 +165,7 @@ cat > ${RCM_PLUGIN_DIR}/carddav/config.inc.php < 'https://${PRIMARY_HOSTNAME}/cloud/remote.php/dav/addressbooks/users/%u/contacts', 'active' => true, 'readonly' => false, - 'refresh_time' => '02:00:00', + 'refresh_time' => '00:30:00', 'fixed' => array('username'), 'preemptive_auth' => '1', 'hide' => false, From 982394dc69801ebcfc42cb09c365d2caf2e73102 Mon Sep 17 00:00:00 2001 From: KiekerJan Date: Sun, 22 May 2022 00:40:00 +0200 Subject: [PATCH 13/14] add missing trailing slash --- setup/webmail.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index 670500c0..fce6b9af 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -162,7 +162,7 @@ cat > ${RCM_PLUGIN_DIR}/carddav/config.inc.php < 'ownCloud', 'username' => '%u', // login username 'password' => '%p', // login password - 'url' => 'https://${PRIMARY_HOSTNAME}/cloud/remote.php/dav/addressbooks/users/%u/contacts', + 'url' => 'https://${PRIMARY_HOSTNAME}/cloud/remote.php/dav/addressbooks/users/%u/contacts/', 'active' => true, 'readonly' => false, 'refresh_time' => '00:30:00', From a2a2e7ce24d41b11dd5dcd0ca8307e930ee1934c Mon Sep 17 00:00:00 2001 From: KiekerJan Date: Tue, 24 May 2022 22:10:48 +0200 Subject: [PATCH 14/14] 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