diff --git a/ansible/inventories/production/group_vars/webservers/vars.yaml b/ansible/inventories/production/group_vars/webservers/vars.yaml index 4372a9f..d48bc5a 100644 --- a/ansible/inventories/production/group_vars/webservers/vars.yaml +++ b/ansible/inventories/production/group_vars/webservers/vars.yaml @@ -16,3 +16,6 @@ django_email_domain: "{{ vault_django_email_domain }}" django_email_from: "{{ vault_django_email_from }}" django_secret_key: "{{ vault_django_secret_key }}" + +# Default: postgres://postgres:@postgres:5432/postgres +django_postgres_url: "{{ vault_django_postgres_url }}" diff --git a/ansible/inventories/production/group_vars/webservers/vault.yaml b/ansible/inventories/production/group_vars/webservers/vault.yaml index fe6b9b5..7217534 100644 --- a/ansible/inventories/production/group_vars/webservers/vault.yaml +++ b/ansible/inventories/production/group_vars/webservers/vault.yaml @@ -1,18 +1,25 @@ $ANSIBLE_VAULT;1.1;AES256 -65303737656632326238636231303166643730313665343038366330623866643834656263303936 -6365633063373036663532356539366535393339343834650a343930366435653561666666333561 -65323333396164323863333262613937313437373232393434643337363638366332663765663037 -3432643961653264300a626234333966343963616461366439643138633633393435343863646138 -66666632366666326632353865636565646435316339643761623235643235643930636435653433 -61363035316462613265616236383531633930393034396661613562306234306261383261666432 -37303332633466646537366139653266303532346437623863326635336535643366346236356562 -66643033353335653961376365363432363563343461386134306137636636643538353232393237 -61333932653134633738326435353564393835353334653732663737323935613837626132396434 -39646334313132623039646432373537633938353638376666663238633631373063323636333733 -31656563316362333138383232326532323832646639386333376330643535666639323834383363 -66383431333834393535353539623730623764373363326431333866636666366637373639666437 -36643665343965303131356336656362333564633161306638356166663963643235353166333131 -33386566356664313837333565613239636233626462333532656566343661323938373338633264 -30376264363566383435363765323864626264646331383162313235633463316532636634356630 -30306666313961613839653939613737316339313932636266666530636463633963306635306665 -62353966313762376333306564633665613632396339616564303433626265633262 +34373534356337373735383264656138376432663764356630333235346133353234623566613739 +3065646433356138376636326435656562636161393834330a313433626664643232383865323762 +33613566356536373366346237626639303162383263323732636333386437653038336439636535 +3666323366623337350a626434386262646434373364656437336436343864333537366334653932 +32646538343936323434643739653732376334613863366661646539306130306439613738383336 +64343835333138396162303366363333613737663163323439373737363437346561663636376634 +35643931633436393533383235343832653264663836323235656431343030383239316436346332 +63343466663831663033326662646466636365643437333966383133353130316266623761316430 +36333564373632383666346435663466393164663863643838313334393034663932326465663333 +30623539396166366530366666396638613564383663643636336465626337303237666630316266 +37636533623539313830623738373633643239373632336336313533393031346235343838613732 +65323263663739383165306562336233343265356338386637623666333864383161323934346236 +62383334383466613537616537323838316130633461316533383938613036303335333761373164 +33363332366638636435343864326661666333356366333864623762393437643737353739356630 +37336564383839373635306537393736383461653737303935303131373037623433386361376564 +33643638356639363238313165653062663430663139306565303966363830636131303438343035 +61313433343566323637333834383838656635363932333564323033643566663165336431613939 +63636539313262663433643561656133343832643236653933353431356536623737373237343366 +34663234653135653833346535613238383536336535366333376332383365323032653334333435 +62306264393338323264613333633539333034313131306261356439323838643635643866343065 +33653630343964373932663063366334383461656638616461336563346463363161663036636333 +35373837366363333765356565313462323436353439303564643733303432633762646234383161 +38626165363930636163343661363236346331353963396535623536623839653761616237666236 +32316663373335626330 diff --git a/ansible/roles/web/templates/docker-compose.j2 b/ansible/roles/web/templates/docker-compose.j2 index 836bbd0..b47c336 100644 --- a/ansible/roles/web/templates/docker-compose.j2 +++ b/ansible/roles/web/templates/docker-compose.j2 @@ -18,7 +18,7 @@ web: - MAILGUN_KEY={{ django_email_key }} - MAILGUN_DOMAIN={{ django_email_domain }} - MAILGUN_FROM={{ django_email_from }} - - DATABASE_URL=postgres://postgres:@postgres:5432/postgres + - DATABASE_URL={{ django_postgres_url }} - ELASTICSEARCH_URL=http://elasticsearch:9200 - REDIS_URL=redis://redis:6379 - LOG_DIR=/var/log/wagtail