diff --git a/host_vars/web21 b/host_vars/web21
index abe14b5..fac5268 100644
--- a/host_vars/web21
+++ b/host_vars/web21
@@ -1,46 +1,46 @@
 $ANSIBLE_VAULT;1.1;AES256
-65653532333862366436303432656664373261323934306234623534633335356466623330373063
-3164363863313131303330363564326130383433646332640a373233653965653164353663633038
-63363966646361366637643261613062393736366361356235633139323537636638396264316534
-6366313732323066620a333738656661656537646632326262663862393434663435313037653564
-66303732396261373436373538396466643330633336623066313933323266386438363566343834
-38616661303931376136616532386637386130326264336430613336613836323666326261643838
-36613565323062626662313864633539323538316562346533363437373766343764346132333631
-66336135383732393939383133626662343335376531336364303662356566393034326635333066
-64333635303633306639656161623631333139653034633939303565386330383236616364353136
-62663536613565383064633235613539313933373530306164356462353861383761363931613430
-37373939616564663562376635333862646234353133663331396661626234356665633835323137
-39343462303438376131626335346637316238626462333430346539313838386662363031336636
-34366132363439653137393662653661663262346632306533376565353037616362316161333566
-30393530656566643136613039363537613035666465656530366637393664343665666534383837
-63393133336664313466636538386338653937643563633737633962626562326637356661633463
-61613231346532306265623361636330376563396266393330393166643833353165363934313533
-66333832373035376334326336616534326566666361616665633363383032393236336634303232
-36656336316635376431396233626539633839386533333436633264613761353361333565656233
-65373331306434363938393339333133336461646130666535343965646536656263623530666333
-36353664643132623465353661656466383363376261363534303462306661623564663561656664
-37633936636263623065366666666530616264396334623766613036313735353264356162613836
-35643737346530393933643537333561356465363239353630343333373038373836623231336437
-30343932363864663435656634343138353638343461623665336461326565636164643231323133
-65383664633665343365363764353566653635663137633033303731303030613565653565303433
-35373930396166646134326165653436613137383630653338613634633361623432373839376430
-38376630633363613632316530663839326538366366626230356337323536306665616661373261
-36653965623936663963353836653636306362663062636466613034333532633534646635313737
-33313962323636643132396166626566366466336238323163656332383530363833613633383165
-66366239613530613264313739396661386165343162633237303034373765643037656564653061
-63373036356134353633633532663365323932633531616261373735313737333033353532656434
-36316339303930336464393261323035626330366133626137373034396166336263333964333963
-62636432386531306133623163643461336137653331653861383139373938353162636566623566
-35616637663638313566653832343634613632663861333162333932336264613730313864663663
-38396563373339626365353766646565336335656539393738376331383038353436313963633438
-33373433613034373763643434613365303938373764306662363635626636633266643035663836
-65353632313137366231323764313036613134643830326330653763656362343561643964623361
-64336565666630626339346563663931393035363938663734616666356435326638353131383434
-65623539613662393936653161663264343132333936303661643534343536363165313564333037
-39343561656461313265393466346662343530313230386266646662633262643464366661363630
-63376463396631666366313266633964396137373661643764666537366539373337333731343933
-31613232363436643236623935326265353666313861303531633462623363373536636534623532
-66636533356363353735653839646263663631316239326164646463396532343038373861393033
-36623962396231633164356335623865326632303237643864656335326435373234366536313565
-34313638373063303434613663323136646263393036356336323532373130386536306235343165
-6462
+31303064616130313334356131393461656264376237303838313334366562376338343931333036
+3165636436393538633063303338636464663634643539310a323766633431376166393134303038
+34316264643034386661343566656139306234383430613032343332643363323534333238376233
+6262383039383065660a313138653738643838346365633238326534646637353033623638306161
+31336565373635663661343930396463333632366665633464646264333732373431633463343462
+64303538343234613532323431643765643738396233376138343561306361313864376165393064
+37313964656461353466306433366538346131313034316633626265346665666332666665336635
+64386261643536386536366337313938343134346532393866663065306434353766666132383666
+37623138653430363964313566666165326130656239333965346234386233643537643231613163
+61333336383265613930613239393663356566633464343732383133336435393036646536353834
+31626235343330666233616533636636316637643665333861386263646363613237613638313835
+39393736313734393539386563333331636361376137313631373833643763623338653462653066
+31633061323161663139633761623662653434363362386235623061626662343535626461663934
+33633966353263613466616439663631363162376466346535383963383332376130303265633935
+31646533633330616136346239356366616530363539323466333765656537623862653633643930
+64646261636239343866663238613834376339366666353534373666333966366264626663326430
+61343530636536613032646630346136656231633730646331666633623634623235666535336536
+36303735373331383332653731616136376163396337323536616431633934633830323531656633
+65666565363133366166323866366137663332343633333262643433396531333833626532313663
+62303265623764613231306365323362303565623232326137386135363262623366343330666134
+64376435363164636332383061343066336439363433653939353235383934346331383933333130
+36623437393461613137316634626638353039343465333161623632363735346438383537306236
+37306531336433346461656466396566623263353632323364643963323835356666393062343137
+36323065323639646330643437373965613563366663363739646237396563336633653232643466
+30336534373463643733613536343762633435343636333632613936383930316532333933613961
+31313535653639653331343364383662653434333833663464623164636538353763346134643762
+36383132326134353632336334303264376162316162646331656434663435326535636164663238
+62383435343366663932346131636530386434333064323734363061633166323363383566383931
+30626337656133613632313136656431623761343036613865663261653437343139303734383231
+33613938643264313138626639393132663032326235383439326132363361616463366266383439
+36656161386531303230396562356438356537653133666336306439303630393665623665396130
+37356633356165333737303235373062663664643434346366613536343164626339633039386538
+30653962373361626436616366396362343739613937633830613235373866613665306334663166
+63643965303465306637663666336563633234333437643565353262623963653562623662323337
+31353636353830336362643536396232333732663937616666383431616161646265313834393232
+66646338303134393232363133653837346638613165323035363266333566663163336338613335
+37303964326663303338643233353939633735616231356430663931646363613565653764303637
+36643063306362373666653531656534646465666134353866313333316239663363663062373038
+33393938663363376530303463636665663539626537373262366536363830653632663736356632
+35653465306236356166653739623461636434636132653237333932333965366464633365326430
+32306533303966373662353061343130306662623735363930626663393139323236613730356336
+34306436333734626339616438383934353934306233323863653964623435663863333330643061
+64626333623436623230613362373533343237313165313030616662633739373065376231313237
+61303561303432613336366238326534616631346364616135363562303161313334303866336434
+6164
diff --git a/host_vars/web22 b/host_vars/web22
index b5d1376..c4b4006 100644
--- a/host_vars/web22
+++ b/host_vars/web22
@@ -1,130 +1,130 @@
 $ANSIBLE_VAULT;1.1;AES256
-39636134663665643464643338356231376435336538643763366638376134666231653233303038
-3265393239336335396630373963343436386634613466340a643036336562653165343066386238
-34343737346139653030323439636431306632666132343135643231326230323064353665643938
-3535376333636164380a633633313630373436616130386330633234323731646634646432303963
-35393137656639613630343265393938353236333032346537383832633163613832386365663838
-33346538306634346564636337396464306533336561373033626333623239653630376530386666
-39663961633439663739303338323261326364333534623737313132343237303831383332626461
-37306531316637366137363933633838376462616264613933383465663862323730613731383032
-64616463356431363864393038313563383363343465643433316435383739316665663433333338
-31393766626663313664353535333835636537333262613462346135376438663730653463363333
-65643539326338666366356639323863643637383330373061653539666632303939336432646662
-32366166613361303730616536636133646666636663383930396638356335396665353932643764
-39643066366333363966366530643162326139653663326464366162323135373637623431643366
-62356334653931303838353633643435643935336634336534363465643935326532356636663638
-62353237373137393539396337393236663866313235346531333265373763613232336666633465
-34336566396662633731326462376439353432616430366236373536333835613266626262643761
-30633836346663666664366135336161666335316130623633346233633634633133343032613637
-38666339326539363837366331623162666437383561663137326163396637313866613336346237
-64373534386435306332633537633665386538663363393963306561666437333534316130656333
-31666635636466346461383934363837396330336561653563383463396539313038316539353064
-31363262346636613235326665333639636635623836366663623237393862623663613836633966
-62653565383837383439306466353866626538303437393634306636366133386561366363656237
-30396634366436343639356339393939376366326461613837386566366136343134396238373731
-36333966656536633961313162396365363262353761386138313633626131356231383936306335
-34366633353962363638346163323939306339343939616538313961383435636166333166346264
-32653538303036643562393632353965383366366636356266366531383731633633656231396632
-39353361393738346665326661633832333261303163626364346561383131653830323533663830
-65333638663535663038343137326132613663323364363436636662346438613864663732353130
-30633836313037356238363837376430313462363766616530636365393861383435313235326661
-63353764333365626261666439633263356665303638393032396231383434363533653430633933
-38623663363236613861613431323463626133633933643338353734393061363065343832663530
-39666132626436306136643934313239643432386436323462646132313263656563303766353366
-63316561623165623131313761393839363261373864376537353436363662313465303738336335
-36303262356666336632303866646662386233653564363864326236346334373133663234646365
-65373733363030323933326463636337326535393066313332663664353131616432326336336639
-37633335323531653864393836323962643961323531353466396263646362353238373933633634
-36616361336139373465306563383561393765666262343637643231623837666263333235353931
-33353932326161626130366438633666313562303266653631663330343034643537653862643562
-34383337376663616266333366366561346436633233383132363034323566303036383065616431
-36373465343563306166396439363731613066623236613862373532316630376561386562366134
-63306366346239343063613462393539626662666264393431363761333033656434393031623738
-33373233323564313732353137636636356463353134313861646136303135343462353366336637
-37633032623630323035383964383966343636613733353762386333663466303765373864666564
-63386430353134386138633736623062363239356265363866336635623363366535653566653661
-34366539643362346238663133646163306561363530656139373830643831363933343663323638
-63316534326131343263356330303335656664613862313439326338306635383639653737353638
-36336233633733343630373733623564363866333038643465393338346137623832626533656534
-34393631386237356561636339346364376161666236353537373061313836656164353066656262
-66613830313961643637326230353037646166393863396663653839623964613232636531663265
-65316632316363333933336230326339653231643038653532616236623463303932303435386339
-38396232616262306461323561383338653333656165396533636562643333656139323837396266
-63346339333439303133323762653136643938303138346635373131653634666365316462663139
-39323164363134343833316132343762333034383161663336313335303662336638653536313835
-62626334326266383162623765623635646333303763343736396336666237646339646438636430
-36633239326261636661346236613438316665626663393562653234386466616561383066313535
-66356437646435643865333261363538303862623066353631396165333938336234383738396434
-31346161396639623362376333373761626133633330363566303161356265396236373163313765
-39306439616336366465396332636234623966393238346564333361373666363037366566626665
-37393232363430646566303837343432326265323831356565376562646538363335323835353162
-66643330323437356533656635343666663663333335363534633532356637383362366264326262
-33383830326437336264346133393230373339306132663233653165333862633833386631643730
-63306466373463376666613762393433373232616166626133363932333434386538323433343139
-36666163343134643939613766646564386535373834333164613237656661366335353666663035
-61646339373438393066633031396633356664383363653134663437653333613565613166346130
-32376266653365366163343033343636306461653437393030363837363138393131356432613734
-64653932333565393032363138313461623939313736383535333732663462656662356635383034
-66656637663733633735336237323432386266623930373034666464616636636235656238316339
-37633737363738326466666430363063623836396232306638663032373662663261656339666165
-63336138653265366261373534623934363731343566386534376332343630313230333336323436
-65626138356265363266303534396462626462376332346232653438373235386461313739333136
-36616333616134376236666566383130396639323134623932393837643934663866653864623064
-65643132323066636137356233613938666262316130383037643563343965653335626466376239
-39313062386232653436626338643661336136633436373432633261663335313165346136643230
-35346131393034353034626137336531306361373266663836653833613865356631333032323333
-36646464383662376336353330623662636432353763323266366635666366666431666164363138
-61326135633066356338346133353837333062376430613830666332623062663437613533663362
-38633964303463316436646339336361666138393639663832373430343332633532376330376433
-63343939666266356431383963326436636432356433643461366330313964333565336264303238
-36316134373365313466393063636664393936303533306537643330323836386461323631666565
-35633365356166616634326637623634353963656337666230636235646236343935663134643532
-31353762613030323130366233313466333438626161653437386239633962653161313234323264
-34323066326131323835326263316433636137303830363336643336646138363266346265376133
-37613465663262333739323566643236373731613336613030666538616438323262323063633266
-35653637656464376564386232623739393365656366343966663233636234376132636466373031
-35346561313764623738656532653362636366623964626234386538306435373162336430333162
-63393134333238323365643761663665333931383431383065393361303435316433316431616261
-33643737303733633736373837336130383538303261613531633037646234363936613464353164
-65376631373133323863383331323734353764336236313738656435346166383261613061626134
-38636134386664353564303464373430663461303232373439383566626535626163343962306239
-37393238663066633132333938363666656531346133336565613632613365316331633964623430
-36343134366430316536336363343435633339316266353336356533313935643135613931386339
-33323137313861623962383531393831303036363930366236616562623532613462323932326635
-39653365653462386466366539373632666232333665663464376537616366653364653530303336
-37303035643931633335353735366664363461303534633637623265656331616364383362343266
-64633936663864343866646366623263323964653062383465613132663238633537356336643365
-38313435633733323233313531623764316363653261306436366134326538333739313335666464
-66646239306239346637333131373030313737393133373639363139333862656631333561613864
-66373566373539316466633961383738616335313965323234306365356261653135643264633662
-35373935336337333364316637306135393264376434636466373137326561353731383230616538
-62656635396131306266666365666135616263633938386338396164656163613864666135656533
-38356166386664313938343366323635353564363438346166653064343261376433616636353432
-37343666343634343437363837333261383466333132353461303138316264323531333161343236
-35333339386431653165363163323434336138363463653134333336306233313165393565393833
-65353963356164303931383565393732323064353733383661373434663837613862353730303037
-33336463613435343237373134363336643532336437656663616632616237353765336634656234
-62393835313234626434313535366164383165393537303864626364393534313035366461336261
-63623166363661653661643738623434363838393964316535653637346164643238313961666464
-38646231333638326461656165663464623736366636656162623533303161366263306536383434
-33626334633434303930303466373563333630633364333135623734363835663732383064653063
-62653030366635643234663338316638393933626339643864616165343966306662333836316130
-34353638383038346365386433366133343137653932643032613435376430323635616232353830
-38653731623835393066363732386562653539383834306565363664643161306136323663323436
-30356539383931303532386162303533376535623936376434346337616238343739626333616462
-31343362613331626465373635613135653339393664623136663365626437613862643465656433
-30313464303962316336333662393331303565363330376534383734653738373833303838303365
-65316339643035346165346364326334653035663061653135633834386331326161383761623439
-34353563666438356330366266353836346338393938376539613336656331616430626135333063
-31326436326164323334346366643163653131323136306630633965376362616539626638393535
-31643237636165316164316430626466303236663530316339653866363363303132383664363037
-35623962633235323762653434636563626365353734623833333830656363373161306464386234
-37356465393066636132393939383266303464313761663466333664623165373138373739393962
-34306130336332336661306565366263633161363766393836663166623763306133646635633635
-65396163333937383732353461666563393866326238623763373439343330646430643136376366
-33346363353931323434346261356334653030313932323964633538333364386137383338633437
-32333939303631333730326466343936316134393930633835313666363730646365626138346132
-39636162363531656366306566366133383761663135313064376130306436346134343336366432
-34326334646230353766373038306632643665303537623333303936396430396264663665376131
-66303930363932396464323132383230343865363937393439326333313438326231363636333762
-3132
+31346139633764626430393965376336626533643834373732313733643561326464616430313637
+3161313662633462313763643766653133666333366433300a303565386266376238396534376239
+31396132303235353561333337376666643861326531393431353064376532663538663132643834
+6233343632613235350a643262316130363537653062353130646639346361346462346265353036
+33616564363232633165336561343466313835336165626163323137623337383863643830663162
+31336533623439336632666436373537386635613664663938666231306233626433333831373763
+62663130396664643862383930373736663336616165346539666632353436623035383565363230
+30303663353133306235633862653465656264623764663833663561643330633833373366346231
+36613461663436613864373431633736653964643938636265636164613233383563313934643334
+36363132386662346164326666613336636236613830333630643163643336323935333566386638
+39306337656430396533643633626532613730306564333661373337633762653265303737333935
+35346663643665303235623637656135633338663436623261346665303862336633623765313238
+63303565643730343732373962313666393561633335636362356337646365303064616261646431
+38636437346162623363326436393961396335633431373934313563393265623162386133313831
+62643835623264356630663666653861323236636566316231356566656261633139306532643261
+62373439643062366463646438613762386465393130316562373731346461313263396361316634
+65623731623833356337336531633838343730613062633031653236303936633965383136383937
+38316163396666313462363235666162313564376561643739623432303263366333613134316265
+33656533636365303639326332346263326330383138333737303466303162316131316161313035
+64366466333933646566656261666265306535633238393731333233646334343662393133623039
+37626132663561656365323063373463313166323365373733366438363763643762653765353334
+38663065363038616662326537383238393333343934383538623563333633303066633938393836
+38303965333062346139376333306666323237323331336432376532336637656531666633353464
+34356533323531633333363066636438366636626233303238636464333133633835326632613563
+36333138336137303762343232333333653065343564333062383661646364633361303738343161
+31643365376463353463633862363962643136666266336635333336623664323037306463373830
+32663131343463323239373861343361326435313931373264303634306464623831316435663430
+38353936323935373663663266383039386365323433613566656466626161373934646364306261
+39376437343862303461666339346634336239616665653738613761613331643833326630316436
+64623564636534353436313065366266333866663737613331353562316330656536346134376238
+62333533613131643462376365393365363862303865626563353366636330343162636432666237
+35613134353833383165363438663464633534353962333265333235313762646161636662386437
+37396533666330303534623161343331323633326238633534343031323032353834623539336138
+32333834643137393165333939663130306339353736636539623335656464303633323330633134
+35353738653636376135376263326433643230653233383036633264623930313839323763353865
+34333431663530646538393331323033646235633838343130326534376430653437386438376531
+63633866613365616438613163393831383135393531346134303061316566353236333834613937
+62313633323434336164633438393335366133313663326464303163313432353633363030346331
+31396431313539373737656131653330353064636463336632343237316339383062303735643237
+32303037373366383036363532313633626431316363643161623864663861363532653333326538
+38643932346561616634656164643439636566303963663639666363306338323237343665626362
+62666337306134653831333463343566363838363863333536656235393062623933643266386232
+63366633376363306164303963356431353365643862346235366539396530393230626264333132
+62366331623332653466616465626534303633636666613934393032616466316131613130353435
+65356233316533623466663763376534663137396662366262386266336266323630623262366332
+35636333306336336230633565313735343735313265633137303565353639393063333063633330
+61313165613034313566373934646563346631613930666464396633356638643534633061393866
+62656232636264623432663632386234313262646436346639656464646165323865303132663162
+63376134393935336637353433633737323338366166323834623863303333323237396533613134
+61646661316539623361326562663939306665346466623730346162303561346664313936303331
+66306334316162376563356235393932366564613438333563366538633430323333636332633335
+31386634376338383063623233353339663961663965666234653366373063363030373839616630
+64663238333733656636343661653538633130323362336638633838383131663163363161643935
+39313666653262656538336266636261313733626366656633306435346331356636633137323237
+31373035353339316261616363666239353133316566376634383935343566333436303632383734
+65663539396432653531373631346266376231353765393936333437343636643330306639356234
+61386464356634646338343363346362356166626335636232633038313539356636613335316530
+35656334363366323732333466353930313535333366613930633365396439373162643364356465
+65313131333664663337333234666134666639363531376535363932373935363863336233333530
+66656131616635613636643431643165663061356433613436376638646364393537363333363434
+32663635666130616538646433346139653738653464333063373039333434313266363230383235
+62316336346333653839363637323565623734383966653666333133623235656264313063306134
+62623761303034333038626334353434643066376366373937646531336662373930313061356438
+37646134653033376335653766666130663232663839633037313835643763356166663661396432
+31333865363064636539323264626165353362396164306632386335336431653933363063616263
+63393937376437623938653132336665623562663737613762633765336535343131646435333532
+63613832613937633436343564383632623539396364303933363466663830653530626538346439
+34343861376239396332623537323364653338663635643838363836396463306339636561363562
+38636137646430333266323165623536653465313764396162653537376263356136343539393161
+38626434313333363135613065353764666634616361663833366364366334353762663663336161
+61333762643537653965376435356134383565376231356135666636363465636135366539343133
+35373664343135613733356338313362383639613837386266646461353737303333616166333635
+31623534393561366131323763656633393564663935353137643665666438613232366531363138
+64316266333033353836393337313061633065653130363635383334313938323338353632666538
+37653762643130396663386633306462383735303336353634356531663365643265363830346132
+37666537373236343331646265366564396539396531316438623163306265366237663130303439
+33623739376539613438656533646334323664623864643030323831363561316339636636633731
+35353237663065323335323832316163373362346565303833396133323035356330636533343031
+36356464616132656261323732363334616431363833376531303531373036646231316330616238
+62366461633561383633383436333531303165616637663035323865386265636136333561653037
+33616566316564303364613531636530313036326132346434323135373737323836313430656362
+30303538343038303734383130636137386130343462303033393131656535643161333733653462
+33626436343737333736386237376539353232343661623265633662663663363436313062653735
+32326161376361363033373931303332313563383639333563346138333334626637363036353135
+66613333366463396432396266313034616535303038663064383638623531646339323939656432
+33633664323663646334303735633065663337363761306138613335623633393266613661636661
+33373630333234623531303635393164653830383061326234643537333865376261643763333631
+37666663613737323732393130343461353866623339366164346662386363326663363966323565
+61623137353162366463393265643165663339313536343632306339393635313165643037366463
+66666636643437363064363838353833383361643338626333313363323831643633643035666164
+33393632663935323837373363366337363134633166343939356264396436396234366463636366
+61333235396363336634656633393732386433373039356431353337353637316266366465623337
+63313263383761386139316361613763363734636166386561333239393536346337326436626130
+64323937636633386237303331636262613235663261636136393038653765663632396633396435
+37643266373964643665303136623535636265643634313932373734343461333839343230646632
+34633761663237643734303736373636386337366233326262626236663365333665386261323430
+33653966373464386138333366653434653839633536396363346237643932623331346630623938
+65376238323430666234313833316630373030656161306634333134326263663734343561393338
+38363537303464623031663339343565626166363239653465623162663834653364316339393266
+64353530366336353138376164656632303336363662383334636561636630623238393233353132
+63623239613130643537646561303836386164626134393235326533323939666537383665653736
+32396537663138643464623238363430346235613731343064323061303233303538353038643833
+31646530643031353066376336323065363462656132613535633236393035666337643930613439
+32663461356665303735636637313133633035343031326631373766616662613337663731393964
+65366437386236333737383564633530636461643837363131323761656238353764666564623837
+30333736653063613932363236363866316365613237353537353432666263313038343761303931
+32666639373664653764303031656336663230393436626131393331386561643333616236396336
+62646466373536616265323934396335396331353733376334306166663130383037633466393831
+38646434333265336265663763643730353833633335643930353232363034656338623864356537
+39323866363262373134336332303433306161663239343463393163623239316365363739356432
+37336564326132353436626565303733653130646537616533656165363062613237623336626431
+35636635333465396662373933633836303935636361323236613437313965613232323764356239
+32383966343430336636303062333431326366323431363866663464633363366430633831393231
+62303665323764316435303834343461356363313061323039663836313061623063393063356262
+38306336653661346364303435376262346333613234656131373261313134353732393763336430
+36326462663936353634653430613561636536656662633638363538646364303232306439313030
+32643466633133353062383337363538616231623037386536386432663463393961646234326330
+62366230623337343365393333663564616137386333643730626332633665313066623761653531
+38333332653366656265383366613464633462343763396465343565303330636636396134336262
+66646638623162333765633930623034316533373433386535373931623834653636373265316662
+64346232643063653366316533313563333166633530343065646362323163396561333766313637
+62616437636333313936353335373465343466373833333766636335316363373831386563303831
+31333834623130626334613764613864376533393664613663363930396264303735316437633463
+35376565643635636433393632373138313565626364353939336362626132326365626664626330
+37643865623737316135333639323939383233386261386536306561636661353732613162333234
+30366130376333643735626133316439393931303866656236623933313733353866306237386462
+35646663393435336434333739346363333330393964356230376234643932393661383163383236
+63393033386135313534636132373035633961306333386634316363313738316162386262623035
+6130
diff --git a/host_vars/web23 b/host_vars/web23
index d59bf68..b81f6bc 100644
--- a/host_vars/web23
+++ b/host_vars/web23
@@ -1,85 +1,85 @@
 $ANSIBLE_VAULT;1.1;AES256
-34643866316432643663656661633339313239653763623430356538363761393162626338336433
-6535353761396539323630396230316637363536396631350a343338396638613636396364323762
-62306431363961393937633033373963623064333363633034623430613031383032363562663536
-3566646634303639340a366236343164666563366130636433383832656563376463333431303861
-34323164323161303762616164366632663761626665323832366166386166636130383830633065
-64646563396264303035636661663162393332613661663564316466313363656263646533633861
-30366136316131643734356431633064373062613539643937626539373536666663646331643862
-39366666386438373335396136616662346230363631326465373065333633313638303564336165
-62323164373933396166363236396461623432363931636637613235636663613432636136616664
-64643130373337353936663863356363653630633033343538623133616662386430343632303031
-61386331346561346138643735393162616135633333343135653238366533663733626361656666
-61616130313031646365613638633463353861353935623562646666393733656266643834396361
-38333363633162636561323331646262643139643135666261343364333634613138343431623637
-39383635393565656139666535386336616165623333386266383431663936313034393439626234
-30386263323630303563613334393538306430396537613436613264646664616261323336366432
-62333061333730393064666131346339623061306637633261333635336233363831353662653437
-33626333333130386161323038333465613737393835656632346436396361383761303865333339
-36613062353630316633336464336463633230633762366663396463303234343266323233326165
-30303637353163613464633930336463326535623662636638643066333733623032353564393164
-66363732393438393462353034626363636664316464356432363235366134326261326335306462
-61623330656538633364373561336436353362303638356539393031336531396139343539353936
-66323332336235393162376436346330386537336239636434346565386565373365343462323164
-63373462313861653561313762363338623664333233316632303562393736346665626530643061
-65353337623230643136616262623430323235346439626364376362653337303735646663326535
-63393937366232623663623165323965303563323137383462623339396163353433343836383666
-39633065373839646235326130633635316237366631333765343333613564333461326465356134
-37663735393537333532363062633161313437623831356332663765613936383338343634386239
-37303137623138396261663230303530343132346665386363346230663836656634316364373064
-61666262363638376162393339636138353634633630333435383437313433316564663963323532
-30383835336565346337613464343561343832653263663465393133343566333864633766613531
-39653238633237373736663635306563323631346331353362343031303636366439356362306138
-64656166653232633239633037373330343139636261646238613662613364656632643334343233
-31633438386433633736663564613230393662316534336132333636326137353831373335396666
-63636530633037643339326466386638323733363732323939323862326432303231393435616630
-63303461616338386230303933636161306238613861326633636331376464643531333939303735
-38653165303832313739363136616266363837613337306230336433643237326232356333343963
-62316139393661323965313066636530393433613438633430373864343438623631666564386639
-34656461643530636537383264313266653465333764623166383838373366323662653939613439
-38386339393164363863373838303839353532346238643163616635363064343435393933303234
-64306431623738656434333766343263653865393935626466353433386463623739393130386332
-32623762353665393863383762643035313266643863363062626332316439616639616333623730
-35373662316131393836333936656438316334363364323339343236376634323365386461373061
-38363335353965646563646231653434623531336465333231396530623365306137643931633238
-32663937616366393237623861323337623963353964313233353433643733313730666239373031
-62316338623734303839616639303539643439613062656438633563653337626364316535373661
-32313337366465656533653766356436623638316534623666346666646364633436656330663666
-38636439333834313639316663326630356531613432353837616465353763623335623464363734
-34366335656366323634636465353563633532616334636665396439326438656462386336326265
-32393131636362633230366330633564376165313830616134393931613566383433646632363536
-39636563313662656439613565353663613962653730313666636263373065613230313965336130
-30346637323565333139643332336239646636643037316436373134663232373738363564613633
-64396330316332616631346339323466376162336539656433353666643438323365663665623661
-33656162643163323161373931353963303934643532343561643838336236386139316334636161
-38316239356165373036306464313066623432383037613134633364373762313639366330306333
-66643139336436643535353466393830363136386431373962656165633465326135616430316634
-39333966373361613433333631353334343765643435353466626536636437333739353036346635
-64346235336132393030666531343761366562396233386236356332343963363438373535633065
-64643730333465316439363735396566636338303236623438393566316533613333396561353930
-66633631303336346333306332663639643138656636373266353061623234386339313266376564
-37376130336230366630396335343330663162396237366131306237663232316361633939333365
-36366234663735393664353934303930616566336133313664313538326136343363323530343865
-63663633383338323363353061393366353064346232623464333863666334616636333662323265
-35653761323965376364343362643734646439373237333632373736353436326133376663346132
-38373530333137323038653534623761353265313336303538376565626363626535663635313235
-35663765376334366661383764663066383232323431623262626662623138323431383863363736
-66366462303838656234373263653835373666623934633865353533316537363431646661636433
-30383862626636613636323639313063323632323731613134303863356166613137363538333466
-65666635666563616464616538343639363331336233663038616332663032616364393761343036
-61373636623331636136313038333661613339623763663132306131663665663237363730646339
-36363766376437643930663363333635666366343431376439613961353039663938303834316433
-34326235386164373130643533373566653061366636623565303361666234616530346561386239
-37346337336137663366353632323434343263636435313034646639376430633133626466343737
-61656334656639393239633361316635646665633532323461663432633135353264383666666438
-33306336343732643234623430653538613064653635363765303166303061316636393736663561
-66393935663835633437326265656239353730626262333038616633326138623261343864613161
-35333233613163666461323339663063646361646563653531356337373663343166613965366232
-65313839633730386436633962373434643636396264646431653639343361363335633633383062
-34356232366132346537313838663730323336613661376331636363353464316266633336383639
-30373564333265653839666161643366313163356161356237383133636130333330316430613632
-34376338383561613635323030613731636637653961646632363838316665313934646130663361
-65633232396539646337333061326234316534333866383830343632306331663631343864313236
-65613932643938313161353331613634656230303863653037343434373862353462336134646637
-32616266353730336663613865316164626364303262663461363436323133653663636665323134
-30306431336637663130
+30633037383332656130363532373262623063623730666337373430336363383964343039663832
+3633313230323565376234336433383330626238373665360a393234643435376431613363313036
+32386236343262643662356563633038333434333730616332353234333363356465326133623139
+3830316433303631640a613231373138336330646639376135326238383230323534316464383135
+35333631356666323161313261633134636364396232323130333666373864333165346233666232
+62346362353033636464323866343334633565373265623431613866623234633133633466383735
+31343439646166633237643364386638306539626562636235666535333438343664323932383865
+39333533363131633930353962336238363234393161623966376365326661643431303263653164
+63666436616437326137303765303730303135663434663235373363323966623166376332393661
+62336336366265623035346162303730323762353961376333313662626232343366653930656338
+36353134333463663034363737653133633536356166353966373563316235636132383530643339
+37326661346666663139326239396466373630633363373431346635626561623665366566653731
+36396138643936623632613934633965663166313364396466633263303738666164316231366662
+64636362356564663330363763323139623065336162353734626539663231663734333962343665
+32613563363130376665333666313733303963633161313633636337646466353064653866623265
+30653762316433653631306535303463663738653731633964666466623534396663326263643437
+62663366613635373832316538653066623733336631663261666564333634643161653962373932
+30313065656238663063313737383432393433656439383033346634373030643166306565646230
+62353930336664393733663462343062323332323030356338316133393838656536306164623435
+64393634363665643862346564326138336136393235316433313538383162396563303937356335
+33646334646630646233323762323335303030393331636532656132313536663465383237623536
+39633364363036636434323963613633353238346134643837316232653038616138373731643033
+64396563353839386334313933653664613230323430383434653964636538393838386639356361
+63643565643636653434343363333966653163616236363366356539313532393133666239376530
+62663930343462633864373138633364636634643361363935303263353766373936386561376638
+65316138646534396435636563326165643737326533303338323665656334346264643262636437
+63303530363063316461333536333433366461356533393139313435396136353439323435366266
+32343566616161636466663339613434643835613831346366613866343536663530326431343139
+38653165383430653064613837343738623134303766373133623131646134613663383637336264
+35313966646639613262623836393933376137623535323365393837326631663930313336313737
+35626139386264303162393636306136306161383565353739643166653262366164386539353266
+38323266343833323063343263346365383534643835353435626335333637303237633239646330
+32643235666331613364616535326230346634333363633938646633633831633364653337373235
+30316161633634303562613263633962376365363038346137316164323036616664626132386461
+65323764383733666634643635633834396635343835663266623839383130343563386231376537
+62326338643833303538343566616461353135333863626462663830366435636564626538346361
+33646661613334636239653636383436653438376235376665363235653837303037363164633931
+32633733326139346261323464393734316661633239643437373235303237643932633433313564
+36643739613330303362663861626637613130383965646639356532353539373437326439356362
+39643137666633313262356366616561353461633033376235313965646132343233326366353264
+35393561633632306265373032306636326261646235623266636662646334363233623330333734
+37663266363639623036323433656166383631386633313131303030306437643761343965353063
+39373435363238616566643239306136366637646437633335313431623839616264616261633339
+33313364323039373531346335333963343034323637643134653566666562373137656335633932
+39653862653465626432663534663965653933623430616561363430666235363666613833656463
+65326430383137663034623233393339623135356535666161366564383564336132363038646663
+61353465393265613337643338326436333237336339326262356362643932623163616638643835
+31323739646335383532396665326535373161666661306538653365346465366434346463663438
+64323766353933633736313266386564656436666534326534663531613936633830386238303861
+37363231656365383531613764386662356334313330333236363734646431383166636132383338
+35343138353232663135366438386366626239326632333937666530626364313463613831313162
+30363933623561396137616130656535393138346339663266353764653931316639636562666164
+61333938363466623031653766313139306439396435663665386665663663306134666563373238
+36316261363063666335363462353066313735386139313465623338366266383434643464643162
+34383836636336316232343132363464383565366162313563393864376433386236376565623631
+64656164646635666139396539353763333065323266663262643233306261656532613362346432
+33373631613137336366666266633331303966653138393539326335653463303033613565663638
+30663465643832643637643836323462633163643534663465336664313265353966306261613339
+32616139353263663033373835653632386262396164343731613836336435616131356632653830
+61613461333632666366653330626537396232323733663930633966663239356130306666376137
+62636333373635356461633431346636643731656338306366396430323537626233316137656465
+65643339346565376166373066643339356666663735313063303130313663393966623866613337
+31386663363166336337633266646363666236623837303634643337316636353531653765323637
+62313330326363303932633336383337353062643865383730613435353832663364643262626162
+63303439383164333037306231613538313639626537323039366561363233303735323032653432
+35643432336666616665386238353034333037353630323234316266373936356439353632336365
+37646462666537306534623937393939326663316532623837326564303330373261323630353863
+38343438316539336464376664326362353831396132393566396333613164646462636361646234
+35313837666463376233623762663239613134356632333730343363346238613334383861306635
+31623665666461643661383265633965386566656165663566376235343338636336336330336661
+64653032656365363835616634656663623365323766396537303361336533313132316631316533
+31353036663766643131386135653366313535366232636538346237613461383761393666336432
+31623364653166356565376463363437386533303062373930393761646163613962636462643865
+33376561323366363936386531663637343465626666623133396162306139366665616132326161
+63663535636465383836333061396239313463343635633135323464646135393031386361633539
+64396534396361323466326364326266386336643831643536383866313033366534636135613736
+34316661313335383239316536623862316637396465616563386361636261313330313466656239
+37626431613464363965343233666534323736363865373734633535343632393335346265643361
+65326436393631353264613761343237386561306261353261356364386137393362306566353032
+31313363613963323136303262323934333961343563626533666563636432653436393937303037
+37336566663932663062633534303632646162316262323935366661313938393735666561343237
+31616366363339353231643561373362613266343266623464323238356261303762316334333266
+39303633316164376330343864336636313333363862323835303735383866363334643933653337
+35373030353264323761
diff --git a/misc-plays/change_password.yml b/misc-plays/change_password.yml
index d4a2fac..7aea5bf 100644
--- a/misc-plays/change_password.yml
+++ b/misc-plays/change_password.yml
@@ -13,13 +13,13 @@
 
 - hosts: all
   user: provisioning
-  become: yes
+  become: true
   vars_files:
     - "../vars/{{ ansible_distribution }}.yml"
 
   tasks:
     - name: Set password, shell, homedir for provisioning user
       when: provisioning_user is defined
-      user: name={{ provisioning_user.name }} password={{ provisioning_user.password }} shell={{ provisioning_user.shell }} state={{ provisioning_user.state }} createhome=no
+      user: name={{ provisioning_user.name }} password={{ provisioning_user.password }} shell={{ provisioning_user.shell }} state={{ provisioning_user.state }} createhome=false
 
 # vim: set sw=2 ts=2:
diff --git a/nomads.yml b/nomads.yml
index a76c913..e4c341c 100644
--- a/nomads.yml
+++ b/nomads.yml
@@ -2,7 +2,7 @@
 # file: nomads.yml
 
 - hosts: nomads
-  become: yes
+  become: true
   roles:
     - common
     - munin
diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml
index 138965f..b593ea4 100644
--- a/roles/common/handlers/main.yml
+++ b/roles/common/handlers/main.yml
@@ -11,7 +11,7 @@
   ansible.builtin.systemd: name=firewalld state=restarted
 
 - name: reload systemd
-  ansible.builtin.systemd: daemon_reload=yes
+  ansible.builtin.systemd: daemon_reload=true
 
 - name: restart nftables
   ansible.builtin.systemd: name=nftables state=restarted
diff --git a/roles/common/tasks/fail2ban.yml b/roles/common/tasks/fail2ban.yml
index 7720d6e..9e24709 100644
--- a/roles/common/tasks/fail2ban.yml
+++ b/roles/common/tasks/fail2ban.yml
@@ -20,6 +20,6 @@
     - restart fail2ban
 
 - name: Start and enable fail2ban service
-  ansible.builtin.systemd: name=fail2ban state=started enabled=yes
+  ansible.builtin.systemd: name=fail2ban state=started enabled=true
 
 # vim: set sw=2 ts=2:
diff --git a/roles/common/tasks/firewall_Debian.yml b/roles/common/tasks/firewall_Debian.yml
index 176c3ff..b8830bf 100644
--- a/roles/common/tasks/firewall_Debian.yml
+++ b/roles/common/tasks/firewall_Debian.yml
@@ -131,27 +131,27 @@
 
   # need to reload to pick up service/timer/environment changes
   - name: Reload systemd daemon
-    ansible.builtin.systemd: daemon_reload=yes
+    ansible.builtin.systemd: daemon_reload=true
     when: spamhaus_firewalld_systemd_units is changed or
           nftables_systemd_units is changed
 
   - name: Start and enable Spamhaus firewalld update timer
     when: ansible_distribution_version is version('10', '<=')
-    ansible.builtin.systemd: name=update-spamhaus-lists.timer state=started enabled=yes
+    ansible.builtin.systemd: name=update-spamhaus-lists.timer state=started enabled=true
     notify:
       - restart firewalld
       - restart fail2ban
 
   - name: Start and enable nftables update timers
     when: ansible_distribution_version is version('11', '>=')
-    ansible.builtin.systemd: name={{ item }} state=started enabled=yes
+    ansible.builtin.systemd: name={{ item }} state=started enabled=true
     loop:
       - update-spamhaus-nftables.timer
       - update-abusech-nftables.timer
 
   - name: Start and enable nftables
     when: ansible_distribution_major_version is version('11', '>=')
-    ansible.builtin.systemd: name=nftables state=started enabled=yes
+    ansible.builtin.systemd: name=nftables state=started enabled=true
 
   - ansible.builtin.include_tasks: fail2ban.yml
     when: ansible_distribution_major_version is version('9', '>=')
diff --git a/roles/common/tasks/firewall_Ubuntu.yml b/roles/common/tasks/firewall_Ubuntu.yml
index 2143736..a0f6144 100644
--- a/roles/common/tasks/firewall_Ubuntu.yml
+++ b/roles/common/tasks/firewall_Ubuntu.yml
@@ -109,27 +109,27 @@
 
   # need to reload to pick up service/timer/environment changes
   - name: Reload systemd daemon
-    ansible.builtin.systemd: daemon_reload=yes
+    ansible.builtin.systemd: daemon_reload=true
     when: spamhaus_firewalld_systemd_units is changed or
           nftables_systemd_units is changed
 
   - name: Start and enable Spamhaus firewalld update timer
     when: ansible_distribution_version is version('18.04', '<=')
-    ansible.builtin.systemd: name=update-spamhaus-lists.timer state=started enabled=yes
+    ansible.builtin.systemd: name=update-spamhaus-lists.timer state=started enabled=true
     notify:
       - restart firewalld
       - restart fail2ban
 
   - name: Start and enable nftables update timers
     when: ansible_distribution_version is version('20.04', '>=')
-    ansible.builtin.systemd: name={{ item }} state=started enabled=yes
+    ansible.builtin.systemd: name={{ item }} state=started enabled=true
     loop:
       - update-spamhaus-nftables.timer
       - update-abusech-nftables.timer
 
   - name: Start and enable nftables
     when: ansible_distribution_version is version('20.04', '>=')
-    ansible.builtin.systemd: name=nftables state=started enabled=yes
+    ansible.builtin.systemd: name=nftables state=started enabled=true
 
   - ansible.builtin.include_tasks: fail2ban.yml
     when: ansible_distribution_version is version('16.04', '>=')
diff --git a/roles/common/tasks/ntp.yml b/roles/common/tasks/ntp.yml
index 5d538d4..6db7669 100644
--- a/roles/common/tasks/ntp.yml
+++ b/roles/common/tasks/ntp.yml
@@ -18,7 +18,7 @@
 
 - name: Start and enable systemd's NTP client
   when: ansible_service_mgr == 'systemd'
-  ansible.builtin.systemd: name=systemd-timesyncd state=started enabled=yes
+  ansible.builtin.systemd: name=systemd-timesyncd state=started enabled=true
 
 - name: Uninstall ntp on modern Ubuntu/Debian
   ansible.builtin.apt: name=ntp state=absent
diff --git a/roles/common/tasks/packages_Ubuntu.yml b/roles/common/tasks/packages_Ubuntu.yml
index 72d0c49..94fb69a 100644
--- a/roles/common/tasks/packages_Ubuntu.yml
+++ b/roles/common/tasks/packages_Ubuntu.yml
@@ -38,17 +38,17 @@
     - name: Remove lxd snap
       community.general.snap: name=lxd state=absent
       when: ansible_distribution_version is version('20.04', '==')
-      ignore_errors: yes
+      ignore_errors: true
 
     - name: Remove core18 snap
       community.general.snap: name=core18 state=absent
       when: ansible_distribution_version is version('20.04', '==')
-      ignore_errors: yes
+      ignore_errors: true
 
     - name: Remove snapd snap
       community.general.snap: name=snapd state=absent
       when: ansible_distribution_version is version('20.04', '==')
-      ignore_errors: yes
+      ignore_errors: true
 
     - name: Set fact for packages to remove (Ubuntu <= 18.04)
       ansible.builtin.set_fact:
@@ -79,7 +79,7 @@
       when: ansible_distribution_version is version('20.04', '==')
 
     - name: Remove packages
-      ansible.builtin.apt: name={{ ubuntu_annoying_packages }} state=absent purge=yes
+      ansible.builtin.apt: name={{ ubuntu_annoying_packages }} state=absent purge=true
 
     - name: Disable annoying Canonical spam in MOTD
       ansible.builtin.file: path={{ item }} mode=0644 state=absent
@@ -89,7 +89,7 @@
         - /etc/update-motd.d/50-motd-news # Ubuntu 18.04+
         - /etc/update-motd.d/80-esm # Ubuntu 18.04+
         - /etc/update-motd.d/80-livepatch # Ubuntu 18.04+
-      ignore_errors: yes
+      ignore_errors: true
 
     - name: Disable annoying Canonical spam in MOTD
       ansible.builtin.systemd: name={{ item }} state=stopped enabled=no
diff --git a/roles/common/tasks/tarsnap.yml b/roles/common/tasks/tarsnap.yml
index 47ad498..42b45d3 100644
--- a/roles/common/tasks/tarsnap.yml
+++ b/roles/common/tasks/tarsnap.yml
@@ -10,7 +10,7 @@
 
 - name: Update apt cache
   ansible.builtin.apt:
-    update_cache: yes
+    update_cache: true
   when:
     add_tarsnap_apt_key is changed or
     add_tarsnap_apt_repository is changed
diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml
index 74b4ff9..1623a91 100644
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@@ -11,7 +11,7 @@
 
 - name: Update apt cache
   ansible.builtin.apt:
-    update_cache: yes
+    update_cache: true
   when:
     add_mariadb_apt_key is changed or
     add_mariadb_apt_repository is changed
diff --git a/roles/nginx/defaults/main.yml b/roles/nginx/defaults/main.yml
index 5e18635..aefe7fa 100644
--- a/roles/nginx/defaults/main.yml
+++ b/roles/nginx/defaults/main.yml
@@ -25,8 +25,8 @@ nginx_ssl_stapling_resolver: '1.1.1.1 1.0.0.1 [2606:4700:4700::1111] [2606:4700:
 nginx_hsts_max_age: 31536000
 
 # install acme.sh?
-# True unless you're in development and using "localhost" + snakeoil certs
-use_letsencrypt: True
+# true unless you're in development and using "localhost" + snakeoil certs
+use_letsencrypt: true
 
 # Directory root for Let's Encrypt certs
 letsencrypt_root: /etc/ssl
diff --git a/roles/nginx/tasks/letsencrypt.yml b/roles/nginx/tasks/letsencrypt.yml
index e8ad128..40f5059 100644
--- a/roles/nginx/tasks/letsencrypt.yml
+++ b/roles/nginx/tasks/letsencrypt.yml
@@ -79,8 +79,8 @@
     ansible.builtin.systemd:
       name: renew-letsencrypt.timer
       state: started
-      enabled: yes
-      daemon_reload: yes
+      enabled: true
+      daemon_reload: true
 
   when: (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '=='))
         or (ansible_distribution == 'Debian' and ansible_distribution_version is version('11', '=='))
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index 8819eb3..723482e 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -11,7 +11,7 @@
 
 - name: Update apt cache
   ansible.builtin.apt:
-    update_cache: yes
+    update_cache: true
   when:
     add_nginx_apt_key is changed or
     add_nginx_apt_repository is changed
@@ -66,7 +66,7 @@
   tags: nginx
 
 - name: Start and enable nginx service
-  ansible.builtin.systemd: name=nginx state=started enabled=yes
+  ansible.builtin.systemd: name=nginx state=started enabled=true
   tags: nginx
 
 - name: Configure Let's Encrypt
diff --git a/roles/nginx/tasks/wordpress.yml b/roles/nginx/tasks/wordpress.yml
index 92c5247..817d4a0 100644
--- a/roles/nginx/tasks/wordpress.yml
+++ b/roles/nginx/tasks/wordpress.yml
@@ -2,12 +2,12 @@
 
 - block:
   - name: Install WordPress
-    ansible.builtin.git: repo=https://github.com/WordPress/WordPress.git dest={{ nginx_root_prefix }}/{{ item.domain_name }}/wordpress version={{ item.wordpress_version }} depth=1 force=yes
+    ansible.builtin.git: repo=https://github.com/WordPress/WordPress.git dest={{ nginx_root_prefix }}/{{ item.domain_name }}/wordpress version={{ item.wordpress_version }} depth=1 force=true
     when: item.has_wordpress is defined and item.has_wordpress
     loop: "{{ nginx_vhosts }}"
 
   - name: Fix WordPress directory permissions
-    ansible.builtin.file: path={{ nginx_root_prefix }}/{{ item.domain_name }} state=directory owner=nginx group=nginx recurse=yes
+    ansible.builtin.file: path={{ nginx_root_prefix }}/{{ item.domain_name }} state=directory owner=nginx group=nginx recurse=true
     when: item.has_wordpress is defined and item.has_wordpress
     loop: "{{ nginx_vhosts }}"
   tags: wordpress
diff --git a/roles/nginx/templates/https.j2 b/roles/nginx/templates/https.j2
index 27ef0d2..8b31cf6 100644
--- a/roles/nginx/templates/https.j2
+++ b/roles/nginx/templates/https.j2
@@ -1,7 +1,7 @@
 {# helper variables and per-site defaults that we can't set in role defaults #}
 {% set domain_name       = item.domain_name %}
-{# assume HSTS is off unless a vhost explicitly sets it to True #}
-{% set enable_hsts       = item.enable_hsts | default(False) %}
+{# assume HSTS is off unless a vhost explicitly sets it to true #}
+{% set enable_hsts       = item.enable_hsts | default(false) %}
 
     {# first, check if the current vhost has a custom cert (perhaps self-signed) #}
     {% if item.tls_certificate_path is defined and item.tls_key_path is defined %}
@@ -31,7 +31,7 @@
     ssl_prefer_server_ciphers on;
 
     {# OSCP stapling only works with real certs #}
-    {% if use_letsencrypt == True or item.tls_certificate_path %}
+    {% if use_letsencrypt == true or item.tls_certificate_path %}
     # OCSP stapling...
     ssl_stapling on;
     ssl_stapling_verify on;
@@ -47,7 +47,7 @@
     # of such infrastructure, consider turning off session tickets:
     ssl_session_tickets off;
 
-    {% if enable_hsts == True %}
+    {% if enable_hsts == true %}
     # Enable this if you want HSTS (recommended, but be careful)
     # Include all subdomains and indicate to Google that we want this pre-loaded in Chrome's HSTS store
     # See: https://hstspreload.appspot.com/
diff --git a/roles/nginx/templates/vhost.conf.j2 b/roles/nginx/templates/vhost.conf.j2
index d3845b9..b391f87 100644
--- a/roles/nginx/templates/vhost.conf.j2
+++ b/roles/nginx/templates/vhost.conf.j2
@@ -4,10 +4,10 @@
 {% set domain_name    = item.domain_name %}
 {% set domain_aliases = item.domain_aliases | default("") %}
 {# assume optional features are off unless a vhost explicitly sets them #}
-{% set enable_hsts    = item.enable_hsts | default(False) %}
-{% set has_wordpress  = item.has_wordpress | default(False) %}
-{% set needs_php      = item.needs_php | default(False) %}
-{% set has_gitea      = item.has_gitea | default(False) %}
+{% set enable_hsts    = item.enable_hsts | default(false) %}
+{% set has_wordpress  = item.has_wordpress | default(false) %}
+{% set needs_php      = item.needs_php | default(false) %}
+{% set has_gitea      = item.has_gitea | default(false) %}
 
 # http -> https vhost
 server {
@@ -39,18 +39,18 @@ server {
     {# will only work if the TLS cert covers the domain + aliases, like example.com and www.example.com #}
     server_name {{ domain_name }} {{ domain_aliases }};
 
-    index {% if has_wordpress == True or needs_php == True %}index.php{% else %}index.html{% endif %};
+    index {% if has_wordpress == true or needs_php == true %}index.php{% else %}index.html{% endif %};
 
     access_log  /var/log/nginx/{{ domain_name }}-access.log;
     error_log   /var/log/nginx/{{ domain_name }}-error.log;
 
     {% include 'https.j2' %}
 
-    {% if has_wordpress == True %}
+    {% if has_wordpress == true %}
         {% include 'wordpress.j2' %}
     {% endif %}
 
-    {% if has_gitea == True %}
+    {% if has_gitea == true %}
         {% include 'gitea.j2' %}
     {% endif %}
 
@@ -59,7 +59,7 @@ server {
         root /usr/share/nginx/html;
     }
 
-    {% if has_wordpress == True or needs_php == True %}
+    {% if has_wordpress == true or needs_php == true %}
     location ~ [^/]\.php(/|$) {
         # Zero-day exploit defense.
         # http://forum.nginx.org/read.php?2,88845,page=3
@@ -99,7 +99,7 @@ server {
         fastcgi_cache_bypass $http_pragma $wordpress_logged_in;
         fastcgi_no_cache $http_pragma $wordpress_logged_in;
 
-        {% if enable_hsts == True %}
+        {% if enable_hsts == true %}
         # Enable this if you want HSTS (recommended, but be careful)
         # Include all subdomains and indicate to Google that we want this pre-loaded in Chrome's HSTS store
         # See: https://hstspreload.appspot.com/
@@ -113,7 +113,7 @@ server {
     include extra-security.conf;
 }
 
-{% if has_wordpress == True %}
+{% if has_wordpress == true %}
 # Check if a user is logged in
 # if so, set $wordpress_logged_in = 1
 # otherwise, set $wordpress_logged_in = 0
diff --git a/roles/nginx/templates/wordpress.j2 b/roles/nginx/templates/wordpress.j2
index a35f6dd..61fc66e 100644
--- a/roles/nginx/templates/wordpress.j2
+++ b/roles/nginx/templates/wordpress.j2
@@ -5,7 +5,7 @@
     location / {
         try_files $uri $uri/ /index.php?$args;
 
-        {% if enable_hsts == True %}
+        {% if enable_hsts == true %}
         # Enable this if you want HSTS (recommended, but be careful)
         # Include all subdomains and indicate to Google that we want this pre-loaded in Chrome's HSTS store
         # See: https://hstspreload.appspot.com/
@@ -16,7 +16,7 @@
     location ~* \.(?:ico|css|js|gif|jpe?g|png|svg)$ {
         add_header Cache-Control "max-age=604800";
 
-        {% if enable_hsts == True %}
+        {% if enable_hsts == true %}
         # Enable this if you want HSTS (recommended, but be careful)
         # Include all subdomains and indicate to Google that we want this pre-loaded in Chrome's HSTS store
         # See: https://hstspreload.appspot.com/
diff --git a/roles/php-fpm/tasks/Debian_10.yml b/roles/php-fpm/tasks/Debian_10.yml
index c27b2cf..d19aca4 100644
--- a/roles/php-fpm/tasks/Debian_10.yml
+++ b/roles/php-fpm/tasks/Debian_10.yml
@@ -11,7 +11,7 @@
         - php-curl
 
   - name: Install php-fpm and deps
-    ansible.builtin.apt: name={{ php_fpm_packages }} state=present update_cache=yes
+    ansible.builtin.apt: name={{ php_fpm_packages }} state=present update_cache=true
 
   # only copy php-fpm config for vhosts that need WordPress or PHP
   - name: Copy php-fpm pool config
diff --git a/roles/php-fpm/tasks/Ubuntu_18.04.yml b/roles/php-fpm/tasks/Ubuntu_18.04.yml
index 9feb748..1cc47bd 100644
--- a/roles/php-fpm/tasks/Ubuntu_18.04.yml
+++ b/roles/php-fpm/tasks/Ubuntu_18.04.yml
@@ -11,7 +11,7 @@
         - php-curl
 
   - name: Install php-fpm and deps
-    ansible.builtin.apt: name={{ php_fpm_packages }} state=present update_cache=yes
+    ansible.builtin.apt: name={{ php_fpm_packages }} state=present update_cache=true
 
   # only copy php-fpm config for vhosts that need WordPress or PHP
   - name: Copy php-fpm pool config
diff --git a/roles/php-fpm/tasks/Ubuntu_20.04.yml b/roles/php-fpm/tasks/Ubuntu_20.04.yml
index 4d7c73b..5195978 100644
--- a/roles/php-fpm/tasks/Ubuntu_20.04.yml
+++ b/roles/php-fpm/tasks/Ubuntu_20.04.yml
@@ -12,7 +12,7 @@
         - php7.4-xml
 
   - name: Install php-fpm and deps
-    ansible.builtin.apt: name={{ php_fpm_packages }} state=present update_cache=yes
+    ansible.builtin.apt: name={{ php_fpm_packages }} state=present update_cache=true
 
   # only copy php-fpm config for vhosts that need WordPress or PHP
   - name: Copy php-fpm pool config
diff --git a/roles/php-fpm/tasks/main.yml b/roles/php-fpm/tasks/main.yml
index b70a934..7f75639 100644
--- a/roles/php-fpm/tasks/main.yml
+++ b/roles/php-fpm/tasks/main.yml
@@ -6,25 +6,25 @@
 
 # If any of the vhosts on this host need WordPress then we need to install PHP.
 # This uses selectattr to filter the list of dicts in nginx_vhosts, selecting
-# any that have has_wordpress defined, and has_wordpress set to True.
+# any that have has_wordpress defined, and has_wordpress set to true.
 #
 # See: https://stackoverflow.com/a/31896249
 - name: Check if any vhost needs WordPress
   ansible.builtin.set_fact:
-    install_php: True
-  when: "nginx_vhosts | selectattr('has_wordpress', 'defined') | selectattr('has_wordpress', 'equalto', True) | list | length > 0"
+    install_php: true
+  when: "nginx_vhosts | selectattr('has_wordpress', 'defined') | selectattr('has_wordpress', 'equalto', true) | list | length > 0"
 
 # Legacy, was only for Piwik, but leaving for now.
 - name: Check if any vhost needs PHP
   ansible.builtin.set_fact:
-    install_php: True
-  when: "nginx_vhosts | selectattr('needs_php', 'defined') | selectattr('needs_php', 'equalto', True) | list | length > 0"
+    install_php: true
+  when: "nginx_vhosts | selectattr('needs_php', 'defined') | selectattr('needs_php', 'equalto', true) | list | length > 0"
 
 # If install_php has not been set, then we assume no vhosts need PHP. This is
 # a bit hacky, but it's the closest we come to an if/then/else.
-- name: Set install_php to False
+- name: Set install_php to false
   ansible.builtin.set_fact:
-    install_php: False
+    install_php: false
   when: install_php is not defined
 
 - name: Configure php-fpm on Ubuntu 18.04
diff --git a/web.yml b/web.yml
index a70100a..d542f5d 100644
--- a/web.yml
+++ b/web.yml
@@ -3,7 +3,7 @@
 
 - name: Configure web servers
   hosts: web
-  become: yes
+  become: true
   roles:
     - common
     - { role: mariadb, when: mariadb_databases is defined}