[fifteen5] Update deploy of FF and Nginx role

ansible/group_vars/jails

@@ -1,105 +1,127 @@
 $ANSIBLE_VAULT;1.1;AES256
-36326635313533636130643665303663316232313334663836663463363233316331303632343966
-3134343665313163313165663164386365303335336464640a393935353533613936663361313562
-65336336396130636539656561656331313365363364653566633566323665313663323163353331
-3138353162383030340a613036653134353461376631386134386432633837663931333630356137
-66333866653361396364633433323639613232326365313834326637373338323336643837313466
-66356262363234616137333830666234303631343235656330396431366662346538396434366662
-66346261316235386438336139326430303030376532663666633938346638306530666539346634
-31633030303130616433316636346561303663326337663363363730333830663164353130656437
-65653134313862376365633661653234643765646434336361623264313133303735333765346466
-36663634646333663131653864663165646238323966626537636534343431623038383236386630
-65376432343031396435343533663834623436663062626638363165386231373666356665333432
-66613335383237373532663839316437333564323663636432376632613833613162373235376232
-39363539333734306236666162303233366131663530343161396337363736376631356463653131
-64336463346137656234653135313435376237633061343662373437306561333432656139326133
-63303563653565336461316639363732363561623030326365623433393461383337393463313065
-62393364383432653464336134313830623730373164653234313338306539326561633762303138
-31326161343466386339326566353637356132613435646637356463653730663365653965393834
-34393863376230646533356232636238313061636638353431303864353933313034626436396636
-65386331376636323435343030643936393565383438313661666632333334306562306163313934
-61313565343264646638396439326132343136303638613361363364363239343966383538393966
-37383737623665393433353437333563633231366462306638633064633766623330346561313632
-38623334393837633638373635653065643136643538373933316361333161643839323463336639
-61326531316436373763623338643536333834623231376638353434353931376466373663343966
-64326331326164616438643536666163306130323561663963663732383835336338376665316231
-30666165616434326666326235363937316630653166633939633065393636653838643032383034
-30376236336139613634313834643931386234396139643535363634386466313635653936643963
-36393466393432326231316232623534333030326431663233316233386138633962386538353738
-36376565373239393464343139623431306130663965663231393739666365346138343963373465
-64346134633464623563663338336661336234306264363935306233313430393730346438636331
-65343736616339636137336232613962633633313333363430306665646332663233643237656466
-37613162303732303465336335636136396335383138363031666462653834636661663034653233
-61636139396538346563643734383632323431383462333132643733343162396166306234663437
-34396635353738323737663565386330356630353330376630353036346463373363343866656566
-34326539623564356665386465326235653234316335306439363265336333623137663838633462
-31663937363134323365663862373962636532363132363261396337326361366664306138363562
-34386164396566663639303666633132326631666439636333663163373764623235323964636331
-64366239323464323637326163323365323038353061623564653965303131376165376331353734
-30613734396230616265643439376665376533636233626365386332646565363937373238663133
-61343036653730323937663761396263666431643133656438336131613931613530363363376537
-34383161613731343362636636363036323263346264366338366565363835633966313932386263
-61316461336462363637326536313534353463303530333561323530656565646635623463653436
-32386263636132613930396138326638313964333461653237623561323932333762643134623431
-63646666393231356431353634656334353731626236636364303634663434613562383766303466
-34643934333166366464346638313465303335666333343430356135313133333739326531303864
-38386665653630373662383734386132363031666536643630623339613034613765633061303636
-34616434626530643761616636626637373637333163636631366339643135623331376234333038
-34303031653839323334396564626162366139346238323265313933626534613862306132613732
-33393966663335643861383165623930613839393037353761336337323565336437303763616236
-30636362333833643334303635663339306430343362663563353163336530646634356463646164
-34653936653133303465313231613536393066636531366233343831333162636630633233346463
-30663966653135353761383732613365356436656361613738646262316138363037306564626564
-63623236333738663038346430646466636130663666306433633736343636396633666262303031
-63633463366435303662613361643434383730343730316262353761393262663430326464366231
-63303763366432323033303864386266343738653339643230393438373231613261626264626564
-36376464626539316161613064626665393137366365643366396537663630616434383662376238
-36303930653762303363636666623735366331356136663239643366396636656661353932646234
-62646264623937303666356435383138343163393335323361633837303766356539393632626537
-63343137316565613465616330343038633863636565363830653533613338633836663166636263
-64613064663536346138633636343064666539323931626431383965396131333035656237653738
-66643238656262623063333461323237663762653435303862616337663235346463663466373138
-32346464646262343232356366353237323638336366643134323137633364643532313866663165
-64646462336266353133326363643065393035376264306438343463643132633766336136663136
-39373833376132383063323834313031626666666636373964653238663733363666666639366332
-65616330666239336433653930363065316564303637313365353266316333303335343663336162
-63316364636266303464373038643537613161616435653665623534306130306463633063316663
-32376462366164623838666336343630376334633264623934393261333938333733366461646361
-33393364363536663234623832643761386431666365646239633061373533386236303765663766
-35633266653766373634643962643239636438306433316339373134303737636532323539356433
-66323165613133306537386130316630346332626637326665333865313964333063383261303265
-38636437656237666336353435323237636363373636616263653031373636346233383163646463
-39663161666437313638353366326232633439653065633035653832613231316539313936323764
-32366533623533646432633835373330316335626439626337633364613734303062313836356536
-63363365343866616461313731646166636438613465653161393538313539383034613862386633
-34393835386639616433393064666562646466373935383230643261633233326236626533343333
-31393930303837383239323631393038346636346164313735383833386163386436663862353435
-64323363313266656464353537333264643933633761386161653236383763333335366464356637
-62633837656134366239373835343963306564623338393361393335326561333936336337333534
-62323537346532333962313233373633656430613931616661333638646638623436383633336232
-31643830666230383065646633346332346365366335333863393831306361303666376332373634
-38396564316634363065636165646133656337356636613132373736333864366162643963383631
-64363733663337646531306666333539386334363939366262653565643834383734366137666433
-62323161646266353533633166303339336434353835623739386539616433393365346566333733
-65643139306338313562333731653530333435383134613135373764396139643839346463356535
-39373562633938393963326264353761643931393138346532323834363532646337303465393833
-32393434363937646638336430303736363664613931376563383165656530626431633739646363
-66613933333332616135616362323466646539613130303230613563633333373334373666386637
-31386439366331616631396465373462393432643561636163333639333332636232336338386265
-35373762666234383061343231616362396164386638343039393062373465356331653863343235
-31316438316562366433343938623564313134633337396665386365336461636264356636353636
-34363261663063383162323635646165353036333137306334633963306435663336356364663464
-61356363613235343631303266346639383831613765386365613332623937653162353035393832
-63353132376539626336613465663339623432306231323432373033656634393435666165626266
-61373239643130613737306361326230623134323162626465613364646465313466306335633634
-39363235333963313266616534623132663862333464383334376162373133636430626437366636
-61343138303934666534623763356232613836623132313263356339343337613131633730613537
-61346532333961333661653464666537363437326436366636373166626361306161306336383662
-61343465666638313531616162366335353231396163316462316239326139666461666563393132
-62396263656136396539646662613163366263393765366438306666623863306539333565303665
-32323764323864306539383531623765633731343863353336633236653530383166396365636334
-64316131346561313531663037356230616462643934643562646564346634303131636161616138
-31303137643533336463653964323061303865333262636430326333313463323361323765623532
-62656531303331376333393832343933333838393964386666333864323038326566633034396634
-64383438393837303030363433363935376536353936666637333432633837336266393439353638
-37633035663236383839
+30616466613238303664666338333532386162663934646436303031623963383936316539613262
+6465386261623764623934393962373966663530666664620a613566316336373764653731633732
+34363733666266636534343761636434626663333963313239376663646130323337623965343862
+3738316137616334640a343464626536636233643432353430653030663933653463656333316138
+39663765386230616337373131626237616633663835323434383931323339393634343231373936
+61653136643563393563386462323331653963383937356462616565636639646635393864303066
+35346465633831643531393362626637646436306131633531643934386538613139316231353761
+61316638333537626462356561353163343335386638363936656530653230663738366263353437
+36643938373730393931393033623863396661323964363330636230666438393962363062313766
+37363930373064303630363838383130643936663862363338376131313131626636653834656263
+65336163363839353261653066313165633936323664383834623438613535313033643833626637
+38653634383934353931666262353566303233666534396464383338383662373835363631353238
+34633461663364353934373039663734643734623162333932333337613232616262653336616130
+62646133336466336339363230333561383933623861666431636561333831326531376364313939
+30656236646165366364383733386566383737343065303332306332333261353739656265333932
+30633530363338333834663263393463343763376563323830633831613362656262656433356364
+30623739623638613838373531326261353536623164326137363664396636623235663765623934
+65366139636234623136646536383963323030653237316365356263336138353838353937363232
+63326261323039623264363938616663313236663930333862393139356539326132653731616633
+37356665613663306663343631336361363839323338646234626137353663336233346634363039
+39623938636438323936323239393263663533376434306162656336303531613630353437633965
+65306362313336333363363634623234316333333361386437346533646435323261303062386265
+63353436313239336635306132353865626331643832656439363332306237663439653664663438
+34343536346230656537383566323336373565386232303865633838386230653363623036623163
+33646465333533356332653266343930633937653062313234656337316464666331626461646132
+66393430363461653265306432306562323866363534333933323963666537626531336638396431
+35636161666265656432393238333436306336653531663066336536323264306334666661303531
+31386131323561626136306166396266343461383630383135616166366164366537636261353131
+30643838656531643865643266373632373733306634313934663332373432323933633835333833
+66636530636335323231663266393565663836306336663832303863656139653464363134623233
+37336334336339393466626131636134623961656461343236646465373035653264333237386437
+30623037623563613832643237626661666239653831393638356333386339666466303338663361
+62373338623232636439623730376365313231306439373834323663623865326362383638373430
+61646632386231633434333735393933373365616634653765353230643462363237316565313763
+66353337326361653633633435303361626431353333376161383264633966666630633031373531
+36343631383164626330636137316566313534393537643362613762313866313363326564323161
+33383338383937316166623463333538343137383034343961623032376137616665316630643633
+39643239396565323465346664323663396665626165343530346563363936363935636530316664
+61366137316133303738363536313834663630616235303062336561623761663536616235316133
+30373538626338663664646531636565353337656166373131373838306431303338356362643234
+66363931633739366330363263393630356538313438323361383766616138623634353238303437
+32306338373535383461653732343230326338303561643332356364633232646166343262633762
+63653761363437353930333337636533323838326137663332306131326632643434313463386663
+65366137326566666239373930393861366561366333646538616136626530636438333364613635
+32303661653865326363303538313263616432643538633163316264323839316463303565633537
+35663166303866636562623035396265383732653839626439613631303035303265313031346239
+66306333386138666462643532393334663136303136616632316166646561656536306462626331
+30316332656263656661373466366230393433336538346638316236613065663265363731633564
+33356136303964306431343031396131306539363563393364303434363666623934666564343435
+37303566636132623436643033326239363461653266333135636238393039393035386138666239
+34613433626530306632343931326437646534363735396131653138353331366230376339333765
+36663231303363376563646331633439366634663837373765366631653336303439636436343132
+63613137306133626639303831303032636139643061633861386633383161323464326262616335
+63316664653739636533633733643730383339343639353935646437386562396534323834386531
+39643733613634383337383765616662333038353235393733346366323131623566653262363338
+39626565633933383839663638363037663336643161383635636166363730363331613038313833
+38316130656461386230306637646566393037316232323538636135353835653734646131636435
+63313464656131623634646139386166333734336562366363326239346138363239346437613436
+30613062643336326535666466636234376338346264363235393130623065323837353864633437
+61636135613334633861636238333766346638353765643136363732303162336334323034653261
+63313466316430353266646434643039323734303933653735663032393537666264663530383237
+31306430623861663533313936323061616263313933653463363537653663336430313938383637
+38303638666135373466323266356561313331343937646233373338636263383232366164333364
+35633334383039306130356361303833663738326462303332376536366135316361666534643566
+34343932303839396636636436306337346434383462656632353165626134323237646633633466
+30333937376534336363333637346335366537353261373334633233333063653663346465663536
+31626363376465313064313936656363646364333039343739393966316639356164333162323839
+39613664656461646335343939663461303866363365626238633461376433626266383964656331
+38656335336466616539346162343733653131363031336261623732396364313739356265346631
+65343864313135616332643232353435366532356537633933356235653834316163636564613233
+39303931643263343533363561646361633265633836383464383830303465663163383538323865
+31646362393033646433343936643132346330616235313862616266643933396430396137646431
+33373766373131353637313533306336396363376364336564346164636261656131393064376432
+62353232316464393166666263633635393532616633303035666537336234383833313066663630
+35313964313930363533333666373265366238313237636563393365653835393637633932343931
+63643638336163643936653461393463383063623136613065306135666463316466336636633066
+30396662643230653066613935663163343931343961363964666265613966623662633235303466
+32613435303365393835373066313334356466626530356433663637643137666664363864656363
+66303165663362356232666538623534353330343134336263653738333636393762623935316135
+66366230646135346337333030643530313061353036343136396365393139663230666164356536
+36353033663865356536613533313830373533666233313266303963646662643635393665626266
+33633032633163663939333364323139306534303830303337613130626531373433393730343734
+39646362343765396538383734316265613365343162323830353133343061656561663966623137
+64323332616238316663336434613366396233363439666538323032663661613963653132653333
+31346336373639336331343330366137306333356362643136636331343035343539353966353462
+37313631383465353062626532333136343666323662633633346364356135353633353034633832
+32376238633866303333353965636232343765623165316532656238643637656532363966306535
+31393436663635353535663339623532313266656639333938356566643064356239306536303861
+32306565366335633834393363663539643839396266313335626233343637303566306235303461
+33373933653636383730396137336533613337343166613262353664666231303063633437613063
+31383465346430636435346436393836633933336565653939373433643364613837373931643331
+30323063653166653732373937626235303662313535383465326665653935373238346365306164
+36313463626131653732386362653961656433616564323039653064383938383335383436633339
+38643163316232393363393834333132653536386333326435336638313031663662356664393732
+32313634356235363635663232393335653233643166643161336634636266366333666531633066
+65636633356562363934313834333262343632323239343830353861626632623234663833326231
+30323735623931663961653363343633633232363561303061366461376263663837313637623965
+65643261333237333639333137343061386161373266343339393930386234343562353639336562
+61366330393833623662323630326432336266633036656330313563653763313538363762653730
+32326335326565376233356133336633646565356133663739643839636339626366333131636238
+64346134373439616335303766393536336538643237616435313336613536356266366331653536
+62326539376439623862353431623033663563366261393635336136633839363335636362613236
+64656632326261626561613633366236626631383738316438393762313434366538393930336633
+39313138643866393039303231306136396461303133633636636162346130373033373139333034
+65383863643461633263383635646366346164613665363164363866636366356332393835353565
+35663732653561653539663863393962393736633862356439363033613061663834313133393737
+36323630316530663963393237323966323030633937303466333933666137666662353064643838
+65383936393062363265333933396234336437346636373039613635373466663335373561393533
+61366236363366343839333537396439336631326636626565353763616630313730653931363239
+33663166323438366437653533333233666634373665366630656165393966633139333633616537
+36613934656639373666346630306533636630333363353437663135383865343333663336383538
+33656336616638353863366134663563653332356366616633313363373265623863306566373832
+62386537376230626265373532396136333438333139353665613164623533626566663133646163
+30366430333961306437623832396435616332613038613234616235323433356339666666623737
+36326565626638636366313634366136353464623531373538353536643764343337356336663065
+36346231336132383361343535303033356532326535303332306564613834643563313733373834
+35326130323830353861386662653533356264343462376565623336646465393664306532646432
+66396133653962363461323561326165626632643832643963623636353639383361316133393435
+39343535353665396361343833346534326561353230663162383032613164613938333735376563
+62333734303964333436633236613539373335653138363966306632343738376261333239366666
+35383738623338363065303335643832343937343437616232343034396234316666326665343031
+62373030363838313663346264343735383966363030366264373236316335643535656136303332
+65653939366437663639346563333761346138656262346434663363646464393163643333396635
+39306531353034306331636334336263383131313137653535393238313763643261626638303333
+62646462643031386637343963626638393534643131396634316535636330346565643337373431
+3830646666356161366434356565656162643039386165373834

ansible/hosts

@@ -16,10 +16,7 @@ weewx.local
 books.local
 photos.local
 podcasts.local
-192.168.1.81
-
-[test]
-192.168.1.81
+fifteen5.local
 
 [bhyve]
 mopidy.local ansible_become=true
@@ -67,7 +64,7 @@ weewx.local
 books.local
 photos.local
 podcasts.local
-192.168.1.81
+fifteen5.local
 
 [mailinabox]
 box.unbl.ink
@@ -92,6 +89,7 @@ unbound.local
 [webapps]
 dev-pbp.local
 dev-ff.local
+fifteen5.local
 
 [gogs]
 gogs.local
@@ -104,7 +102,6 @@ bastion.local
 
 [matrix]
 matrix.local
-testmatrix.local
 
 [logging]
 grafana.local
@@ -119,15 +116,15 @@ miniflux.local
 tor.local
 
 [pbp]
-dev-pbp.local
+pbp.local
 
 [fifteen5]
-dev-ff.local
+fifteen5.local
 
 [db]
 postgres.local
 
-[dev-mail]
+[dev_mail]
 mailhog.local
 
 [weather]

ansible/playbook.yml

@@ -2,13 +2,12 @@
 - hosts: jails
   roles:
     - role: jails
-    - role: avahi
 
 - hosts: dns
   roles:
     - role: unbound
 
-- hosts: dev-mail
+- hosts: dev_mail
   roles:
     - role: supervisor
     - role: mailhog
@@ -35,6 +34,8 @@
 - hosts: fifteen5
   roles:
     - role: supervisor
+    - role: syncthing
+    - role: nginx
     - role: fifteen5
 
 - hosts: searx
@@ -69,18 +70,3 @@
   roles:
     - role: supervisor
     - role: podgrab
-
-- hosts: test
-  roles:
-    - role: supervisor
-    - role: nginx
-    - role: podgrab
-    - role: matrix
-    - role: gogs
-    - role: weewx
-    - role: postgres
-    - role: pgadmin4
-    - role: mailhog
-    - role: unbound
-    - role: photoview
-    - role: searx

ansible/roles/fifteen5/files/cert.pem

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFCTCCAvGgAwIBAgIUBDu0UeJ1sk5nFX4bAhprQq1f6t8wDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJMTVmaXZlLm1lMB4XDTE5MDgzMDE5NTI0MloXDTIwMDgy
+OTE5NTI0MlowFDESMBAGA1UEAwwJMTVmaXZlLm1lMIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA+3dWHkLSk/tyvOp7hM9dIs45SDahnvPLlFLRXMd+aG+x
+LhURJDMFYNXUZDJ3S42CawvuMjs6A2vJU+giuRxX9thfTTAUB7VTK1KKBLb4fBdZ
+kihsOZJX+iHPk0qmTw5MSzY2LM8fsMa/LX5HkK5WGU32mmchUJvkLS0uAllSxGXP
+fSHYH/vmZ5XfFza56TRdzJbZDVwYtnoVr+nP6FMfWY14xkjCmVfokH9W/kOAG+w/
+zpvIxgYtTi7dZs9HfULi2XScB8cKZjv6VmpjQEMxQXNsFwiTfK0kXq4SLpE+wctJ
+ll4bJ8nVT2KbsTDDF7bmvg401AesVGJDQ4bBdU5FVBne2Kn08n/Gw0py6UEJJC2Q
++lnwfDFRZiO8djsmSMNa2bDAQy9EpYdjzBAYkeFH2Ja7Bnwqifj68yW1UZ50Dl2z
+4zOI+D4cvOKY1GkPD+x95EwRby3M/rXv+Y4p6RiTGTmFnZ/tmOKyCm2k0B8tlbls
+TyuyCGTI0O2IcLD0u3CWg5FpjB2llfjoDDOMDcSIHT0UdRJSk0rCzT6Nvw57CdZg
+WGJGdHqIsct85l4IOkUzSg5rgNbuloWgfxR9Ptx5VWGhYzngQzMK9OLXtYZO72am
+fkhqwtPpfsh6IN41pVr6pY5k27TKj+FYZK4QJKBEYNH5F2RL/XeMMw2U5ZQNbPsC
+AwEAAaNTMFEwHQYDVR0OBBYEFCZl3ZBVsZgIz1UWwec9PgwtnWrHMB8GA1UdIwQY
+MBaAFCZl3ZBVsZgIz1UWwec9PgwtnWrHMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggIBAHYUvAXsxVRDiHZ2icUU/sMPWF7+aFg9GYOE5DY2RdfB3tQm
+BJU0BS1fqzb/UQaAYXNW8a5q5i9ULEEdLzvLYvPDWMOZFb/DXmmGIjnbnPj8jzYl
+Zwf7nINmz0Ir0FhXznVDca0rYKS2N1sgelXkI++Vqkk0i7rK6v9PD9FOeGGj4wuv
+ef4gEUH8yMfzzCeWDFSTwYMuXPRduIgDrnISr3wdPJAgG30mGM5M0qyesvuUuvCU
+5ssgUa5Gozz9vbEYOrlK+FL6UBBPJ623Cao+2hBKbD+fnmkoNZcFI0Yg0IPBB/k6
+HdeqWX6eOyCqOjKvmbWEd8nZx4MeWhsn930CJWtMyM3fO2QDnJnpeFz9jMWce54g
+r+chYHhgS3WxNMvDQ2HRy8SrEcPXu5mhQfpnP3uHwLmCRxOEINULDlAyluXwtgLF
+eWzbh99BsufuDTKcxQwovaJpedQtOPHmPJeCs02d9aKuO1qeYfk2GBZ7ndObxBSS
+ZirEcyBuaCJ7gW+iwT/zgIujqatOs3q5YHppExg+qRgB1gO/h5O/22l1Hd/xz/pn
+E1UGOEhmnEBdzFUNpEvG+nTcyZIUWczo+o0GclcH0CZnput756G5D5YkCTijexJS
+knktutHUlHbx/9DPAesDCqkA/N/fwHs72Q6t18RoJjFbnhm4U56f1inAvYGu
+-----END CERTIFICATE-----

ansible/roles/fifteen5/files/key.pem

@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+QBdCfs0070B/VoGPOthmk5K23B/bp7mK
+-----END PRIVATE KEY-----

ansible/roles/fifteen5/files/nginx-location.conf

@@ -0,0 +1,3 @@
+location / {
+    return 301 https://$host$request_uri;
+}

ansible/roles/fifteen5/tasks/main.yml

@@ -1,22 +1,22 @@
 ---
-- name: Package cache updated
-  shell: pkg update -f
-
 - name: Dependencies installed
   # We install xmlsec and cairocffi using pkg because python-Levenshtein can't be installed on FreeBSD
   community.general.pkgng:
-    name: "git py37-pip py37-supervisor nginx vim-console tmux fish direnv jpeg-turbo tiff webp lcms2 freetype2 syncthing yarn-node14 redis cairo pango gmake libxml2 libxslt postgresql12-client py37-xmlsec py37-cairocffi"
+    name: git,py37-pip,vim-console,tmux,fish,direnv,jpeg-turbo,tiff,webp,lcms2,freetype2,syncthing,yarn-node14,redis,cairo,pango,gmake,libxml2,libxslt,postgresql12-client,py37-xmlsec,py37-cairocffi
     state: latest
 
-- name: Supervisor enabled
-  shell: sysrc supervisord_enable="YES"
-
 - name: Redis enabled
   shell: sysrc redis_enable="YES"
 
 - name: Redis started
   shell: service redis restart
 
+- name: Github SSH key installed
+  template:
+    src: sshkey.j2
+    dest: /root/.ssh/id_ed25519
+    mode: 0400
+
 - name: Nginx key file installed
   copy:
     src: key.pem
@@ -31,11 +31,17 @@
     owner: root
     mode: 0644
 
-- name: Nginx conf file installed
+- name: Nginx site file installed
+  template:
+    src: nginx-site.conf.j2
+    dest: /usr/local/etc/nginx/sites/fifteen5.conf
+    mode: 0644
+  notify: Nginx restarted
+
+- name: Nginx location file installed
   copy:
-    src: nginx.conf
-    dest: /usr/local/etc/nginx/nginx.conf
-    owner: root
+    src: nginx-location.conf
+    dest: /usr/local/etc/nginx/locations/fifteen5.conf
     mode: 0644
   notify: Nginx restarted
 
@@ -62,7 +68,7 @@
 
 - name: Environment file installed
   template:
-    src: envrc
+    src: envrc.j2
     dest: /usr/local/src/fifteen5/.envrc
     owner: root
     mode: 0644
@@ -72,12 +78,6 @@
     cmd: direnv allow
     chdir: /usr/local/src/fifteen5
 
-- name: Supervisor config file patched
-  patch:
-    src: supervisord.conf.patch
-    dest: /usr/local/etc/supervisord.conf
-  notify: Supervisor restarted
-
 - name: 15Five requirements up to date
   pip:
     requirements: /usr/local/src/fifteen5/requirements/test.pip
@@ -101,8 +101,6 @@
   tags:
     - deploy
 
-- name: Ensures supervisor conf dir exists
-  file: path=/usr/local/etc/supervisor/conf.d state=directory
 - name: 15Five supervisor file installed
   copy:
     src: fifteen5-supervisor.conf

ansible/roles/fifteen5/templates/envrc.j2

@@ -0,0 +1,48 @@
+export PYTHONPATH=`pwd`
+export PYTEST_ADDOPTS='-rs --durations=10 --reuse-db --isort --flake8'
+export DJANGO_SETTINGS_MODULE=ff.settings.dev.colin
+export FF_LOCAL_DOMAIN={{ansible_hostname}}.local
+
+export FF_EXTRA_LOCAL_SCRIPTS_TO_RUN="
+ff.mods.report.company_templates.shackleton_expedition_company
+"
+
+export FF_LOG_LEVEL=DEBUG
+export FF_DB_NAME=fifteen5
+export FF_DB_USER=fifteenfive
+export FF_DB_PASSWORD={{fifteenfive_db_pass}}
+export FF_DB_HOST=db.unbl.ink
+export FF_DB_PORT=5432
+export FF_EMAIL_BACKEND='django.core.mail.backends.smtp.EmailBackend'
+export FF_EMAIL_HOST='mailhog.unbl.ink'
+export FF_EMAIL_PORT=1025
+export FF_SECRET_KEY={{fifteenfive_secret_key}}
+export FF_DEBUG_TOOLBAR=True
+export FF_REDIS_LOCATION=redis://127.0.0.1:6379/
+
+export FF_SFTP_FORWARDER_SECRET=notasecret
+
+export FF_AWS_STORAGE_BUCKET_NAME_PUBLIC=local
+export FF_AWS_STORAGE_BUCKET_NAME_PRIVATE=local
+
+export FF_OKTA_LOCAL_DEV_API_KEY={{fifteenfive_okta_key}}
+export FF_OKTA_LOCAL_DEV_CERT={{fifteenfive_okta_cert}}
+export FF_OKTA_LOCAL_DEV_ID='exkvakjehhLMVGzDY4x6'
+export FF_OKTA_LOCAL_DEV_APP_NAME='unblinkdev331277_testingapp_1'
+export FF_OKTA_LOCAL_DEV_SUBDOMAIN='dev-331277'
+
+export FF_AZURE_LOCAL_DEV_ID='92956dba-b937-4f12-aaa9-18263b3de204'
+export FF_AZURE_LOCAL_DEV_CERT={{fifteenfive_azure_cert}}
+
+# BambooHR
+export FF_BAMBOO_HR_API_KEY={{fifteenfive_bamboohr_api_key}}
+export FF_BAMBOO_HR_OPENID_APP_KEY={{fifteenfive_bamboohr_app_key}}
+export FF_BAMBOO_HR_OPENID_CLIENT_ID='15five-bamboohr-7.17.2017'
+export FF_BAMBOO_HR_OPENID_CLIENT_SECRET={{fifteenfive_bamboohr_client_secret}}
+
+# Namely
+export FF_NAMELY_OAUTH_CLIENT_ID='mymsv4hhYE6HPeGvYRQHTsUAH2z7vwZOccELbwVUukde4JHepVQKZdfoVTIEaGFK'
+export FF_NAMELY_OAUTH_CLIENT_SECRET={{fifteenfive_namely_oauth_client_secret}}
+
+export FF_RECURLY_PUBLIC_KEY='ewr1-zvYK71QQsAfdOm8ydeguAU'
+export FF_RECURLY_API_KEY={{fifteenfive_recurly_api_key}}

ansible/roles/fifteen5/templates/nginx-site.conf.j2

@@ -0,0 +1,24 @@
+server {
+    listen 443 ssl;
+    server_name *.{{ansible_hostname}}.local;
+
+    ssl_certificate /usr/local/etc/nginx/cert.pem;
+    ssl_certificate_key /usr/local/etc/nginx/key.pem;
+
+    location / {
+        proxy_pass http://localhost:8000;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Port 443;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $host;
+        proxy_redirect off;
+    }
+
+    location /static/node_modules {
+        alias /usr/local/src/fifteen5/node_modules;
+    }
+
+    location /static {
+        alias /usr/local/src/fifteen5/collected-static;
+    }
+}

ansible/roles/fifteen5/templates/sshkey.j2

@@ -0,0 +1 @@
+{{github_ssh_key}}

ansible/roles/nginx/tasks/main.yml

@@ -10,6 +10,9 @@
 - name: Nginx locations folder exists
   file: path=/usr/local/etc/nginx/locations/ state=directory
 
+- name: Nginx sites folder exists
+  file: path=/usr/local/etc/nginx/sites/ state=directory
+
 - name: Nginx config installed
   template:
     src: nginx.conf.j2

ansible/roles/nginx/templates/nginx.conf.j2

@@ -12,10 +12,9 @@ http {
 
     gzip  on;
 
-    include /usr/local/etc/nginx/sites/*.conf;
     server {
-        listen       80;
-        server_name  {{ansible_hostname}}.local;
+        listen 80;
+        server_name *.{{ansible_hostname}}.local;
         root   /usr/local/www/;
 
         include /usr/local/etc/nginx/locations/*.conf;
@@ -25,4 +24,6 @@ http {
             root   /usr/local/www/nginx-dist;
         }
     }
+
+    include /usr/local/etc/nginx/sites/*.conf;
 }