diff --git a/ansible/inventories/production/group_vars/webservers/vault.yaml b/ansible/inventories/production/group_vars/webservers/vault.yaml index f5d367d..fe6b9b5 100644 --- a/ansible/inventories/production/group_vars/webservers/vault.yaml +++ b/ansible/inventories/production/group_vars/webservers/vault.yaml @@ -1,18 +1,18 @@ $ANSIBLE_VAULT;1.1;AES256 -62653363616638643933303063396435316366376466643563316461343162633661346638343836 -6232346565306638373931396164303438373261396630610a343536386335336634663239626637 -36376137393433343636366137333336303764616536643864353630366535653936663531373439 -3966363565633630620a373238363535653936383365656366306231666365656265303638393864 -33323363373365613134393261393139656261323036656632366562316264346434393366656165 -35363861303036316465326134653163303835376333633132633332303438666363386330303463 -66376132396666396163306566663534646261653139343432663332323837666165653235633538 -34613037306339623032613939663639663161336539333832333438306466653439306535343134 -64363833666138626561363263323338376261343333623839366236343464363737616232633566 -62633934323463623834653539613039636138666539666665333434663165636639303532333233 -30363437633762366230326231653961373462383330336462313935643761316334666232613261 -64613538363763666666303832393632373934343162613439616535663666373434333632633664 -64623531383239636464393036346565373564356666626632613437303335653465386639623366 -61636231383561336238336334303462643137633465303466633764336630636462626535666633 -61386263316437346666633164616162636234623530343038343338373439616131333538343835 -39386435373035633837383264346266643433366363653566363863393434356337633366363635 -64666465613164353238626165623931633534666438386264633431356332616264 +65303737656632326238636231303166643730313665343038366330623866643834656263303936 +6365633063373036663532356539366535393339343834650a343930366435653561666666333561 +65323333396164323863333262613937313437373232393434643337363638366332663765663037 +3432643961653264300a626234333966343963616461366439643138633633393435343863646138 +66666632366666326632353865636565646435316339643761623235643235643930636435653433 +61363035316462613265616236383531633930393034396661613562306234306261383261666432 +37303332633466646537366139653266303532346437623863326635336535643366346236356562 +66643033353335653961376365363432363563343461386134306137636636643538353232393237 +61333932653134633738326435353564393835353334653732663737323935613837626132396434 +39646334313132623039646432373537633938353638376666663238633631373063323636333733 +31656563316362333138383232326532323832646639386333376330643535666639323834383363 +66383431333834393535353539623730623764373363326431333866636666366637373639666437 +36643665343965303131356336656362333564633161306638356166663963643235353166333131 +33386566356664313837333565613239636233626462333532656566343661323938373338633264 +30376264363566383435363765323864626264646331383162313235633463316532636634356630 +30306666313961613839653939613737316339313932636266666530636463633963306635306665 +62353966313762376333306564633665613632396339616564303433626265633262 diff --git a/ansible/roles/web/templates/nginx.conf.j2 b/ansible/roles/web/templates/nginx.conf.j2 index 578c54b..a808860 100644 --- a/ansible/roles/web/templates/nginx.conf.j2 +++ b/ansible/roles/web/templates/nginx.conf.j2 @@ -22,8 +22,8 @@ server { access_log off; expires 3600; alias {{ release_dir }}/static/; - add_header Cache-Control "public"; - add_header Access-Control-Allow-Origin https://{{ domain }}; + add_header Cache-Control "public"; + add_header Access-Control-Allow-Origin https://{{ domain }}; } # Set a longer expiry for CACHE/, because the filenames are unique. @@ -54,10 +54,26 @@ server { } } +# Beta site configuration +server { + listen 80; + server_name beta.{{ domain }}; + return 301 $scheme://{{ domain }}; +} + +# Web archive configuration +server { + listen 80; + server_name www-old.{{ domain }}; + location / { + alias {{ release_dir }}/www-old/; + } +} + # TODO: parameterize server { listen 80; listen 443 ssl; - server_name conference.public-health.ch; + server_name conference.{{ domain }}; location /fr { return 301 $scheme://sph17.organizers-congress.org/frontend/index.php?sub=89; }