Remove unnecessary extra variable definitions

The world could do with a bit less YAML!
This commit is contained in:
Jake Howard
2023-12-14 22:03:23 +00:00
parent 7ad5d6e51e
commit b33e19e152
40 changed files with 81 additions and 158 deletions

View File

@ -13,15 +13,15 @@ services:
environment:
- APP_UID={{ docker_user.id }}
- REMARK_URL=https://remark.theorangeone.net
- SECRET={{ remark_secret }}
- ADMIN_PASSWD={{ remark_admin_password }}
- SECRET={{ vault_remark_secret }}
- ADMIN_PASSWD={{ vault_remark_admin_password }}
- SITE=theorangeone
- TIME_ZONE={{ timezone }}
- SMTP_HOST=smtp.eu.mailgun.org
- SMTP_USERNAME={{ remark_smtp_username }}
- SMTP_PASSWORD={{ remark_smtp_password }}
- NOTIFY_EMAIL_FROM={{ remark_from_email }}
- AUTH_EMAIL_FROM={{ remark_from_email }}
- SMTP_USERNAME={{ vault_remark_smtp_username }}
- SMTP_PASSWORD={{ vault_remark_smtp_password }}
- NOTIFY_EMAIL_FROM={{ vault_remark_from_email }}
- AUTH_EMAIL_FROM={{ vault_remark_from_email }}
- SMTP_TLS=true
- SMTP_PORT=465
- ADMIN_EDIT=true
@ -30,10 +30,10 @@ services:
- EMOJI=true
- DISABLE_SIGNATURE=true
- AUTH_ANON=true
- AUTH_GITHUB_CID={{ remark_github_client_id }}
- AUTH_GITHUB_CSEC={{ remark_github_client_secret }}
- AUTH_GITHUB_CID={{ vault_remark_github_client_id }}
- AUTH_GITHUB_CSEC={{ vault_remark_github_client_secret }}
- ALLOWED_HOSTS=remark.theorangeone.net,theorangeone.net
- ADMIN_SHARED_EMAIL={{ remark_admin_email }}
- ADMIN_SHARED_EMAIL={{ vault_remark_admin_email }}
volumes:
- ./remark:/srv/var

View File

@ -1,8 +0,0 @@
remark_github_client_id: "{{ vault_remark_github_client_id }}"
remark_github_client_secret: "{{ vault_remark_github_client_secret }}"
remark_smtp_username: "{{ vault_remark_smtp_username }}"
remark_smtp_password: "{{ vault_remark_smtp_password }}"
remark_from_email: "{{ vault_remark_from_email }}"
remark_secret: "{{ vault_remark_secret }}"
remark_admin_password: "{{ vault_remark_admin_password }}"
remark_admin_email: "{{ vault_remark_admin_email }}"