alanorth/ansible-personal
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Finish moving logic and variables from nginx_tls_vhosts to nginx_vhosts

Browse Source 
Everything is TLS now (whether self-signed or not), so it's pointless
to distinguish.

Signed-off-by: Alan Orth <alan.orth@gmail.com>
This commit is contained in:
Alan Orth 2015-12-10 00:14:47 +02:00
parent 7b9536838c
commit 41547defb9
Signed by: alanorth
GPG Key ID: 0FB860CC9C45B1B9
5 changed files with 94 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
host_vars/web06
View File

@ -1,80 +1,80 @@
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
30376135363462343939326338336531346662633838366138353637636434383764373536383836 30663034313534353238656630633931333934623264636663613431333964653564396461343966
6432396132616361333036623930393664356539333438630a626362666261613534353338643565 6561343630653135313130333733343131386364366439390a333961306238633536306335656539
65373439633035323136643364356362613034616661643266653636333233616533396432623432 62386564666363346361353930316336323536373964303866336361393065326539396464363237
3932373332386237390a363538656162306262376439313033386363643438393763663730313439 3863613337623836650a343835383035613165393734653763666130616565626135363031643164
34356164386636393934313066306262623835346433313563316663346530656134366639376637 35333433646564383635643832356365646633303533386335323330383836316235366563323334
65663835346530396365383839393738663332386435646631396636323338623339393733383236 31376631623530656563386137613839323262396664646465333234393864366464646339303464
65646638316535623434316463376266366561663830306534616336323734643339363430336135 32643437373632306437353130343330616336303034626466613232613432313739373933633737
30313238666430303639343637353863316232313634323263633333313730376432376530303764 64336332346436353262666365626263636230333935643966353535653534373339623261636131
61343661653066616138303264613332373936303237666466613535323530393235363763363136 36646465393632623731663136346439333931373835313262663430313735396335353631373737
37653264356331633330626237323864336361383037646539356135656431656531303363316434 31353038303534353837383334383163616131666434663231356163633463363764353836396361
32376364633534666466613339643465613461626630323836663461373532633039326365643536 61616635353863346330303264373534363865643132343133643231333332373231326534653432
37396137633563386130386230323162636232626632303636633837393037633736323037386238 32356137313938383437666430336662633837373431373336333831313562393762313731343032
30623466626535633030663338323566646430616138646261383862616634636235326439666530 64366437363434396164653839363937306532323936346565333131363761303262633265613730
37653434633937333032623838656565393235363031306432376539666438613538643334383137 64376263323730623065663032353662303339313831366335373438323537326161376436373632
61363966393462353964333732363264346235633634633930633162643736653737353434633535 36613664636638363434353731366338383063653731353065623066666237373662346535666262
34343661623837376266346565323432366133623736666562353664383737353464616166623037 36333862636231353565663866656134326133343162306263343030333739346636316539636561
37373837333033343230616330323239393537303930623765656636623764303837666665653137 38313238383333373361373637623965333566343664636534373632313965306635613035356332
37303431326638303265396665323664613534613366663563373866316331303231333330336533 35386430303061353961663734616434636235376666386632343732613662636438386635353435
38653239326234396535393865653761613963373639353064313932376362323937383134346436 36343136666463663363656233656538363166343562623366616364383366643465353234313039
61356534333333336566316666643733663838623238613336376463336231336164653837323236 30363264633937383637326433386265373061326539353561623736353431623063303339666133
34616266656234326333626165616638653136363634323262333131653464396334333435626566 34393662343637613266323430653938636462633739613637623338393561633165626638653433
63323464383832303434343031636231643361353134656430356431623335313836353765616532 34363564616537353031353632386637656363356138653361383764346461336164396361363638
39343262623463356339313134356334663061346139633162623531623636623238303463363735 37356665353864333163376565323034613830613734333134393432663561346338393838343632
63653135646130346531396536363434626166666434306531343964353665363730636230346535 34373835653361313434306564656463616362656134343361386139353438623430646664656532
65363638306633326464343565346264346335653439613034303630303433643938386161356637 36366334353235366232623266633935376132316432303436393133376365383335643238623061
37313334666565626533326561333030343834333562363336653936666635373733346564363636 38303361613133363537366665323166303463353031396135323462336536333531666638373565
30343435386432613732313763666566326462386138336564623134326266313435376331633639 34353634376365316234623239323735396539626162316533333935653062363238363461333438
36383361626138643963613066366230396665646438373137383864636465383835313434613538 33393361623133623436623761366465376433663830616231356237633366323837376162363665
64613562326566633431666431393437363663613262623933363861626534343831356230633839 39306635363634343161306535663131386332366630666637376539303965366630343765633361
37313364346537303431623461356633636639313963313766396139393037316339653830306363 39366135326532653261313930366465336538613362303264356162363035333438616462366130
35656434353731643139656234393665316462316563313962343037363031666564303564393662 62623433626461623933353830303863363339613634313564333139636634336466363032343362
34393333653263653661323761646366326338363965396261636436356234656466306561643765 39663862326236393337396332646330613734366431303665643930623335363961336131386161
33643732346164316563336261386132316338373233353665303733396562653336363438353035 63663335653335373031326266333033373365666335643461356263633130643237346465373735
30616638613338356436306163386366353433626634626561356165363765383539646432313334 36636232373235653763643239623662303535666336396133386231303439353562346164623730
39303032386466323766633366303634616632343837336332663065323332376139386131653638 37343635383831653165633631643063613638666166616231616536353934613633336662343266
33613532643031626132613062326439633462393837356164666566663834373633326233376339 35656465393938343830623335643930653637306266366436646366356630646264346264313631
38663962646630343062353537613233373638626136613635656564323137336565393436336561 37636539663261303731323862666466316231306232366661636238356235643165643932643432
63313361373662643232353135613030393764663831333337646464643766356439393839343430 38313134313137353038363064313239386435356536663638393830386533346664313838373936
39656265336366663636643335386239303135363039376364626430376331623638376166333331 65343666303362346333366135626534386331353161363930656666646164343932656366343430
31356532663631316338353032303662653230636235656136396631303566653635353764663835 30356436653534616135353034313163613566633264633763353731333439373434386563363232
64633763636365626236333438393931613537393239666635633939376165623966666262663933 38303131613139373035396435313563393165326366343930346262393932323363313538636437
32653837646461383562366464386635333261376336666163623263393031363566313138316538 61323936366637303961336365393435656439666261316634653330653838633333333539393262
63643961356435376230373462323164613631396531333434353130656632383532653664636639 37636136633836313630656235303663333462356530613930343532386236323631306439313461
36373334313665343266656563336637356537363831613236346338363430376263666563313666 36363164656332613733663730303830663366323266386361363561316136663338396638656561
32333363343830333935303062623430333830353963633338323533616339613339626664303930 61656535636630643637663961626664356633613966373038626537643734313332666139666232
35633765646566626138393030326464363939333264653936336666396638666531373866623736 36613563386433653233396434646530303033643134633061663139656262656532623362356138
64316338646461646466376232383866636362386665353061623263303430666137646261363865 65376365363732396130363262373638366462326331333465656333306136366235336264323964
62353133393664386530303332633237646538623864666566356363306166626365393463383839 35363731666233303031343565333234323038326365343465616231363733376339363237323137
32613361646562346137393333326436326161366334623839346665663233366234333661356636 32333564376434323739373765653133636161616639323930363734636632636535643461323336
65636466303435373532636566623164643035346635623439663864623961323166333564663535 61313863653333383133373039633665353236616635373363636135356338653233346662643139
61306664623039636263396135386531303534643061396435656336356138393836643062343732 65613835623963626634363234653234386361343037653761663862363166663430626439653766
37336637336331643433376538333863623461386165653563633961663739616239636336633965 37306536306165656363333464666361316535313166383233303266316165343238303130303432
61663066656465396132386538306137383265336331373335393466333135626164316161396138 61616265353466633630343231303331323635343761616436633736366630613361336238383464
31383235383633386536643736626666613937356330393565316636356664623265336638373733 37356163656135666339653465343337623765356163333964393930323939646639373162393062
35383362643362316530326637366130373936343561616533386333313336623065616431653564 35326661643963326237303930303437613030333732323863383836326365393136613530386362
65633435393035663630356664653431303637373863663934616230646565326161623838326665 33636239313636623837643564663431323933313732613230363764626631383135626636623732
31393132646637666264396163343163306539666364386163636163343336336237346465303336 33303731656534333362653961623938353038373030343433376636666135653964633933306530
34363533316335346530366336323434333738386134333863643862313365613535323434653236 61333233653332396465643330396461303162303161343632373638366363386638383835633734
34373036633366396230353665663866653133383462346430626165643634326664613930373731 64366432323838363837666231353061323261663535356131623430626633343135316437616431
38633734383565363163633838653539393539376562633830653066343536353237313039393962 37636435626465343366343162373839633935663964363538396231393634353034643566663238
62646138333364333233363138376130653965383333653837393138393838656331643765316538 33323336316532323035666164653737336234303764636237323766663733383833393265383538
36316636303333336138303537366334346139636230616664383132383330333433613131303763 35333635636264333334613037666462653262343132643266616463356339393464386531373962
62666538316132306338626532373435633332303737653731393361633936323635663333336564 64393565353735626337633163376265646537646661643131363434373663343363336664376535
63333733303833383237316666633437656664373463303664343138363939353463636465613838 64366230343766656461376563366165646131613466393762393334633739616664666538663735
39376162316662393434326639343532373261653437313561396166313539343364373565323934 30366131326238353761346130656666653936316634366664653730306264353835656333643332
62613230643563633461363436353766383536386165666136333130643633633637346365396534 64316562383934393761666663623335353465663438383061663937656239666134303663353337
37336539626166643766316366346636303663383130333335383037313637343766303165636438 30313938663662666466643365636138356333616630646139363139356639356132343531306332
63663032393534643963633965383762353863636166353236663036373762306636643463646662 65636230393662636632626432373863356632346530353764393163356333623637373238643831
65366436396535326138663134613562393330313132343231376131346665613336346665613630 33373739643430363632313833383931326662663639346533376336383139316463616563343232
33386565336537316132373263646538623665363934623931383962643334343461303530323566 39383632356230363236626437376364613639376162613836393233663265663565666463343263
32653131623765383765313938663866303837633432386263633765666436343862313834626466 32376232633636376663346437326635343461343630666263636264313465356437616432616363
64656564633033383866613830646265383161313565653535303564313966373664336663333562 62633338366661326366313362323462333061623033626265656133366261363565346133323133
38383963663538333432376466386135356665343337643366373139336536633236363634326139 66356363656463643966633566326238393464653535313964306166623639653266313430633137
37303533383366333430663335336138656134663336396565363161346638313139663135336132 35353862356535623561643635363937386335313834663138336134643961363434336439663964
63316337626339666563633963366364303638636235333533343064633233386330333562373561 34626461383531333533346632653237613632316565663938616531383831316361303331333863
64656432613537386364323163393034316639346566343037633930636637353765366661346636 64396264363266303861373832313164326163656366666334316537333339306536353965356437
33363434353162633137393033353963653433306466346434333232303361663833316236663161 61313636633332376366636364383562333737383439353561333961363532646464653233373537
66653863306236353365323931623831623232336431383466383666666665323430383635366237 37653239623362313563633737626437643931393338633230333634323939613933343930333939
343538383864323532313139613632653037 393630323735333832633865353562326466

4
roles/nginx/tasks/main.yml
View File

@ -28,8 +28,8 @@
- name: Create fastcgi cache dir - name: Create fastcgi cache dir
file: path=/var/cache/nginx/cached/fastcgi state=directory owner=nginx group=nginx mode=0755 file: path=/var/cache/nginx/cached/fastcgi state=directory owner=nginx group=nginx mode=0755
- include: tls_vhosts.yml - include: vhosts.yml
when: nginx_tls_vhosts is defined when: nginx_vhosts is defined
tags: nginx tags: nginx
- name: Configure blank nginx vhost - name: Configure blank nginx vhost

8
roles/nginx/tasks/vhosts.yml
View File

@ -2,7 +2,7 @@
- name: Configure https vhosts - name: Configure https vhosts
template: src=vhost.conf.j2 dest={{ nginx_confd_path }}/{{ item.nginx_domain_name }}.conf mode=0644 owner=root group=root template: src=vhost.conf.j2 dest={{ nginx_confd_path }}/{{ item.nginx_domain_name }}.conf mode=0644 owner=root group=root
with_items: nginx_tls_vhosts with_items: nginx_vhosts
notify: notify:
- reload nginx - reload nginx
@ -18,18 +18,18 @@
- name: Create vhost document roots - name: Create vhost document roots
file: path={{ nginx_root_prefix }}/{{ item.nginx_domain_name }} state=directory mode=0755 owner=nginx group=nginx file: path={{ nginx_root_prefix }}/{{ item.nginx_domain_name }} state=directory mode=0755 owner=nginx group=nginx
with_items: nginx_tls_vhosts with_items: nginx_vhosts
- name: Install WordPress - name: Install WordPress
git: repo=https://github.com/WordPress/WordPress.git dest={{ nginx_root_prefix }}/{{ item.nginx_domain_name }}/wordpress version={{ item.wordpress_version }} depth=1 git: repo=https://github.com/WordPress/WordPress.git dest={{ nginx_root_prefix }}/{{ item.nginx_domain_name }}/wordpress version={{ item.wordpress_version }} depth=1
when: item.has_wordpress == 'yes' when: item.has_wordpress == 'yes'
with_items: nginx_tls_vhosts with_items: nginx_vhosts
tags: wordpress tags: wordpress
- name: Fix WordPress directory permissions - name: Fix WordPress directory permissions
file: path={{ nginx_root_prefix }}/{{ item.nginx_domain_name }} state=directory owner=nginx group=nginx recurse=yes file: path={{ nginx_root_prefix }}/{{ item.nginx_domain_name }} state=directory owner=nginx group=nginx recurse=yes
when: item.has_wordpress == 'yes' when: item.has_wordpress == 'yes'
with_items: nginx_tls_vhosts with_items: nginx_vhosts
tags: wordpress tags: wordpress
# vim: set ts=2 sw=2: # vim: set ts=2 sw=2:

12
roles/nginx/templates/blank-vhost.conf.j2
View File

@ -4,12 +4,15 @@
# a vhost serving that domain. # a vhost serving that domain.
server { server {
listen 80 default; listen 80 default;
{% if nginx_tls_vhosts is defined %} listen [::]:80 default;
listen 443 ssl http2 default; server_name _;
{% endif %}
return 403;
}
server {
listen 443 ssl http2 default;
server_name _; server_name _;
{% if nginx_tls_vhosts is defined %}
# "snakeoil" certificate (self signed!) # "snakeoil" certificate (self signed!)
ssl_certificate /etc/ssl/certs/nginx-snakeoil.crt; ssl_certificate /etc/ssl/certs/nginx-snakeoil.crt;
ssl_certificate_key /etc/ssl/private/nginx-snakeoil.key; ssl_certificate_key /etc/ssl/private/nginx-snakeoil.key;
@ -30,7 +33,6 @@ server {
# Note that you'll have to define and rotate the keys securely by yourself. In absence # Note that you'll have to define and rotate the keys securely by yourself. In absence
# of such infrastructure, consider turning off session tickets: # of such infrastructure, consider turning off session tickets:
ssl_session_tickets off; ssl_session_tickets off;
{% endif %}
return 403; return 403;
} }

4
roles/php5-fpm/tasks/main.yml
View File

@ -11,8 +11,8 @@
- name: Copy php5-fpm pool config - name: Copy php5-fpm pool config
template: src=pool.conf.j2 dest=/etc/php5/fpm/pool.d/{{ item.nginx_domain_name }}.conf owner=root group=root mode=0644 template: src=pool.conf.j2 dest=/etc/php5/fpm/pool.d/{{ item.nginx_domain_name }}.conf owner=root group=root mode=0644
with_items: nginx_tls_vhosts with_items: nginx_vhosts
when: nginx_tls_vhosts is defined when: nginx_vhosts is defined
notify: restart php5-fpm notify: restart php5-fpm
tags: php5-fpm tags: php5-fpm