Tips-Of-Mine/infrastructure
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary extra variable definitions

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/mastodon/files/docker-compose.yml
View File

@ -12,10 +12,10 @@ services:
- DATABASE_URL=postgresql://mastodon:mastodon@db/mastodon
- REDIS_URL=redis://redis
- SIDEKIQ_REDIS_URL=redis://redis/1
- SECRET_KEY_BASE={{ secret_key_base }}
- OTP_SECRET={{ otp_secret }}
- VAPID_PRIVATE_KEY={{ vapid_private_key }}
- VAPID_PUBLIC_KEY={{ vapid_public_key }}
- SECRET_KEY_BASE={{ vault_secret_key_base }}
- OTP_SECRET={{ vault_otp_secret }}
- VAPID_PRIVATE_KEY={{ vault_vapid_private_key }}
- VAPID_PUBLIC_KEY={{ vault_vapid_public_key }}
- TRUSTED_PROXY_IP=172.20.0.1
- SINGLE_USER_MODE=true
- DEFAULT_LOCALE=en

4
ansible/roles/mastodon/vars/main.yml
View File

@ -1,4 +0,0 @@
secret_key_base: "{{ vault_secret_key_base }}"
otp_secret: "{{ vault_otp_secret }}"
vapid_private_key: "{{ vault_vapid_private_key }}"
vapid_public_key: "{{ vault_vapid_public_key }}"