diff --git a/README.md b/README.md index 63ed1e1..ad4157f 100644 --- a/README.md +++ b/README.md @@ -17,54 +17,12 @@ Fully automated luxury Nextcloud via docker-swarm. ## Quick start - * `abra app new nextcloud` * `abra app config ` * `abra app secret insert smtp_password v1 ` * `abra app secret generate -a ` * `abra app deploy ` -### Onlyoffice Integration - -`abra app config ` -Configure the following envs: -``` -COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yaml" -ONLYOFFICE_URL=https://onlyoffice.example.com -SECRET_ONLYOFFICE_JWT_VERSION=v1 -``` - -`abra app secret insert onlyoffice_jwt v1 ` -`abra app cmd app install_onlyoffice` - -### BBB Integration - -`abra app config ` -Configure the following envs: -``` -COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yaml" -BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash! -SECRET_BBB_SECRET_VERSION=v1 -``` - -`abra app secret insert bbb_secret v1 ` -`abra app cmd app install_bbb` - -### Authentik Integration - - -`abra app config ` -Configure the following envs: -``` -COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yaml" -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 -``` - -`abra app cmd app set_authentik` - ### Disable Dashboard Disable dashboard app since it is so corporate: diff --git a/compose.mariadb.yaml b/compose.mariadb.yaml index e3e4297..daea515 100644 --- a/compose.mariadb.yaml +++ b/compose.mariadb.yaml @@ -37,7 +37,7 @@ services: start_period: 1m configs: my_tune: - name: ${STACK_NAME}_my_cnf_${MY_CNF_VERSION} + name: ${STACK_NAME}_my_cnf file: my-tune.cnf volumes: diff --git a/compose.smtp.yaml b/compose.smtp.yaml index dfdc758..e4122fe 100644 --- a/compose.smtp.yaml +++ b/compose.smtp.yaml @@ -15,4 +15,4 @@ services: secrets: smtp_password: external: true - name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION} + name: ${STACK_NAME}_smtp_password diff --git a/compose.yaml b/compose.yaml index d03f5f3..6e7c483 100644 --- a/compose.yaml +++ b/compose.yaml @@ -84,8 +84,6 @@ services: failure_action: rollback order: start-first labels: - - "coop-cloud.${STACK_NAME}.version=5.0.1+27.0.1-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: @@ -122,13 +120,13 @@ services: 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_${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: @@ -140,15 +138,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