From 51aac314f992a39399c18ce5e5d30fe2a39fd37b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 12 Jul 2023 00:08:08 +0530 Subject: [PATCH 01/20] nextcloud 25.0.8 added --- templates/docker-compose/docker-compose.yml | 4 +-- upgrade-guides/upgrade-to-25.0.8.12 md | 29 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 upgrade-guides/upgrade-to-25.0.8.12 md diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml index 0c7e7c1..5758544 100644 --- a/templates/docker-compose/docker-compose.yml +++ b/templates/docker-compose/docker-compose.yml @@ -127,7 +127,7 @@ services: - "mail.${DOMAIN}:${NC_HOST_IP}" nextcloud: - image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:selfhost-24-0-10 + image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:25-0-8 container_name: nextcloud restart: always networks: @@ -140,7 +140,7 @@ services: - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER} # below ENV disabled so NC container do not start install # - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD} - - OVERWRITEPROTOCOL=https + - OVERWRITEPROTOCOL=https - NEXTCLOUD_EMAIL_RECOVERY_APP_SECRET=${NEXTCLOUD_EMAIL_RECOVERY_APP_SECRET} volumes: - /mnt/repo-base/volumes/nextcloud/html:/var/www/html/ diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.12 md new file mode 100644 index 0000000..ce2a369 --- /dev/null +++ b/upgrade-guides/upgrade-to-25.0.8.12 md @@ -0,0 +1,29 @@ +# To upgrade from ecloud 24.0.10.7 to 25.0.8.12 + + +- As usual, upgrade your OS with latest patchs, optionally take backup/snapshot + - NB: you may want to filter out incomming email (TCP 25 & 587) during this upgrade, to avoid losing any messages in case of a rollback + +- Go to `/mnt/repo_base`, then run: + - `docker-compose stop` + - `git pull origin master` + +- In your `docker-compose.yml` file update the following: + - Set the nextcloud image to `registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:24-0-8-7` + - Set the mailserver image to `mailserver2/mailserver:1.1.12` + +- Run `docker-compose pull` +- If pulls are OK, run `docker-compose up -d` + +- Examine `docker-compose logs --tail=500 nextcloud` for the following messages: + - `nextcloud | Upgrading nextcloud from x.x.x.x ...` (x.x.x.x is your previous Nextcloud version) + - `nextcloud | Update successful` + +- Run: + - `docker-compose exec -T --user www-data nextcloud php occ db:add-missing-indices` + +- We added new murena logo in this theme and also added a new helper app-`selfhost-theme-helper` + - Enable the `selfhost-theme-helper` app: + - `docker exec -u www-data nextcloud /var/www/html/occ app:enable selfhost-theme-helper` + +- Check all settings subsections starting from `/settings/admin/overview` while logged in with the admin user account to identify any issues found post upgrade \ No newline at end of file -- GitLab From e38466458c9e9e2cd23e4e969f880e6bd9532858 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 17 Jul 2023 10:42:48 +0530 Subject: [PATCH 02/20] suggestion applied --- upgrade-guides/upgrade-to-25.0.8.12 md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.12 md index ce2a369..cff42bb 100644 --- a/upgrade-guides/upgrade-to-25.0.8.12 md +++ b/upgrade-guides/upgrade-to-25.0.8.12 md @@ -9,7 +9,7 @@ - `git pull origin master` - In your `docker-compose.yml` file update the following: - - Set the nextcloud image to `registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:24-0-8-7` + - Set the nextcloud image to `registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:25-0-8` - Set the mailserver image to `mailserver2/mailserver:1.1.12` - Run `docker-compose pull` -- GitLab From 26319f64578d2d129adf5fa49ce668d0fb145930 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 17 Jul 2023 10:45:09 +0530 Subject: [PATCH 03/20] suggestion applied --- upgrade-guides/upgrade-to-25.0.8.12 md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.12 md index cff42bb..b7c490c 100644 --- a/upgrade-guides/upgrade-to-25.0.8.12 md +++ b/upgrade-guides/upgrade-to-25.0.8.12 md @@ -10,7 +10,7 @@ - In your `docker-compose.yml` file update the following: - Set the nextcloud image to `registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:25-0-8` - - Set the mailserver image to `mailserver2/mailserver:1.1.12` + - Set the mailserver image to `mailserver2/mailserver:1.1.14` - Run `docker-compose pull` - If pulls are OK, run `docker-compose up -d` -- GitLab From 70a7e9226646c7f448bec721cfbe9dea7dbf3471 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 17 Jul 2023 10:47:13 +0530 Subject: [PATCH 04/20] suggestion applied --- upgrade-guides/upgrade-to-25.0.8.12 md | 1 + 1 file changed, 1 insertion(+) diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.12 md index b7c490c..a148ef5 100644 --- a/upgrade-guides/upgrade-to-25.0.8.12 md +++ b/upgrade-guides/upgrade-to-25.0.8.12 md @@ -10,6 +10,7 @@ - In your `docker-compose.yml` file update the following: - Set the nextcloud image to `registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:25-0-8` + - Set `OVERWRITEPROTOCOL=https` - Set the mailserver image to `mailserver2/mailserver:1.1.14` - Run `docker-compose pull` -- GitLab From 42297e78813742a1ad5d55d417f5f6a40807e5da Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 20 Jul 2023 11:08:11 +0530 Subject: [PATCH 05/20] suggestion applied --- upgrade-guides/upgrade-to-25.0.8.12 md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.12 md index a148ef5..579dc7d 100644 --- a/upgrade-guides/upgrade-to-25.0.8.12 md +++ b/upgrade-guides/upgrade-to-25.0.8.12 md @@ -22,6 +22,12 @@ - Run: - `docker-compose exec -T --user www-data nextcloud php occ db:add-missing-indices` + - `docker exec -u www-data nextcloud /var/www/html/occ app:remove ecloud-dashboard` + - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable bruteforcesettings` + - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable suspicious_login` + - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable twofactor_totp` + - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable user_backend_sql_raw` + - `docker exec -u www-data nextcloud /var/www/html/occ config:system:set --value murena-dashboard,files defaultapp` - We added new murena logo in this theme and also added a new helper app-`selfhost-theme-helper` - Enable the `selfhost-theme-helper` app: -- GitLab From 780f72d78df5835661315ded05e19d18886e5d1a Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 21 Jul 2023 13:58:13 +0530 Subject: [PATCH 06/20] set legacy and main domain --- templates/docker-compose/docker-compose.yml | 2 +- upgrade-guides/upgrade-to-25.0.8.12 md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml index 5758544..f2c10d6 100644 --- a/templates/docker-compose/docker-compose.yml +++ b/templates/docker-compose/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: mailserver: - image: mailserver2/mailserver:1.1.13 + image: mailserver2/mailserver:1.1.14 container_name: mailserver domainname: ${DOMAIN} # Mail server A/MX/FQDN & reverse PTR = mail.${DOMAIN}. hostname: mail diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.12 md index 579dc7d..84e3c1c 100644 --- a/upgrade-guides/upgrade-to-25.0.8.12 md +++ b/upgrade-guides/upgrade-to-25.0.8.12 md @@ -28,6 +28,11 @@ - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable twofactor_totp` - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable user_backend_sql_raw` - `docker exec -u www-data nextcloud /var/www/html/occ config:system:set --value murena-dashboard,files defaultapp` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set defaultapp --value murena-dashboard,files defaultapp` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set main_domain --value domain.tld` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set legacy_domain --value domain.tld` + +- domain.tld used above is the main domain where selfhost is installed - We added new murena logo in this theme and also added a new helper app-`selfhost-theme-helper` - Enable the `selfhost-theme-helper` app: -- GitLab From 0402bdf74fdc13e502607dae88f74ed942162b28 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 21 Jul 2023 18:31:01 +0530 Subject: [PATCH 07/20] set legacy and main domain --- upgrade-guides/upgrade-to-25.0.8.12 md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.12 md index 84e3c1c..1623740 100644 --- a/upgrade-guides/upgrade-to-25.0.8.12 md +++ b/upgrade-guides/upgrade-to-25.0.8.12 md @@ -29,10 +29,10 @@ - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable user_backend_sql_raw` - `docker exec -u www-data nextcloud /var/www/html/occ config:system:set --value murena-dashboard,files defaultapp` -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set defaultapp --value murena-dashboard,files defaultapp` - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set main_domain --value domain.tld` - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set legacy_domain --value domain.tld` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set main_domain --value $DOMAIN` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set legacy_domain --value $DOMAIN` -- domain.tld used above is the main domain where selfhost is installed +- $DOMAIN used above is the main domain where selfhost is installed - We added new murena logo in this theme and also added a new helper app-`selfhost-theme-helper` - Enable the `selfhost-theme-helper` app: -- GitLab From 996eb3de9d562043dfe66fcd82c7f85a81381853 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 21 Jul 2023 19:24:57 +0530 Subject: [PATCH 08/20] set legacy and main domain --- upgrade-guides/upgrade-to-25.0.8.12 md | 1 + 1 file changed, 1 insertion(+) diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.12 md index 1623740..8d67215 100644 --- a/upgrade-guides/upgrade-to-25.0.8.12 md +++ b/upgrade-guides/upgrade-to-25.0.8.12 md @@ -29,6 +29,7 @@ - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable user_backend_sql_raw` - `docker exec -u www-data nextcloud /var/www/html/occ config:system:set --value murena-dashboard,files defaultapp` -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set defaultapp --value murena-dashboard,files defaultapp` + -`. scripts/base.sh` -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set main_domain --value $DOMAIN` -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set legacy_domain --value $DOMAIN` -- GitLab From e692ed96d0900d6fb7d74a8f6ee00fff22a9a0b1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 24 Jul 2023 12:33:40 +0530 Subject: [PATCH 09/20] added suggestion --- templates/nginx/sites-enabled/nextcloud.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/nginx/sites-enabled/nextcloud.conf b/templates/nginx/sites-enabled/nextcloud.conf index 5045add..ab4d31d 100644 --- a/templates/nginx/sites-enabled/nextcloud.conf +++ b/templates/nginx/sites-enabled/nextcloud.conf @@ -29,8 +29,8 @@ server { add_header X-XSS-Protection "1; mode=block"; add_header Strict-Transport-Security "max-age=15768000"; add_header Referrer-Policy "no-referrer" always; - add_header X-Frame-Options "SAMEORIGIN" always; - add_header X-Robots-Tag "none" always; + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Robots-Tag "noindex,nofollow" always; add_header X-Download-Options "noopen" always; add_header X-Permitted-Cross-Domain-Policies "none" always; fastcgi_hide_header X-Powered-By; @@ -49,7 +49,7 @@ server { location = /.well-known/nodeinfo { return 301 $scheme://$host/index.php$uri; } - + client_max_body_size 4096M; fastcgi_buffers 64 4K; -- GitLab From 530d23fb6e6e6348aff132ecaa6d15bacb2299bc Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 24 Jul 2023 19:33:33 +0530 Subject: [PATCH 10/20] added svideo previews --- upgrade-guides/upgrade-to-25.0.8.12 md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.12 md index 8d67215..8964c0f 100644 --- a/upgrade-guides/upgrade-to-25.0.8.12 md +++ b/upgrade-guides/upgrade-to-25.0.8.12 md @@ -39,4 +39,7 @@ - Enable the `selfhost-theme-helper` app: - `docker exec -u www-data nextcloud /var/www/html/occ app:enable selfhost-theme-helper` +- Setup for video previews(ffmpeg) + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 0 --value='OC\Preview\PNG' && occ config:system:set enabledPreviewProviders 1 --value='OC\Preview\JPEG' && occ config:system:set enabledPreviewProviders 2 --value='OC\Preview\GIF' && occ config:system:set enabledPreviewProviders 3 --value='OC\Preview\BMP' && occ config:system:set enabledPreviewProviders 4 --value='OC\Preview\XBitmap' && occ config:system:set enabledPreviewProviders 5 --value='OC\Preview\MP3' && occ config:system:set enabledPreviewProviders 6 --value='OC\Preview\TXT' && occ config:system:set enabledPreviewProviders 7 --value='OC\Preview\MarkDown' && occ config:system:set enabledPreviewProviders 8 --value='OC\Preview\OpenDocument' && occ config:system:set enabledPreviewProviders 9 --value='OC\Preview\Krita' && occ config:system:set enabledPreviewProviders 10 --value='OC\Preview\Movie'` + - Check all settings subsections starting from `/settings/admin/overview` while logged in with the admin user account to identify any issues found post upgrade \ No newline at end of file -- GitLab From 12e8763b13e81857b427785167277ca399be29be Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 24 Jul 2023 19:45:28 +0530 Subject: [PATCH 11/20] added svideo previews --- upgrade-guides/upgrade-to-25.0.8.12 md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.12 md index 8964c0f..24beecc 100644 --- a/upgrade-guides/upgrade-to-25.0.8.12 md +++ b/upgrade-guides/upgrade-to-25.0.8.12 md @@ -39,7 +39,19 @@ - Enable the `selfhost-theme-helper` app: - `docker exec -u www-data nextcloud /var/www/html/occ app:enable selfhost-theme-helper` -- Setup for video previews(ffmpeg) - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 0 --value='OC\Preview\PNG' && occ config:system:set enabledPreviewProviders 1 --value='OC\Preview\JPEG' && occ config:system:set enabledPreviewProviders 2 --value='OC\Preview\GIF' && occ config:system:set enabledPreviewProviders 3 --value='OC\Preview\BMP' && occ config:system:set enabledPreviewProviders 4 --value='OC\Preview\XBitmap' && occ config:system:set enabledPreviewProviders 5 --value='OC\Preview\MP3' && occ config:system:set enabledPreviewProviders 6 --value='OC\Preview\TXT' && occ config:system:set enabledPreviewProviders 7 --value='OC\Preview\MarkDown' && occ config:system:set enabledPreviewProviders 8 --value='OC\Preview\OpenDocument' && occ config:system:set enabledPreviewProviders 9 --value='OC\Preview\Krita' && occ config:system:set enabledPreviewProviders 10 --value='OC\Preview\Movie'` +- if you did not defined any specific preview providers, to respect the default ones listed in [config.sample.php for nextcloud 25](https://github.com/nextcloud/server/blob/stable25/config/config.sample.php#L1220), you can set : + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 0 --value='OC\Preview\PNG'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 1 --value='OC\Preview\JPEG'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 2 --value='OC\Preview\GIF'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 3 --value='OC\Preview\BMP'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 4 --value='OC\Preview\XBitmap'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 5 --value='OC\Preview\MP3'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 6 --value='OC\Preview\TXT'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 7 --value='OC\Preview\MarkDown'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 8 --value='OC\Preview\OpenDocument'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 9 --value='OC\Preview\Krita'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 10 --value='OC\Preview\Movie'` + +- if you have a custom list of PreviewProviders, just add the `OC\Preview\Movie` in the list - Check all settings subsections starting from `/settings/admin/overview` while logged in with the admin user account to identify any issues found post upgrade \ No newline at end of file -- GitLab From 2e7e6a9fb5d554dc8741318069f67ebef483447e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 24 Jul 2023 19:47:52 +0530 Subject: [PATCH 12/20] added suggestion --- upgrade-guides/upgrade-to-25.0.8.12 md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.12 md index 24beecc..3e7a2c9 100644 --- a/upgrade-guides/upgrade-to-25.0.8.12 md +++ b/upgrade-guides/upgrade-to-25.0.8.12 md @@ -54,4 +54,6 @@ - if you have a custom list of PreviewProviders, just add the `OC\Preview\Movie` in the list -- Check all settings subsections starting from `/settings/admin/overview` while logged in with the admin user account to identify any issues found post upgrade \ No newline at end of file +- Check all settings subsections starting from `/settings/admin/overview` while logged in with the admin user account to identify any issues found post upgrade +- In your config/nginx/sites-enabled/nextcloud.conf file, replace: + - add_header X-Robots-Tag "none" always; with add_header X-Robots-Tag "noindex,nofollow" always; \ No newline at end of file -- GitLab From 6e3533f1b02b3178d5d1222b5dfac7597d17855b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 24 Jul 2023 19:48:29 +0530 Subject: [PATCH 13/20] added suggestion --- upgrade-guides/upgrade-to-25.0.8.12 md | 1 + 1 file changed, 1 insertion(+) diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.12 md index 3e7a2c9..4dbf476 100644 --- a/upgrade-guides/upgrade-to-25.0.8.12 md +++ b/upgrade-guides/upgrade-to-25.0.8.12 md @@ -55,5 +55,6 @@ - if you have a custom list of PreviewProviders, just add the `OC\Preview\Movie` in the list - Check all settings subsections starting from `/settings/admin/overview` while logged in with the admin user account to identify any issues found post upgrade + - In your config/nginx/sites-enabled/nextcloud.conf file, replace: - add_header X-Robots-Tag "none" always; with add_header X-Robots-Tag "noindex,nofollow" always; \ No newline at end of file -- GitLab From 927634a12f4ddee484bbdbd1503f1c0ad0a5022b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 24 Jul 2023 21:10:03 +0530 Subject: [PATCH 14/20] added suggestion --- upgrade-guides/upgrade-to-25.0.8.12 md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.12 md index 4dbf476..7968e0a 100644 --- a/upgrade-guides/upgrade-to-25.0.8.12 md +++ b/upgrade-guides/upgrade-to-25.0.8.12 md @@ -39,18 +39,19 @@ - Enable the `selfhost-theme-helper` app: - `docker exec -u www-data nextcloud /var/www/html/occ app:enable selfhost-theme-helper` -- if you did not defined any specific preview providers, to respect the default ones listed in [config.sample.php for nextcloud 25](https://github.com/nextcloud/server/blob/stable25/config/config.sample.php#L1220), you can set : - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 0 --value='OC\Preview\PNG'` - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 1 --value='OC\Preview\JPEG'` - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 2 --value='OC\Preview\GIF'` - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 3 --value='OC\Preview\BMP'` - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 4 --value='OC\Preview\XBitmap'` - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 5 --value='OC\Preview\MP3'` - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 6 --value='OC\Preview\TXT'` - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 7 --value='OC\Preview\MarkDown'` - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 8 --value='OC\Preview\OpenDocument'` - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 9 --value='OC\Preview\Krita'` - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 10 --value='OC\Preview\Movie'` +- Videos previews can be enabled in this update, as ffmpeg is bundled in the image. + - if you did not defined any specific preview providers, to respect the default ones listed in [config.sample.php for nextcloud 25](https://github.com/nextcloud/server/blob/stable25/config/config.sample.php#L1220), you can set : + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 0 --value='OC\Preview\PNG'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 1 --value='OC\Preview\JPEG'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 2 --value='OC\Preview\GIF'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 3 --value='OC\Preview\BMP'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 4 --value='OC\Preview\XBitmap'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 5 --value='OC\Preview\MP3'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 6 --value='OC\Preview\TXT'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 7 --value='OC\Preview\MarkDown'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 8 --value='OC\Preview\OpenDocument'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 9 --value='OC\Preview\Krita'` + -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 10 --value='OC\Preview\Movie'` - if you have a custom list of PreviewProviders, just add the `OC\Preview\Movie` in the list -- GitLab From 94b3d608bb2981b376f2d5213a09c189abb1898d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 25 Jul 2023 10:54:36 +0530 Subject: [PATCH 15/20] added suggestion --- ...pgrade-to-25.0.8.12 md => upgrade-to-25.0.8.16 md} | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) rename upgrade-guides/{upgrade-to-25.0.8.12 md => upgrade-to-25.0.8.16 md} (94%) diff --git a/upgrade-guides/upgrade-to-25.0.8.12 md b/upgrade-guides/upgrade-to-25.0.8.16 md similarity index 94% rename from upgrade-guides/upgrade-to-25.0.8.12 md rename to upgrade-guides/upgrade-to-25.0.8.16 md index 7968e0a..0e897df 100644 --- a/upgrade-guides/upgrade-to-25.0.8.12 md +++ b/upgrade-guides/upgrade-to-25.0.8.16 md @@ -1,4 +1,4 @@ -# To upgrade from ecloud 24.0.10.7 to 25.0.8.12 +# To upgrade from ecloud 24.0.10.7 to 25.0.8.16 - As usual, upgrade your OS with latest patchs, optionally take backup/snapshot @@ -13,6 +13,9 @@ - Set `OVERWRITEPROTOCOL=https` - Set the mailserver image to `mailserver2/mailserver:1.1.14` +- In your config/nginx/sites-enabled/nextcloud.conf file, replace: + - add_header X-Robots-Tag "none" always; with add_header X-Robots-Tag "noindex,nofollow" always; + - Run `docker-compose pull` - If pulls are OK, run `docker-compose up -d` @@ -27,8 +30,7 @@ - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable suspicious_login` - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable twofactor_totp` - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable user_backend_sql_raw` - - `docker exec -u www-data nextcloud /var/www/html/occ config:system:set --value murena-dashboard,files defaultapp` - -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set defaultapp --value murena-dashboard,files defaultapp` + - `docker exec -u www-data nextcloud /var/www/html/occ config:system:set defaultapp --value murena-dashboard,files` -`. scripts/base.sh` -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set main_domain --value $DOMAIN` -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set legacy_domain --value $DOMAIN` @@ -56,6 +58,3 @@ - if you have a custom list of PreviewProviders, just add the `OC\Preview\Movie` in the list - Check all settings subsections starting from `/settings/admin/overview` while logged in with the admin user account to identify any issues found post upgrade - -- In your config/nginx/sites-enabled/nextcloud.conf file, replace: - - add_header X-Robots-Tag "none" always; with add_header X-Robots-Tag "noindex,nofollow" always; \ No newline at end of file -- GitLab From 76fc09830e447ccac720df41ca8d52f670a9ebc1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 25 Jul 2023 11:02:49 +0530 Subject: [PATCH 16/20] added suggestion --- upgrade-guides/upgrade-to-25.0.8.16 md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upgrade-guides/upgrade-to-25.0.8.16 md b/upgrade-guides/upgrade-to-25.0.8.16 md index 0e897df..b4a99e5 100644 --- a/upgrade-guides/upgrade-to-25.0.8.16 md +++ b/upgrade-guides/upgrade-to-25.0.8.16 md @@ -30,7 +30,7 @@ - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable suspicious_login` - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable twofactor_totp` - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable user_backend_sql_raw` - - `docker exec -u www-data nextcloud /var/www/html/occ config:system:set defaultapp --value murena-dashboard,files` + - `docker exec -u www-data nextcloud /var/www/html/occ config:system:set defaultapp --value "murena-dashboard,files"` -`. scripts/base.sh` -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set main_domain --value $DOMAIN` -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set legacy_domain --value $DOMAIN` -- GitLab From 0239d5537ec8881c346fb542e9a4809a5e17211f Mon Sep 17 00:00:00 2001 From: Florent VINCENT Date: Tue, 25 Jul 2023 10:11:13 +0000 Subject: [PATCH 17/20] Update upgrade-to-25.0.8.16 md indent fix --- upgrade-guides/upgrade-to-25.0.8.16 md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upgrade-guides/upgrade-to-25.0.8.16 md b/upgrade-guides/upgrade-to-25.0.8.16 md index 0e897df..b79a10a 100644 --- a/upgrade-guides/upgrade-to-25.0.8.16 md +++ b/upgrade-guides/upgrade-to-25.0.8.16 md @@ -55,6 +55,6 @@ -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 9 --value='OC\Preview\Krita'` -`docker exec -u www-data nextcloud /var/www/html/occ config:system:set enabledPreviewProviders 10 --value='OC\Preview\Movie'` -- if you have a custom list of PreviewProviders, just add the `OC\Preview\Movie` in the list + - if you have a custom list of PreviewProviders, just add the `OC\Preview\Movie` in the list - Check all settings subsections starting from `/settings/admin/overview` while logged in with the admin user account to identify any issues found post upgrade -- GitLab From 5e0bb4561286e30dfacf9e16f5b88bf4e5c868aa Mon Sep 17 00:00:00 2001 From: diroots Date: Tue, 25 Jul 2023 13:06:10 +0200 Subject: [PATCH 18/20] add preview providers in post install script --- scripts/postinstall.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh index bb36407..9eb90f5 100755 --- a/scripts/postinstall.sh +++ b/scripts/postinstall.sh @@ -71,6 +71,20 @@ docker-compose exec -T --user www-data nextcloud php /var/www/html/occ db:add-mi docker-compose exec -T --user www-data nextcloud php occ maintenance:mode --off +# define all default preview providers AND the video preview provider, now that ffmpeg is bundled in the image +docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set enabledPreviewProviders 0 --value='OC\Preview\PNG' +docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set enabledPreviewProviders 1 --value='OC\Preview\JPEG' +docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set enabledPreviewProviders 2 --value='OC\Preview\GIF' +docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set enabledPreviewProviders 3 --value='OC\Preview\BMP' +docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set enabledPreviewProviders 4 --value='OC\Preview\XBitmap' +docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set enabledPreviewProviders 5 --value='OC\Preview\MP3' +docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set enabledPreviewProviders 6 --value='OC\Preview\TXT' +docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set enabledPreviewProviders 7 --value='OC\Preview\MarkDown' +docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set enabledPreviewProviders 8 --value='OC\Preview\OpenDocument' +docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set enabledPreviewProviders 9 --value='OC\Preview\Krita' +docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set enabledPreviewProviders 10 --value='OC\Preview\Movie' + + echo "Restarting Nextcloud container" docker-compose restart nextcloud -- GitLab From c72bc3c17cec971c5373c611063a7e9fc40b3ef6 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Jul 2023 12:31:22 +0530 Subject: [PATCH 19/20] final image added and suggestion applied --- templates/docker-compose/docker-compose.yml | 2 +- .../{upgrade-to-25.0.8.16 md => upgrade-to-25.0.8.19 md} | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) rename upgrade-guides/{upgrade-to-25.0.8.16 md => upgrade-to-25.0.8.19 md} (96%) diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml index f2c10d6..8a37e6d 100644 --- a/templates/docker-compose/docker-compose.yml +++ b/templates/docker-compose/docker-compose.yml @@ -127,7 +127,7 @@ services: - "mail.${DOMAIN}:${NC_HOST_IP}" nextcloud: - image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:25-0-8 + image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:25-0-8-19 container_name: nextcloud restart: always networks: diff --git a/upgrade-guides/upgrade-to-25.0.8.16 md b/upgrade-guides/upgrade-to-25.0.8.19 md similarity index 96% rename from upgrade-guides/upgrade-to-25.0.8.16 md rename to upgrade-guides/upgrade-to-25.0.8.19 md index a4713b1..f004115 100644 --- a/upgrade-guides/upgrade-to-25.0.8.16 md +++ b/upgrade-guides/upgrade-to-25.0.8.19 md @@ -1,4 +1,4 @@ -# To upgrade from ecloud 24.0.10.7 to 25.0.8.16 +# To upgrade from ecloud 24.0.10.7 to 25.0.8.19 - As usual, upgrade your OS with latest patchs, optionally take backup/snapshot @@ -26,6 +26,7 @@ - Run: - `docker-compose exec -T --user www-data nextcloud php occ db:add-missing-indices` - `docker exec -u www-data nextcloud /var/www/html/occ app:remove ecloud-dashboard` + - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable murena-dashboard` - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable bruteforcesettings` - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable suspicious_login` - `docker exec -u www-data nextcloud /var/www/html/occ -f app:enable twofactor_totp` -- GitLab From a0f93d589a9c3c5745fa7de42462d14f8173127d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 27 Jul 2023 13:29:54 +0530 Subject: [PATCH 20/20] final image added and suggestion applied --- upgrade-guides/upgrade-to-25.0.8.19 md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upgrade-guides/upgrade-to-25.0.8.19 md b/upgrade-guides/upgrade-to-25.0.8.19 md index f004115..3ac5e24 100644 --- a/upgrade-guides/upgrade-to-25.0.8.19 md +++ b/upgrade-guides/upgrade-to-25.0.8.19 md @@ -9,7 +9,7 @@ - `git pull origin master` - In your `docker-compose.yml` file update the following: - - Set the nextcloud image to `registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:25-0-8` + - Set the nextcloud image to `registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:25-0-8-19` - Set `OVERWRITEPROTOCOL=https` - Set the mailserver image to `mailserver2/mailserver:1.1.14` -- GitLab