Restructured code and matrix rol

This commit is contained in:
2024-01-19 15:12:18 +01:00
parent 0aebca62f6
commit c4209f0559
64 changed files with 249 additions and 224 deletions

View File

@@ -133,8 +133,8 @@ Until NC24 MariaDB version has to be used.
- https://help.nextcloud.com/t/update-to-22-failed-with-database-error-updated/120682
- https://help.nextcloud.com/t/nc-update-to-21-0-0-beta1-exception-database-error/101124/4
- https://wolfgang.gassler.org/reset-password-mariadb-mysql-docker/
- https://unix.stackexchange.com/questions/478855/ansible-docker-container-and-depends-on
- https://unix.stackexchange.com/questions/478855/ansible-docker/container/and-depends-on
- https://github.com/gdiepen/docker-convenience-scripts
- https://help.nextcloud.com/t/several-issues-after-upgrading-to-nextcloud-21/113118/3
- https://forum.openmediavault.org/index.php?thread/31782-docker-nextcloud-talk-plugin-and-turnserver/
- https://help.nextcloud.com/t/nextcloud-talk-im-docker-container-turn-server-auf-docker-host-kein-video/84133/10
- https://help.nextcloud.com/t/nextcloud-talk-im-docker/container/turn-server-auf-docker-host-kein-video/84133/10

View File

@@ -1,6 +1,6 @@
---
- name: "include docker-compose-database.yml"
include_tasks: docker-compose-database.yml
- name: "include docker/compose/database.yml"
include_tasks: docker/compose/database.yml
- name: "include task certbot-matomo.yml"
include_tasks: certbot-matomo.yml

View File

@@ -2,9 +2,9 @@ version: '3'
services:
{% include 'templates/docker-service-redis.yml.j2' %}
{% include 'templates/docker/services/redis.yml.j2' %}
{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
{% include 'templates/docker/services/' + database_type + '.yml.j2' %}
application:
image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
@@ -19,8 +19,8 @@ services:
MYSQL_USER: "{{database_username}}"
MYSQL_PASSWORD: "{{database_password}}"
MYSQL_HOST: {{database_host}}:3306
{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
{% include 'templates/docker/container/depends-on-database-redis.yml.j2' %}
{% include 'templates/docker/container/networks.yml.j2' %}
web:
image: nginx:alpine
@@ -39,7 +39,7 @@ services:
interval: 1m
timeout: 10s
retries: 3
{% include 'templates/docker-container-networks.yml.j2' %}
{% include 'templates/docker/container/networks.yml.j2' %}
cron:
container_name: nextcloud-cron
@@ -50,11 +50,11 @@ services:
volumes:
- data:/var/www/html
entrypoint: /cron.sh
{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
{% include 'templates/docker-container-networks.yml.j2' %}
{% include 'templates/docker/container/depends-on-database-redis.yml.j2' %}
{% include 'templates/docker/container/networks.yml.j2' %}
{% include 'templates/docker-compose-volumes.yml.j2' %}
{% include 'templates/docker/compose/volumes.yml.j2' %}
data:
redis:
{% include 'templates/docker-compose-networks.yml.j2' %}
{% include 'templates/docker/compose/networks.yml.j2' %}