put secrets in correct files

it seems like php-fpm applys configs in aphabetical order, so that our
fpm-tune was overwritten by the www.conf with default values.

so let's go on highspeed now! :)

.drone.yml

@@ -1,49 +0,0 @@
----
-kind: pipeline
-name: deploy to swarm-test.autonomic.zone
-steps:
-  - name: deployment
-    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
-    settings:
-      host: swarm-test.autonomic.zone
-      stack: nextcloud
-      generate_secrets: true
-      purge: true
-      deploy_key:
-        from_secret: drone_ssh_swarm_test
-      networks:
-        - proxy
-    environment:
-      DOMAIN: nextcloud.swarm-test.autonomic.zone
-      STACK_NAME: nextcloud
-      LETS_ENCRYPT_ENV: production
-      ADMIN_USER: foobar
-      FPM_TUNE_VERSION: v1
-      NGINX_CONF_VERSION: v1
-      MY_CNF_VERSION: v1
-      ENTRYPOINT_VERSION: v1
-      SECRET_DB_PASSWORD_VERSION: v1
-      SECRET_DB_ROOT_PASSWORD_VERSION: v1
-      SECRET_ADMIN_PASSWORD_VERSION: v1
-      SECRET_ONLYOFFICE_JWT_VERSION: v1
-      SECRET_BBB_SECRET_VERSION: v1
-      EXTRA_VOLUME: "/dev/null:/tmp/.dummy"
-trigger:
-  branch:
-    - main
----
-kind: pipeline
-name: generate recipe catalogue
-steps:
-  - name: release a new version
-    image: plugins/downstream
-    settings:
-      server: https://build.coopcloud.tech
-      token:
-        from_secret: drone_abra-bot_token
-      fork: true
-      repositories:
-        - coop-cloud/auto-recipes-catalogue-json
-
-trigger:
-  event: tag

.env.sample

@@ -1,69 +0,0 @@
-TYPE=nextcloud
-TIMEOUT=900
-ENABLE_AUTO_UPDATE=true
-
-DOMAIN=nextcloud.example.com
-## Domain aliases
-#EXTRA_DOMAINS=', `www.nextcloud.example.com`'
-LETS_ENCRYPT_ENV=production
-
-COMPOSE_FILE="compose.yml"
-COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
-#COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
-
-#MAX_DB_CONNECTIONS=500
-
-ADMIN_USER=admin
-
-SECRET_DB_ROOT_PASSWORD_VERSION=v1
-SECRET_DB_PASSWORD_VERSION=v1
-SECRET_ADMIN_PASSWORD_VERSION=v1
-
-EXTRA_VOLUME=/dev/null:/tmp/.dummy
-
-PHP_MEMORY_LIMIT=1G
-# fpm-tune, see: https://spot13.com/pmcalculator/
-FPM_MAX_CHILDREN=16
-FPM_START_SERVERS=4
-FPM_MIN_SPARE_SERVERS=4
-FPM_MAX_SPARE_SERVERS=12
-
-DEFAULT_QUOTA="10 GB"
-
-# X_FRAME_OPTIONS_ENABLED=1
-# X_FRAME_OPTIONS_ALLOW_FROM=embedding-site.example.org
-
-# COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
-# See https://github.com/nextcloud/docker#auto-configuration-via-environment-variables for default values
-# SMTP_AUTHTYPE=
-# SMTP_HOST=
-# SMTP_SECURE=
-# SMTP_NAME=
-# SMTP_PORT=
-# MAIL_FROM_ADDRESS=
-# MAIL_DOMAIN=
-# SECRET_SMTP_PASSWORD_VERSION=v1
-
-# COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
-# APPS="calendar sociallogin onlyoffice"
-#
-# ONLYOFFICE_URL=https://onlyoffice.example.com
-# SECRET_ONLYOFFICE_JWT_VERSION=v1
-#
-# COLLABORA_URL=https://collabora.example.com
-#
-# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
-# SECRET_BBB_SECRET_VERSION=v1
-#
-# OCC_CMDS="app:disable dashboard"
-# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin auto_create_groups --value 1"
-# OCC_CMDS="$OCC_CMDS|config:app:set sociallogin hide_default_login --value 1"
-
-# COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
-# AUTHENTIK_USER_PREFIX=authentik
-# AUTHENTIK_DOMAIN=authentik.example.com
-# SECRET_AUTHENTIK_SECRET_VERSION=v1
-# SECRET_AUTHENTIK_ID_VERSION=v1
-
-#COMPOSE_FILE="$COMPOSE_FILE:compose.fulltextsearch.yml"
-#SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1

.gitignore

@@ -1 +1 @@
-/.envrc
+.env

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "shellcheck.customArgs": [
-        "--shell=bash"
-    ]
-}

README.md

@@ -1,283 +1,24 @@
 # Nextcloud
 
-[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/nextcloud/status.svg)](https://drone.autonomic.zone/coop-cloud/nextcloud)
-
-Fully automated luxury Nextcloud via docker-swarm.
-
-<!-- metadata -->
-* **Category**: Apps
-* **Status**: 5
-* **Image**: [`nextcloud`](https://hub.docker.com/_/nextcloud), 4, upstream
-* **Healthcheck**: Yes
-* **Backups**: Yes
-* **Email**: 3
-* **Tests**: 2
-* **SSO**: 1 (OAuth)
-<!-- endmetadata -->
-
-## Quick start
-
-* `abra app new nextcloud`
-* `abra app config <app-name>`
-* `abra app secret insert <app-name> smtp_password v1 <SMTP_PASSWORD>`
-* `abra app secret generate -a <app-name>`
-* `abra app deploy <app-name>`
-
-### Onlyoffice Integration
-
-`abra app config <app-name>` 
-Configure the following envs:
-```
-COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
-ONLYOFFICE_URL=https://onlyoffice.example.com
-SECRET_ONLYOFFICE_JWT_VERSION=v1
-```
-
-`abra app secret insert <app-name> onlyoffice_jwt v1 <jwt_secret>`
-`abra app cmd <app-name> app install_onlyoffice`
-
-### BBB Integration
-
-`abra app config <app-name>` 
-Configure the following envs:
-```
-COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
-BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
-SECRET_BBB_SECRET_VERSION=v1
-```
-
-`abra app secret insert <app-name> bbb_secret v1 <bbb_secret>`
-`abra app cmd <app-name> app install_bbb`
-
-### Authentik Integration
+Wiki Cafe's configuration for a Nextcloud deployment. Originally slimmed down from an `abra` [recipe](https://git.coopcloud.tech/coop-cloud/nextcloud) by [Co-op Cloud](https://coopcloud.tech/).
 
 
-`abra app config <app-name>` 
-Configure the following envs:
-```
-COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
-AUTHENTIK_USER_PREFIX=authentik
-AUTHENTIK_DOMAIN=authentik.example.com
-AUTHENTIK_SECRET_NAME=authentik_example_com_nextcloud_secret_v1  # the same as in authentik
-AUTHENTIK_ID_NAME=authentik_example_com_nextcloud_id_v1  # the same as in authentik
-```
+## Deploying the app with Docker Swarm
 
-`abra app cmd <app-name> app set_authentik`
-
-### Disable Dashboard
-
-Disable dashboard app since it is so corporate:
-
-`abra app config <app-name>` 
-Configure the following envs:
-```
-OCC_CMDS="app:disable dashboard"
-```
-`abra app cmd <app-name> app post_install_occ`
-
-## Running `occ`
-
-`abra app cmd <app-name> app run_occ '"user:list --help"'`
-
-## Default user files
-
-- Follow [these docs](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/default_files_configuration.html) to set the default files list for each user in the Files app
-
-## Default App
-
-- Configure a `defaultapp` in your `config.php` or use [apporder](https://apps.nextcloud.com/apps/apporder)
-
-## Upgrading Nextcloud apps
-
-`abra app cmd <app-name> app run_occ '"app:update --all"'`
-
-
-## How do I fix a Nextcloud version snafu?
-
-`Exception: Updates between multiple major versions and downgrades are unsupported.`
-
-Solution:
-
-- Look at log files to determine the old Nextcloud version
-- Change your local `~/.abra/recipes/nextcloud/compose.yml` to the highest minor
-    version in the old version -- e.g. choose `22.2.5` for `22`, if you're
-    upgrading to `23`.
-- Then, do one of (both bad):
-  1. `abra app deploy --chaos ...`, then `app run` to go in and manually lower the version number in PHP (shell in, `apt install vim-core && vi version.php`), then try `php ./occ upgrade`
-  2. `abra app undeploy ...`, `abra volume rm`, CAREFULLY only choose the volume
-     ENDING `_nextcloud`, then `abra app deploy --chaos ...`, then edit the
-     `compose.yml` to add `entrypoint: ['tail', '-f', '/dev/null']` to `app`,
-     then `app deploy --chaos` again, then `app run --user=www-data ... app bash` to get in and run `./occ maintenance:repair`, and `./occ upgrade`. 
-- Change `compose.yml` to the new version number; `git checkout compose.yml`
-- `abra app deploy --force`
-- This wasn't even multiplle major versions was it 😾
-
-## How do I integrate with Keycloak SSO?
-
-Use [this plugin](https://github.com/pulsejet/nextcloud-oidc-login). Unlike the plugin it's forked from, there is no configuration UI, so you'll need to edit `/var/www/html/config/config.php`:
+Set the environment variables from the .env file during the shell session.
 
 ```
-  'oidc_login_client_id' => 'nextcloud',
-  'oidc_login_client_secret' => 'mysecret',
-  'oidc_login_provider_url' => 'https://example.com/realms/myrealm',
-  'oidc_login_disable_registration' => false,
-  'oidc_login_hide_password_form' => true,
-  'oidc_login_button_text' => 'Log in with your myssodomain',
-  'oidc_login_default_group' => 'mygroup',
-  'oidc_login_attributes' =>
-  array (
-    'id' => 'sub',
-    'name' => 'name',
-    'mail' => 'email',
-  ),
-  'oidc_create_groups' => true,
+set -a && source .env && set +a
 ```
 
-You can use [this trick](https://janikvonrotz.ch/2020/10/20/openid-connect-with-nextcloud-and-keycloak/) (see "Cryptic Usernames" work-around) to get proper usernames.
-
-If you ever need to change the realm, you'll need to reset the cache with:
+Set the secrets.
 
 ```
-docker exec -u www-data <container-id> php occ config:app:delete oidc_login last_updated_well_known
-docker exec -u www-data <container-id> php occ config:app:delete oidc_login last_updated_jwks
+printf "SECRET_HERE" | docker secret create SECRET_NAME -
 ```
 
-## How do I enable multiple SSO login buttons?
-
-We've been able to get this setup by using the [social login](https://apps.nextcloud.com/apps/sociallogin) plugin.
-
-If using Keycloak, you'll want to do [this trick](https://janikvonrotz.ch/2020/10/20/openid-connect-with-nextcloud-and-keycloak/) also.
-
-## How can I customise the CSS?
-
-There is some basic stuff in the admin settings.
-
-To go a little deeper, you can use [this handy app](https://apps.nextcloud.com/apps/theming_customcss).
-
-Here is an example CSS config which hides the local login and makes space for a central image:
-
-```css
-#body-login .wrapper main form[name="login"],
-#body-login .wrapper main form[name="login"] ~ a {
-  display: none;
-}
-
-#body-login .logo {
-  visibility: hidden;
-}
-
-#body-login #alternative-logins a.button[href*="oidc"] {
-  background: #233b4a;
-  color: #fff;
-  transition: all 0.2s ease-in-out;
-}
-#body-login #alternative-logins a.button[href*="oidc"]:hover {
-  background: linear-gradient(-35deg, #233b4a 40%, #486c83 100%);
-}
-
-#body-login #alternative-logins a.button[href*="/sociallogin/oauth/google"] {
-  border: 0;
-  color: #db4437 !important;
-  background-color: #fff;
-}
-
-#body-login
-  #alternative-logins
-  a.button[href*="/sociallogin/oauth/google"]::before {
-  width: 25px;
-  background-color: #db4437;
-  border-radius: 100%;
-  background-size: 60%;
-  background-position: center;
-  height: 25px;
-  vertical-align: middle;
-  margin-right: 4px;
-}
-
-#body-login main {
-  padding: 50vh 0 0 0;
-}
-
-#body-login a[href*="#body-login"] {
-  visibility: hidden;
-}
-
-#body-login footer a,
-#body-login footer p {
-  color: #233b4a;
-}
-
-#body-login footer a:hover {
-  color: #fff;
-}
-
-#body-login footer p.info {
-  text-shadow: none;
-}
-```
-
-[nextcloud-docker]: https://hub.docker.com/_/nextcloud/
-[`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra
-[`coop-cloud/traefik`]: https://git.autonomic.zone/coop-cloud/traefik
-
-## Using [`previewgenerator`](https://github.com/nextcloud/previewgenerator) app
-
-> Beware, this appp has been known to not work...
-
-After you install, enable etc. then you need to run the generation (**warning**: it can take a long time!):
+Deploy using the `-c` flag to specify one or multiple compose files.
 
 ```
-abra app run <domain> app bash -u www-data
-./occ preview:generate-all
-```
-
-To set up the cron to run again, there is [no clear solution in the context of
-containers](https://github.com/nextcloud/previewgenerator/issues/1). So, a
-pretty dodgy hack is to run it from the system directly:
-
-```
-root@foo.com /etc/cron.hourly $ cat foo-com-preview-generate 
-#!/bin/bash
-
-docker exec -u www-data $(docker ps -f name=foo_com_app -q) ./occ preview:pre-generate
-```
-
-This app will improve performance of image browsing at the cost of storage space.
-
-## Fulltextsearch using elasticsearch
-
-1. Uncomment the following lines in your env file:
-```
-#COMPOSE_FILE="$COMPOSE_FILE:compose.fulltextsearch.yml"
-#SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1
-```
-
-2. Generate the secret for elasticsearch:
-```bash
-abra app secret generate <domain> elasticsearch_password v1
-```
-
-3. Deploy your app:
-```bash
-abra app deploy <domain>
-```
-
-4. Install the apps and configure them:
-```
-abra app cmd <domain> app install_fulltextsearch
-```
-
-5. You might need to configure the files_fulltextsearch app. run this command to check its settings:
-```
-abra app cmd <domain> app run_occ '"config:list files_fulltextsearch"
-```
-
-6. You can check if the nextcloud can connect to elasticsearch:
-```
-abra app cmd <domain> app run_occ '"fulltextsearch:test"'
-```
-
-And you can populate the index manually and check if any errors occur:
-```
-abra app cmd <domain> app run_occ '"fulltextsearch:index"'
+docker stack deploy nextcloud -c compose.yaml -c compose.mariadb.yaml -c compose.smtp.yaml
 ```

abra.sh

@@ -1,122 +0,0 @@
-#!/bin/bash
-
-export FPM_TUNE_VERSION=v5
-export NGINX_CONF_VERSION=v5
-export MY_CNF_VERSION=v5
-export ENTRYPOINT_VERSION=v3
-
-run_occ() {
-    su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
-}
-
-post_install_occ() {
-    IFS='|' read -ra CMD <<<"$OCC_CMDS"
-    for cmd in "${CMD[@]}"; do
-        run_occ "$cmd"
-    done
-}
-
-install_apps() {
-    install_apps="$@"
-    if [ -z "$install_apps" ]; then
-        install_apps=$APPS
-    fi
-    for app in $install_apps; do
-        run_occ "app:install $app"
-    done
-}
-
-set_app_config() {
-    APP=$1
-    KEY=$2
-    VALUE=$3
-    run_occ "config:app:set $APP $KEY --value '$VALUE'"
-}
-
-set_system_config() {
-    KEY=$1
-    VALUE=$2
-    run_occ "config:system:set $KEY --value '$VALUE'"
-}
-
-set_trusted_proxies() {
-    trusted_proxies="$@"
-    if [ -z "$1" ]; then
-        trusted_proxies="$TRUSTED_PROXIES"
-    fi
-    set_system_config trusted_proxies "$trusted_proxies"
-}
-
-set_logfile_stdout() {
-    set_system_config logfile '/dev/stdout'
-}
-
-install_bbb() {
-    install_apps bbb
-    set_app_config bbb app.navigation true
-    set_app_config bbb api.url "$BBB_URL"
-    set_app_config bbb api.secret "$(cat /run/secrets/bbb_secret)"
-}
-
-install_onlyoffice() {
-    install_apps onlyoffice
-    set_app_config onlyoffice DocumentServerUrl "$ONLYOFFICE_URL"
-    set_app_config onlyoffice jwt_secret "$(cat /run/secrets/onlyoffice_jwt)"
-    set_app_config onlyoffice customizationForcesave true
-}
-
-install_collabora() {
-    install_apps richdocuments
-    set_app_config richdocuments wopi_url "$COLLABORA_URL"
-}
-
-install_fulltextsearch() {
-    install_apps fulltextsearch
-    install_apps fulltextsearch_elasticsearch
-    install_apps files_fulltextsearch
-    set_app_config fulltextsearch search_platform "OCA\\FullTextSearch_Elasticsearch\\Platform\\ElasticSearchPlatform"
-    set_app_config fulltextsearch_elasticsearch elastic_host "http://elastic:$(cat /run/secrets/elasticsearch_password)@elasticsearch:9200/"
-    set_app_config fulltextsearch_elasticsearch elastic_index "nextcloud"
-    set_app_config files_fulltextsearch files_local "1"
-}
-
-set_default_quota() {
-    set_app_config files default_quota "$DEFAULT_QUOTA"
-}
-
-set_authentik() {
-    install_apps sociallogin
-    AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret)
-    AUTHENTIK_ID=$(cat /run/secrets/authentik_id)
-    set_app_config sociallogin custom_providers "
-{
-    \"custom_oidc\":[
-    {
-        \"name\":\"$AUTHENTIK_USER_PREFIX\",
-        \"title\":\"authentik\",
-        \"authorizeUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/authorize/\",
-        \"tokenUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/token/\",
-        \"displayNameClaim\":\"preferred_username\",
-        \"userInfoUrl\": \"https://$AUTHENTIK_DOMAIN/application/o/userinfo/\",
-        \"logoutUrl\": \"https://$AUTHENTIK_DOMAIN/if/session-end/nextcloud/\",
-        \"clientId\":\"$AUTHENTIK_ID\",
-        \"clientSecret\":\"$AUTHENTIK_SECRET\",
-        \"scope\":\"openid profile email nextcloud\",
-        \"groupsClaim\":\"nextcloud_groups\",
-        \"style\":\"openid\",
-        \"defaultGroup\":\"\",
-        \"groupMapping\": {
-          \"admin\": \"admin\",
-          \"authentik Admins\": \"admin\"
-        }
-    }
-]
-}"
-
-    set_app_config sociallogin update_profile_on_login 1
-    set_app_config sociallogin auto_create_groups 1
-    set_app_config sociallogin hide_default_login 1
-    run_occ 'config:system:set social_login_auto_redirect --value true'
-    run_occ 'config:system:set allow_user_to_change_display_name --value=false'
-    run_occ 'config:system:set lost_password_link --value=disabled'
-}

compose.apps.yml

@@ -1,18 +0,0 @@
-version: "3.8"
-services:
-  app:
-    secrets:
-      - onlyoffice_jwt
-      - bbb_secret
-    environment:
-      - APPS
-      - ONLYOFFICE_URL
-      - BBB_URL
-
-secrets:
-  onlyoffice_jwt:
-    external: true
-    name: ${STACK_NAME}_onlyoffice_jwt_${SECRET_ONLYOFFICE_JWT_VERSION}
-  bbb_secret:
-    external: true
-    name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION}

compose.authentik.yml

@@ -1,14 +0,0 @@
-version: "3.8"
-services:
-  app:
-    secrets:
-      - authentik_secret
-      - authentik_id
-
-secrets:
-  authentik_secret:
-    external: true
-    name: ${STACK_NAME}_authentik_secret_${SECRET_AUTHENTIK_SECRET_VERSION}
-  authentik_id:
-    external: true
-    name: ${STACK_NAME}_authentik_id_${SECRET_AUTHENTIK_ID_VERSION}

compose.fulltextsearch.yaml

@@ -1,55 +0,0 @@
-version: "3.8"
-
-services:
-  elasticsearch:
-    image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.3"
-    environment:
-      - cluster.name=docker-cluster
-      - bootstrap.memory_lock=true
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-      - discovery.type=single-node
-      # Disable authentication and ssl completely
-      # - xpack.security.enabled=false
-      # Use this to enable Basic Authentication:
-      - xpack.security.enabled=true
-      - xpack.security.http.ssl.enabled=false
-      - ELASTIC_PASSWORD_FILE=/var/run/secrets/elasticsearch_password
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-    volumes:
-      - elasticsearch:/usr/share/elasticsearch/data
-    networks:
-      - internal
-    secrets:
-      - source: elasticsearch_password
-        uid: "1000"
-        gid: "1000"
-        mode: 0600
-
-  searchindexer:
-    image: nextcloud:27.1.3-fpm
-    volumes:
-      - nextcloud:/var/www/html/
-      - nextapps:/var/www/html/custom_apps:cached
-      - nextdata:/var/www/html/data:cached
-      - nextconfig:/var/www/html/config:cached
-      - ${EXTRA_VOLUME}
-    networks:
-      - internal
-    entrypoint: su -p www-data -s /bin/sh -c '/var/www/html/occ fulltextsearch:live'
-
-  # Add the secret to the app service so it is avaiable in the
-  # install_fulltextsearch command
-  app:
-    secrets:
-      - elasticsearch_password
-
-secrets:
-  elasticsearch_password:
-    external: true
-    name: ${STACK_NAME}_elasticsearch_password_${SECRET_ELASTICSEARCH_PASSWORD_VERSION}
-
-volumes:
-  elasticsearch:

compose.mariadb.yaml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   app:
     environment:
@@ -15,7 +13,6 @@ services:
       - MYSQL_USER=nextcloud
       - MYSQL_PASSWORD_FILE=/run/secrets/db_password
       - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
-      - MAX_DB_CONNECTIONS=${MAX_DB_CONNECTIONS:-100}
     configs:
       - source: my_tune
         target: /etc/mysql/conf.d/my-tune.cnf
@@ -38,16 +35,19 @@ services:
       timeout: 10s
       retries: 10
       start_period: 1m
+
 configs:
   my_tune:
-    name: ${STACK_NAME}_my_cnf_${MY_CNF_VERSION}
+    name: ${STACK_NAME}_my_cnf
     file: my-tune.cnf
-    template_driver: golang
 
 secrets:
   db_root_password:
     external: true
-    name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
+    name: ${STACK_NAME}_db_root_password
+  db_password:
+    external: true
+    name: ${STACK_NAME}_db_password
 
 volumes:
   mariadb:

compose.postgres.yml

@@ -1,38 +0,0 @@
-version: '3.8'
-
-services:
-  app:
-    environment:
-      - POSTGRES_HOST=db
-      - POSTGRES_DB=nextcloud
-      - POSTGRES_USER=nextcloud
-      - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
-      - NEXTCLOUD_UPDATE=1
-
-  db:
-    image: "postgres:12"
-    command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
-    volumes:
-      - "postgres:/var/lib/postgresql/data"
-    networks:
-      - internal
-    environment:
-      POSTGRES_USER: nextcloud
-      POSTGRES_PASSWORD_FILE: /run/secrets/db_password
-      POSTGRES_DB: nextcloud
-    secrets:
-      - db_password
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready", "-U", "nextcloud"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    deploy:
-      labels:
-            backupbot.backup: "true"
-            backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
-            backupbot.backup.post-hook: "rm -rf /var/lib/postgresql/data/backup.sql"
-            backupbot.backup.path: "/var/lib/postgresql/data/"
-
-volumes:
-  postgres:

compose.smtp.yaml

@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   app:
     secrets:
@@ -16,4 +15,4 @@ services:
 secrets:
   smtp_password:
     external: true
-    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
+    name: ${STACK_NAME}_smtp_password

compose.yaml

@@ -1,9 +1,6 @@
-version: "3.8"
 services:
   web:
-    image: nginx:1.25.3
-    depends_on:
-      - app
+    image: nginx:1.25.1
     configs:
       - source: nginx_conf
         target: /etc/nginx/nginx.conf
@@ -35,9 +32,6 @@ services:
         - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
-        - "caddy=${DOMAIN}"
-        - "caddy.reverse_proxy={{upstreams 80}}"
-        - "caddy.tls.on_demand="
     healthcheck:
       test: ["CMD-SHELL", 'curl -s -N curl -Ns localhost/status.php |  grep "installed\":true"']
       interval: 30s
@@ -46,7 +40,7 @@ services:
       start_period: 5m
 
   app:
-    image: nextcloud:28.0.2-fpm
+    image: nextcloud:27.0.1-fpm
     depends_on:
       - db
     configs:
@@ -61,7 +55,6 @@ services:
       - admin_password
     environment:
       - APPS
-      - OCC_CMDS
       - X_FRAME_OPTIONS_ALLOW_FROM
       - X_FRAME_OPTIONS_ENABLED
       - DOMAIN
@@ -91,8 +84,6 @@ services:
         failure_action: rollback
         order: start-first
       labels:
-        - "coop-cloud.${STACK_NAME}.version=6.0.1+28.0.2-fpm"
-        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
     healthcheck:
@@ -100,10 +91,10 @@ services:
       interval: 30s
       timeout: 10s
       retries: 10
-      start_period: 15m
+      start_period: 5m
 
   cron:
-    image: nextcloud:28.0.2-fpm
+    image: nextcloud:27.0.1-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached
@@ -115,7 +106,7 @@ services:
     entrypoint: /cron.sh
 
   cache:
-    image: redis:7.2.4-alpine
+    image: redis:7.0.12-alpine
     networks:
       - internal
     volumes:
@@ -129,10 +120,10 @@ services:
 secrets:
   db_password:
     external: true
-    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
+    name: ${STACK_NAME}_db_password
   admin_password:
     external: true
-    name: ${STACK_NAME}_admin_password_${SECRET_ADMIN_PASSWORD_VERSION}
+    name: ${STACK_NAME}_admin_password
 
 volumes:
   nextcloud:
@@ -144,15 +135,15 @@ volumes:
 
 configs:
   nginx_conf:
-    name: ${STACK_NAME}_nginx_${NGINX_CONF_VERSION}
+    name: ${STACK_NAME}_nginx
     file: nginx.conf.tmpl
     template_driver: golang
   fpm_tune:
-    name: ${STACK_NAME}_fpm_tune_${FPM_TUNE_VERSION}
+    name: ${STACK_NAME}_fpm_tune
     file: fpm-tune.ini
     template_driver: golang
   entrypoint:
-    name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
+    name: ${STACK_NAME}_entrypoint
     file: entrypoint.sh.tmpl
     template_driver: golang
 

my-tune.cnf

@@ -13,7 +13,7 @@ key_buffer_size                = 16M
 innodb_log_file_size           = 256M
 long_query_time                = 1
 max_allowed_packet             = 256M
-max_connections                = {{ env "MAX_DB_CONNECTIONS" }}
+max_connections                = 100
 max_heap_table_size            = 64M
 max_user_connections           = 0
 myisam_recover_options         = BACKUP

nginx.conf.tmpl

@@ -59,12 +59,12 @@ http {
         #pagespeed off;
 
         # HTTP response headers borrowed from Nextcloud `.htaccess`
-        add_header Referrer-Policy                      "no-referrer"       always;
-        add_header X-Content-Type-Options               "nosniff"           always;
-        add_header X-Download-Options                   "noopen"            always;
-        add_header X-Permitted-Cross-Domain-Policies    "none"              always;
-        add_header X-Robots-Tag                         "noindex, nofollow" always;
-        add_header X-XSS-Protection                     "1; mode=block"     always;
+        add_header Referrer-Policy                      "no-referrer"   always;
+        add_header X-Content-Type-Options               "nosniff"       always;
+        add_header X-Download-Options                   "noopen"        always;
+        add_header X-Permitted-Cross-Domain-Policies    "none"          always;
+        add_header X-Robots-Tag                         "none"          always;
+        add_header X-XSS-Protection                     "1; mode=block" always;
 
         {{ if eq (env "X_FRAME_OPTIONS_ENABLED") "1" }}
         add_header Content-Security-Policy              "frame-ancestors {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }} {{ env "DOMAIN" }}";

release/2.0.0+23.0.3-fpm

@@ -1,6 +0,0 @@
-2.0.0 introduces a minor nextcloud update to 23.0.4 and moves the database service to a seperate override.yml file to support different database types (mariadb / postgres). This might break your installation. Please add the following snippet to your config .env to ensure the right db is used:
-
-```
-COMPOSE_FILE="compose.yml"
-COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
-```

release/3.1.0+25.0.1-fpm

@@ -1,57 +0,0 @@
-
-## FPM Tune
-
-The fpm-tune.ini settings are now configurable by `.env`. Please add this to your servers configs:
-
-```
-# fpm-tune, see: https://spot13.com/pmcalculator/
-FPM_MAX_CHILDREN=131
-FPM_START_SERVERS=32
-FPM_MIN_SPARE_SERVERS=32
-FPM_MAX_SPARE_SERVERS=98
-```
-
-## SMTP
-
-Add SMTP Config to your .env file:
-
-```
-# COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
-# See https://github.com/nextcloud/docker#auto-configuration-via-environment-variables for default values
-# SMTP_AUTHTYPE=
-# SMTP_HOST=
-# SMTP_SECURE=
-# SMTP_NAME=
-# SMTP_PORT=
-# MAIL_FROM_ADDRESS=
-# MAIL_DOMAIN=
-# SECRET_SMTP_PASSWORD_VERSION=v1
-abra app secret insert example.com smtp_password v1 example_password
-```
-
-
-## Post Deploy Commands
-
-Some Apps can also be managed with abra app cmd!
-
-```
-# COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
-# APPS="calendar sociallogin onlyoffice"
-abra app cmd example.com app install_apps
-# ONLYOFFICE_URL=https://onlyoffice.example.com
-# SECRET_ONLYOFFICE_JWT_VERSION=v1
-abra app secret insert example.com onlyoffice_jwt v1 example_password
-abra app cmd example.com app install_onlyoffice
-# BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
-# SECRET_BBB_SECRET_VERSION=v1
-abra app secret insert example.com bbb_secret v1 example_password
-abra app cmd example.com app install_bbb
-```
-
-## Set Quota
-
-```
-# DEFAULT_QUOTA="10 GB"
-abra app cmd example.com app set_default_quota
-```
-

release/3.2.0+25.0.4-fpm

@@ -1,11 +0,0 @@
-If the authentik configuration should be handled by abra add the following to the env:
-
-    COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
-    AUTHENTIK_USER_PREFIX=authentik
-    AUTHENTIK_DOMAIN=authentik.example.com
-    AUTHENTIK_SECRET_NAME=authentik_example_com_nextcloud_secret_v1  # the same as in authentik
-    AUTHENTIK_ID_NAME=authentik_example_com_nextcloud_id_v1  # the same as in authentik
-
-And run:
-
-    abra app cmd <app-name> app set_authentik

release/next

@@ -1 +0,0 @@
-The authentik secrets need to be inserted again, as nextcloud is not sharing the secret with authentik any more.

renovate.json

@@ -1,9 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "ignoreDeps": [
-    "mariadb:10.6"
-  ],
-  "extends": [
-    "config:base"
-  ]
-}