From 827e03bc52f4e84c361ceb2bc79bfe4ddf1816d1 Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Sat, 26 Aug 2023 20:20:57 +0000 Subject: [PATCH] remove files specific to abra, rename yml to yaml --- .drone.yml | 49 --------------- .env.sample | 62 ------------------- .gitignore | 2 +- .vscode/settings.json | 5 -- compose.apps.yml => compose.apps.yaml | 0 ...se.authentik.yml => compose.authentik.yaml | 0 compose.mariadb.yml => compose.mariadb.yaml | 0 compose.postgres.yml => compose.postgres.yaml | 0 compose.smtp.yml => compose.smtp.yaml | 0 compose.yml => compose.yaml | 0 release/2.0.0+23.0.3-fpm | 6 -- release/3.1.0+25.0.1-fpm | 57 ----------------- release/3.2.0+25.0.4-fpm | 11 ---- release/next | 1 - 14 files changed, 1 insertion(+), 192 deletions(-) delete mode 100644 .drone.yml delete mode 100644 .env.sample delete mode 100644 .vscode/settings.json rename compose.apps.yml => compose.apps.yaml (100%) rename compose.authentik.yml => compose.authentik.yaml (100%) rename compose.mariadb.yml => compose.mariadb.yaml (100%) rename compose.postgres.yml => compose.postgres.yaml (100%) rename compose.smtp.yml => compose.smtp.yaml (100%) rename compose.yml => compose.yaml (100%) delete mode 100644 release/2.0.0+23.0.3-fpm delete mode 100644 release/3.1.0+25.0.1-fpm delete mode 100644 release/3.2.0+25.0.4-fpm delete mode 100644 release/next diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index b3002cd..0000000 --- a/.drone.yml +++ /dev/null @@ -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 diff --git a/.env.sample b/.env.sample deleted file mode 100644 index 2e93eee..0000000 --- a/.env.sample +++ /dev/null @@ -1,62 +0,0 @@ -TYPE=nextcloud -TIMEOUT=500 -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" - -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 -# -# 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 diff --git a/.gitignore b/.gitignore index 37b52cc..2eea525 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/.envrc +.env \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index daa4954..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "shellcheck.customArgs": [ - "--shell=bash" - ] -} \ No newline at end of file diff --git a/compose.apps.yml b/compose.apps.yaml similarity index 100% rename from compose.apps.yml rename to compose.apps.yaml diff --git a/compose.authentik.yml b/compose.authentik.yaml similarity index 100% rename from compose.authentik.yml rename to compose.authentik.yaml diff --git a/compose.mariadb.yml b/compose.mariadb.yaml similarity index 100% rename from compose.mariadb.yml rename to compose.mariadb.yaml diff --git a/compose.postgres.yml b/compose.postgres.yaml similarity index 100% rename from compose.postgres.yml rename to compose.postgres.yaml diff --git a/compose.smtp.yml b/compose.smtp.yaml similarity index 100% rename from compose.smtp.yml rename to compose.smtp.yaml diff --git a/compose.yml b/compose.yaml similarity index 100% rename from compose.yml rename to compose.yaml diff --git a/release/2.0.0+23.0.3-fpm b/release/2.0.0+23.0.3-fpm deleted file mode 100644 index 518fb1b..0000000 --- a/release/2.0.0+23.0.3-fpm +++ /dev/null @@ -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" -``` diff --git a/release/3.1.0+25.0.1-fpm b/release/3.1.0+25.0.1-fpm deleted file mode 100644 index cbdbc6e..0000000 --- a/release/3.1.0+25.0.1-fpm +++ /dev/null @@ -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 -``` - diff --git a/release/3.2.0+25.0.4-fpm b/release/3.2.0+25.0.4-fpm deleted file mode 100644 index c5080c8..0000000 --- a/release/3.2.0+25.0.4-fpm +++ /dev/null @@ -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 set_authentik diff --git a/release/next b/release/next deleted file mode 100644 index ee32142..0000000 --- a/release/next +++ /dev/null @@ -1 +0,0 @@ -The authentik secrets need to be inserted again, as nextcloud is not sharing the secret with authentik any more.