Merge branch 'nextcloud-sql-vars' of https://github.com/Blackfell/ansible-nas into Blackfell-nextcloud-sql-vars

This commit is contained in:
Dave Stephens 2021-01-22 15:57:56 +00:00
commit 33453cbac9
3 changed files with 14 additions and 9 deletions

View file

@ -84,7 +84,6 @@ pytivo_enabled: false
### General ### General
### ###
# Will be added to the docker group to give user command line access to docker # Will be added to the docker group to give user command line access to docker
ansible_nas_user: david ansible_nas_user: david

View file

@ -7,4 +7,9 @@ nextcloud_data_directory: "{{ docker_home }}/nextcloud"
# network # network
nextcloud_port: "8080" nextcloud_port: "8080"
nextcloud_hostname: "nextcloud" nextcloud_hostname: "nextcloud"
# username / passwords
nextcloud_sql_user: "nextcloud-user"
nextcloud_sql_pass: "nextcloud-pass"
nextcloud_sql_secret: "nextcloud-secret"

View file

@ -16,9 +16,9 @@
- "{{ nextcloud_data_directory }}/mysql:/var/lib/mysql:rw" - "{{ nextcloud_data_directory }}/mysql:/var/lib/mysql:rw"
env: env:
MYSQL_DATABASE: "nextcloud" MYSQL_DATABASE: "nextcloud"
MYSQL_USER: "nextcloud-user" MYSQL_USER: "{{ nextcloud_sql_user }}"
MYSQL_PASSWORD: "nextcloud-pass" MYSQL_PASSWORD: "{{ nextcloud_sql_pass }}"
MYSQL_ROOT_PASSWORD: "nextcloud-secret" MYSQL_ROOT_PASSWORD: "{{ nextcloud_sql_secret }}"
restart_policy: unless-stopped restart_policy: unless-stopped
memory: 1g memory: 1g
@ -36,9 +36,9 @@
env: env:
MYSQL_HOST: "mysql" MYSQL_HOST: "mysql"
MYSQL_DATABASE: "nextcloud" MYSQL_DATABASE: "nextcloud"
MYSQL_USER: "nextcloud-user" MYSQL_USER: "{{ nextcloud_sql_user }}"
MYSQL_PASSWORD: "nextcloud-pass" MYSQL_PASSWORD: "{{ nextcloud_sql_pass }}"
NEXTCLOUD_TRUSTED_DOMAINS: "nextcloud.{{ ansible_nas_domain }}" NEXTCLOUD_TRUSTED_DOMAINS: "{{ nextcloud_hostname }}.{{ ansible_nas_domain }}"
restart_policy: unless-stopped restart_policy: unless-stopped
memory: 1g memory: 1g
labels: labels:
@ -47,4 +47,5 @@
traefik.http.routers.nextcloud.tls.certresolver: "letsencrypt" traefik.http.routers.nextcloud.tls.certresolver: "letsencrypt"
traefik.http.routers.nextcloud.tls.domains[0].main: "{{ ansible_nas_domain }}" traefik.http.routers.nextcloud.tls.domains[0].main: "{{ ansible_nas_domain }}"
traefik.http.routers.nextcloud.tls.domains[0].sans: "*.{{ ansible_nas_domain }}" traefik.http.routers.nextcloud.tls.domains[0].sans: "*.{{ ansible_nas_domain }}"
traefik.http.services.nextcloud.loadbalancer.server.port: "80" traefik.http.services.nextcloud.loadbalancer.server.port: "80"