diff --git a/ansible/inventories/production/group_vars/webservers/vars.yaml b/ansible/inventories/production/group_vars/webservers/vars.yaml index 08f75fa..9bb422c 100644 --- a/ansible/inventories/production/group_vars/webservers/vars.yaml +++ b/ansible/inventories/production/group_vars/webservers/vars.yaml @@ -11,7 +11,7 @@ nginx_worker_connections: 1024 domain: "{{ vault_domain }}" -allowed_domains: "public-health.ch,www.public-health.ch,sphc.ch,www.sphc.ch,ngo-allianz-ebk.ch,www.ngo-allianz-ebk.ch" +allowed_domains: "{{ vault_allowed_domains }}" django_email_key: "{{ vault_django_email_key }}" django_email_domain: "{{ vault_django_email_domain }}" diff --git a/ansible/inventories/production/group_vars/webservers/vault.yaml b/ansible/inventories/production/group_vars/webservers/vault.yaml index cbcdf3e..c7db07f 100644 --- a/ansible/inventories/production/group_vars/webservers/vault.yaml +++ b/ansible/inventories/production/group_vars/webservers/vault.yaml @@ -1,26 +1,30 @@ $ANSIBLE_VAULT;1.1;AES256 -64323731623536653336346263646165376238396136343731396265393238336332363864623235 -3238396439653134383561663632313235633164376532360a623131633339643230333161303034 -36666462383131386638656464643762613433653637323761356661623163363830346438323961 -6435316361303862370a616436336565373261633262393963373538363038346666386164626236 -62613066386435353631633337393330353131666332323333306661396264396166316330633239 -66633966363265626635653062636230316239373332653461616362646364666431326366633334 -31303462616533336266323862666539653161316535653637366533626439383362646535653463 -33656235313865626139383938343663613230383433356132363963616566303834613930613539 -38323430623131333437613566643534306534663138643530326139356362333664636139633936 -66616636303435326233363961306436393235343963646337613031373536646630613738626662 -66343930383735396366316536386266376363653834616661633334653631313837643036336565 -65623532323366393038333836303031303462646135356432363561646563336538393438393536 -63616538373339616366373364313564633530386631333137396633616365643532376233636132 -32653937306162363734326465343637393136656338393866383839373031303236613833613731 -37303336663564383635626135313839613836383063666430383639656238366135396532393562 -63633466313635333531306664646238373331313336633638663464663930623562343062363535 -39363434613137346165303435373632623635383062643464613230626366636662646333616239 -39313762613562663063323439386432303337363839613032333231383233346332643739366632 -61393066623037656237396432663335666466656363353737623739303065623166346631646464 -65303536373566353961613663343731373632376266663661333432626232373834396238633964 -66623561346336303433316264663665346431623532383534343335343837396435303437346530 -32303834663236633662303566653737326634313636376338303135303463316130633062323636 -38393166666336636561626233303366613261666338666465373633343332663737663033323137 -64393137633038326538373131326633613731636639303266633937366132623331333634643463 -6633 +33323733383664316237356237633830373336663164386434633162373636393465333039626665 +3437663665663632316365616136643832663864386636380a623564643732313765373730303936 +39343762316539613662646562663666663030646238336235316262646637613763333733626432 +3031643839303135360a323233353930373565373134353532306230316435613736353862643164 +37316666303739623061316630323161393030366132663765666663623731396262353132336237 +38376363373830643432633765636638666133376436326236666133663334396331613531393435 +30373064366464663566643433383365626438303466383739633337353162656338373834636236 +34626465653234656264646264653437373535663433643032636235653266663362386639366566 +36653436633136336162373337633464633266616265333337623562626262653633356165323437 +30326662623732343836393066653761646531633731303161383064366365666634636236303536 +37313238656334633330366631666166353463643165393635663938333439333566306564393734 +39643837376262323365316361313337383962353363373361396435656233333433663238323863 +36306239323662373963373433333736353233333563323561646237326336333964363863353734 +66633261366334393633323262623931323062663438653035343162656662343161613539393531 +35343363313837613163336639623563656339653835653630393231333463656533386634333637 +63353461623061303531303039373666613632613437313863343631306163356661646633353833 +34393965393965333365653134326363376562633430666137313665623438663236633366373839 +30373038386136666363353064613764326638363233646265323730343931336536393632623262 +31356236653865656132663137353532393766653730313065353732303737386362636334656333 +33373337646638316531326131353030363463343834336531346461303537316430313633353532 +63643563626361303934316632633639643434613438333030333038623538376561613461373065 +32613262346262663532333261303863643939663361343036316232366434343438623961646566 +63393930663563633535386364323765326430653033663137396338386139653764356663623234 +62343330303431666361623531643534616665633938636435653661666331363237343831383039 +64373732353765616637356261643631356562636162323030646137396132666231653338643863 +37376632386538306263306662613839616130616130343435666630393438653131643032356463 +65353830653533356561393536326163366532653334363662663764376162383130343837313566 +35663163323563626237633633656263663632643762626664633862333330363031383833633433 +3465 diff --git a/ansible/roles/web/templates/docker-compose.j2 b/ansible/roles/web/templates/docker-compose.j2 index ad105f2..3b508a7 100644 --- a/ansible/roles/web/templates/docker-compose.j2 +++ b/ansible/roles/web/templates/docker-compose.j2 @@ -13,7 +13,7 @@ web: - "5000:5000" environment: - DJANGO_SETTINGS_MODULE={{ django_project_name }}.settings.production - - ALLOWED_HOSTS={{ allowed_domains }},{{ ipv4_addresses|join(':5000,') }} + - ALLOWED_HOSTS=www.{{ allowed_domains|join(',www.') }},{{ allowed_domains }},{{ ipv4_addresses|join(':5000,') }} - SECRET_KEY={{ django_secret_key }} - MAILGUN_KEY={{ django_email_key }} - MAILGUN_DOMAIN={{ django_email_domain }}