forked from data.coop/ansible
Fixing watchtower and membersystem.
This commit is contained in:
parent
9f3a6c67ff
commit
73adef15f9
|
@ -1,3 +1,4 @@
|
||||||
|
---
|
||||||
volume_root_folder: "/docker-volumes"
|
volume_root_folder: "/docker-volumes"
|
||||||
|
|
||||||
nginx:
|
nginx:
|
||||||
|
@ -98,10 +99,14 @@ postfix:
|
||||||
allowed_sender_domains:
|
allowed_sender_domains:
|
||||||
- "services.{{ base_domain }}"
|
- "services.{{ base_domain }}"
|
||||||
- "{{ passit.domain }}"
|
- "{{ passit.domain }}"
|
||||||
- "{{ fider.domain }}"
|
|
||||||
- "{{ gitea.domain }}"
|
- "{{ gitea.domain }}"
|
||||||
- "{{ mastodon.domain }}"
|
- "{{ mastodon.domain }}"
|
||||||
|
- "{{ membersystem.domain }}"
|
||||||
|
|
||||||
mastodon:
|
mastodon:
|
||||||
domain: "social.{{ base_domain }}"
|
domain: "social.{{ base_domain }}"
|
||||||
volume_folder: "{{ volume_root_folder }}/mastodon"
|
volume_folder: "{{ volume_root_folder }}/mastodon"
|
||||||
|
|
||||||
|
membersystem:
|
||||||
|
domain: "member.{{ base_domain }}"
|
||||||
|
django_admins: "Vidir:valberg@orn.li"
|
|
@ -33,3 +33,4 @@
|
||||||
registry: "{{ docker_registry.domain }}"
|
registry: "{{ docker_registry.domain }}"
|
||||||
username: "docker"
|
username: "docker"
|
||||||
password: "{{ docker_password }}"
|
password: "{{ docker_password }}"
|
||||||
|
config_path: "{{ docker_registry.volume_folder }}/auth/config.json"
|
||||||
|
|
|
@ -27,12 +27,13 @@
|
||||||
POSTGRES_PORT: 5432
|
POSTGRES_PORT: 5432
|
||||||
EMAIL_BACKEND: "django.core.mail.backends.smtp.EmailBackend"
|
EMAIL_BACKEND: "django.core.mail.backends.smtp.EmailBackend"
|
||||||
EMAIL_URL: "smtp://noop@{{ smtp_host }}:{{ smtp_port }}"
|
EMAIL_URL: "smtp://noop@{{ smtp_host }}:{{ smtp_port }}"
|
||||||
VIRTUAL_HOST: "member.data.coop"
|
VIRTUAL_HOST: "{{ membersystem.domain }}"
|
||||||
LETSENCRYPT_HOST: "member.data.coop"
|
LETSENCRYPT_HOST: "{{ membersystem.domain }}"
|
||||||
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
|
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
|
||||||
ALLOWED_HOSTS: "member.data.coop"
|
ALLOWED_HOSTS: "member.data.coop"
|
||||||
DJANGO_ADMINS: "Vidir:valberg@orn.li"
|
CSRF_TRUSTED_ORIGINS: "https://member.data.coop"
|
||||||
DEFAULT_FROM_EMAIL: "support@data.coop"
|
DJANGO_ADMINS: "{{ membersystem.django_admins }}"
|
||||||
|
DEFAULT_FROM_EMAIL: "noreply@{{ membersystem.domain }}"
|
||||||
labels:
|
labels:
|
||||||
com.centurylinklabs.watchtower.enable: "true"
|
com.centurylinklabs.watchtower.enable: "true"
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,7 @@
|
||||||
- name: external_services
|
- name: external_services
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
- /root/.docker/config.json:/root/.docker/config.json
|
- "{{ docker_registry.volume_folder }}/auth/config.json:/config.json"
|
||||||
env:
|
env:
|
||||||
WATCHTOWER_LABEL_ENABLE: "true"
|
WATCHTOWER_LABEL_ENABLE: "true"
|
||||||
WATCHTOWER_POLL_INTERVAL: "600"
|
WATCHTOWER_POLL_INTERVAL: "60"
|
||||||
|
|
Loading…
Reference in a new issue