roles/common: minor configuration of Debian 13 SSH

Tweak some of the new OpenSSH per-source penalty settings on Debian 13. For now only adjusting the source network masks and reusing the list of IPs to exempt from fail2ban. These being built in makes them easier to use, but I think I will end up sticking with fail2ban for the heavy lifting because it per- sists across restarts of the daemon, whereas OpenSSH's doesn't. I will monitor OpenSSH on Debian 13 to see how to best use it along side fail2ban.
roles/common: use 127.0.0.0/8 for fail2ban ignoreip
2025-09-23 10:33:24 +03:00 · 2025-09-23 10:33:23 +03:00 · 2025-09-23 10:33:23 +03:00 · 2025-09-23 10:33:11 +03:00 · 2025-09-21 23:09:40 +03:00 · 2025-09-21 22:20:31 +03:00
78 changed files with 1300 additions and 14461 deletions
--- a/2
+++ b/2
@@ -10,4 +10,4 @@ ansible = "*"
 ansible-lint = "*"

 [requires]
-python_version = "3.10"
+python_version = "3.13"
--- a/Pipfile.lock
+++ b/Pipfile.lock
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Ansible playbook for base and initial configuration of the web server hosting my
 ## Assumptions
 Before you can run this, a few things are assumed:

- You have a clean, minimal Ubuntu 20.04 or Debian 11/12 host up and running
+- You have a clean, minimal Debian 12 host up and running
 - Python 3 is installed on the remote server (requirement of Ansible)
 - You have a user account with password-less SSH access to the machine
 - You have sudo privileges on the remote host
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -13,12 +13,6 @@ interpreter_python=auto
 # See: https://docs.ansible.com/ansible/latest/user_guide/connection_details.html#managing-host-key-checking
 host_key_checking = False

-ansible_managed = This file is managed by Ansible.%n
-  template: {file}
-  date: %Y-%m-%d %H:%M:%S
-  user: {uid}
-  host: {host}
-
 [privilege_escalation]
 # instead of using -K
 become_ask_pass=True
--- a/group_vars/all
+++ b/group_vars/all
@@ -3,4 +3,12 @@

 tls_cipher_suite: "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"

+ansible_managed: |-
+  This file is managed by Ansible.
+
+  {{ 'template: ' + template_path }}
+  {{ 'date: ' + (template_mtime | string) }}
+  {{ 'user: ' + template_uid }}
+  {{ 'host: ' + template_host }}
+
 # vim: set ts=2 sw=2:
--- a/group_vars/web
+++ b/group_vars/web
@@ -8,4 +8,7 @@ webserver: nginx
 extra_fail2ban_filters:
  - nginx

+# root prefix for all web servers
+web_root_prefix: /var/www
+
 # vim: set ts=2 sw=2:
--- a/host_vars/nomad03
+++ b/host_vars/nomad03
@@ -1,88 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-30626135313830363339656165316536336564353362383439346465373932326136363337343762
-3566343231306635313739303335616162396232303139620a323764663132323135663063393334
-62656434643333663062356266626235363439393231333734343432333363643934393636373935
-6332353333303231370a373839636135363730636539326335343533316633623366663230353262
-37396264313763366438663139376638613337336634393665663032623035646631653564353966
-30353165333638363864656531396165363430653438376465656233306639353336353237343532
-62363330333662316630656662633333626462363062366637386163336230386634353933316238
-36373365323735373435616262613933333964323033633233333766396362616534316166386432
-31333831353130616166633735366131653137363361313333363763623364303435346338643838
-63323831616135643830653839323663386239343430356437346665343937306666333836363163
-37386663616136653861663530383865343930306263663366633438363332336561326330353235
-64613332643962323930323436393934636263396239366364306136303437323739343237656263
-33613964363139363862396235636435626432326432663166633765613635666165363165663539
-62366232316632356233326564633737643466343535656564653833623766373637313833373331
-38356336396461666535386363633437376232396330623162333936366434376361326261343336
-35396237346663646334306663306633383061353333643639613335643661633835313732353963
-64623234373033656366613566363639663762646663396462323361363463373961383530653962
-61613962316336653266383638393630323338383161303565333862633932646463313134613232
-31326262336561383066633430383833353835373363623163303830663837313265663662313862
-39353062333234663631653565613135396337626664626264366534633566386236393562303861
-66316335343638356261396339353932633331356363343231363862333066366438323764633331
-39316236343262666337303839356138666338306130323462646633373464646163613734366132
-37623739333435396266316131383238323365646632636339353631376166613532386133393165
-64633933393062623230346430653961646366316662356336646162313466393964323332616431
-34336562343337636138616431313736613539373137303666666435373238346233383438383963
-39346138393635626263376137643436393736636435393234646439353932386136653034393961
-65336230356336386539386334653236303964623632323738383333623361643235656530363731
-39306538353533663538366362613739386463336632653665636533616462363530636466626165
-32623762616266623231393938663931306231626139663736613862363234643861366563633532
-31393934333433316138323131373836306135333061363231363461643933303836633231343266
-37323732383036326664376438343261333733636532303664613965353561376337633564373062
-64316133333263393138333261323062626363343765393161363935386232353862353762626334
-31346661303239383832343637376663316537353938346534306134626534363438386162653133
-66616237663864633837356132663139633734303532653637366138386534653462323163313836
-34633337643661656465653839316362633236633833646632393930656136313730646566316537
-39653935633636363635386435373062333031356363633661366530616537356533323133366339
-34336139323138336532313833633364363566613833636339396462326530313961613133613761
-63356231313363303862663032373663626262646565353933663963363633363663373238656632
-31393264333732366565376164623766663162386365356233383132303835643932386436333631
-65663334336434663562326238326338376662303339616233616464313139363864623463613761
-36326235396433633435366263393964383936616433653861326431343133346435663832363437
-33333232636536363863373037616436313335393639393966653062303330366463323861376661
-39383665316665303363636331373461623339323031393333323465313733336236303037313132
-37613163373432316132306235343061393530366237626134323431323836316261326237323965
-33643662663361356164653430323566666230656561633434333538303365663334373537306164
-65633264323836656537623766316533386564663765376661663537303835393438623430343263
-64353031633436343938383263313439383033326532313466653766616164653463333434353664
-30653034353632373561346565616631656235323637333562613538663538363936663464383064
-31336365613037626331363731376663653537613639313839303934633462666430306635613434
-65333736653430363936663566666535346231383563366630653535313038383964326630616264
-63616563356361313439303833646438386163313865356634636536336661626664316163333739
-63303465643861656362386530353363383836396534373461663630636461633336333862353830
-38666536353663386466313066376562383366643062343965386132666435376433626165353735
-61666432613133646130373839336261333565303532643164306264633736346637373835393266
-33306133346531333835303238393361663463346162636161646565313266616133623735653838
-62396531313634343936363861373031383830636538376334316161326364303930383435653936
-36653233343935646337376232396638343033613130663563326135633231636362373162623565
-39323762623966393332376235643666383461356263346332663939616235346564636233333463
-35356161616536613939313436616233386563343764643335653961643366656632646338313536
-35323732333539326239386436306230646230663336623566633763383534626162386463613961
-62353737363435653866383633343830356536633462373636323734656231636466336235306162
-62666133656166633838363262613930396236393862306438316135643131393737363531373631
-31626635613233313063326463663738393632373135373632323731396332323138633962356364
-39396565393038623532313230383539656564383134363161393663373539393837313335303636
-38626138613932643265643231366364373964623436663566623838643939323331646661653435
-37373765393736303861346164373938393532636637353737326539333435666562643664363365
-65646662626630663238336264663665663762666439626336376434386436653965363832346339
-30396630343430323762666232366336376563616430643136336630373864623132386465393761
-66396439346563393539616335383562633237353962383033356230323339353336343964366134
-38623661326336376561633937613565386164656462313863336339643733663834373732643266
-61666438666635656236376239393433306239613936613731636235353638396432326438396432
-63333237333633333761666630663339613232313136316232346234363562333937363463333137
-39653336343732303536616662643961623932643330653936343337316135366535363964616439
-37376433326332386339363961656537326632333830346435353234333661636434343730356139
-37346131303930306364623334313335323563333631653539383637376433623439386564633035
-38346436376661333233663334623762646633346530643466336664386134353662363430316438
-63393333333034623537303030353136633035353865383366613961373766646463366131623564
-34646630666233333834383761363566373935333037633666336261313566613762616531653739
-34643162323438646165643433333438656664383232376233306233623539366233633337663565
-35323636633533343064376434666435666564666134343839653630326236343262633431326133
-36663432396666306631613162643065313135373332303863326234356537366436333938303637
-36636334396231316564643733646662376138313637643232373836373632643362383363363530
-32363736646162303532356132373337616162636464643164323432623338363463663736373433
-34343136646339376132383434623261356163393032306134633665323130623766333738656639
-64306632346162396533316431343339366664333335643464386266376464393039633439653837
-36303363326239316663346434613336636239653331626661393962356166383339333234376135
-653361363631363366323165353538313438
--- a/host_vars/web22
+++ b/host_vars/web22
@@ -1,137 +1,141 @@
 $ANSIBLE_VAULT;1.1;AES256
-63356538383464316265363339393262623161313332333136363039613462393065323039333839
-3437666230393631643932373532646537376132643736310a376432616165386434306637356530
-34643036663438363264346130653636623930643462343566313365393161623033663632376331
-3934336365366334620a613436336239303131353165663562343865336631303433656630636266
-36366433623938643932643765393238653935623861303939326637306439313039613566396336
-35666638396239356630353762356463353137393462336532643930343366336233343730656334
-32373335623539333339666662633965363061613434366463613239353466333462646234643635
-34383866623936396437396361363761363337326539393439663830303663643163636137656565
-64633961373835373739666162643233373036656134303863316166323061663362626431323331
-33643763363563373332613131363166616432376230356636623530313463636337363235626532
-61343465656534623965636638303032363261613430343030656330653239656465386434383234
-31636336343162616134333536373632353733373136356165313662623063306661306131646533
-37626138393035613864316539396338386563333338633834356334313766346161363130313231
-66336131323931633963653464636361653739623537616563663533313734343666623237333036
-39616564333334366361356135353132363033323461383166663531306135626135353766343361
-33393939333532363465383632353031383065353830643038303665613430313334343630616566
-38663963356631613234623435636361333935613964626330636331346432663733303561336166
-31633436363438373966666431366232323136356139643333393363323232363261356433353333
-31336332623038323130303938356131396131386335646466366263346530616439363539306165
-37343834656333343034653435323934623462333330613764336361323535663563653835643535
-61386630306465353037386531353263656238333461313063626164343231303163663030363165
-32653332383931653535663266393631373236643236616432303166646634363637346539626263
-36396666653730333962366265663334323765623137643130653335613861313163656339663263
-64303261353062376536343830353236653163386339373534323934343861323231303733303733
-62393439626566373230383734396137346436623932363564383030626638643330666264306564
-63656236356535613362346137653438623765656437313137666365346464326161646262346136
-65636363316530346130343237383161643539616536373266343865323832343634623761616335
-39626632373865313661316335336130303462383266623135646437643736616561326266396332
-35663339326531626366376530326134303363343930656539326433366662393662653764323133
-34643364343637383930353036613339393639363534663938623966633833346666616536616134
-63643031383464663139313066656335623164636666346265396564626665653935333833353730
-63393062363439303435623663363331343732656563663233366630646163323564666437346566
-61303736653536663662326430366330313239353535613135663336653334316435323262396634
-36313761613836353937356665346135633162653239383033613438356435313234373638656339
-33366462613432346533663231313535333665646635333436343237373935373838376533363165
-63303735663564333732363363393038636531653264613965666235333331623663346534366566
-33333764356665363638616561656537613039626631363066316133623963626338343231616361
-34373266313863663831363639663439643936303931666532653962323733366635653035646664
-32666239663062316437313737346161376562663630636466623431386266363263623633373963
-35666665383738656437313438303832326137343033633562666436303535613538343832613839
-35383330613538383164353233336335376266343336616430303638363365613065393262356435
-30346537616335316661333533363763393633616438633066316232623738366230646364353735
-38386236316539343063633765386235663866323433666531613666646365376330333539376562
-66653762633630366638323334393132383635373663343830653431363534353961303139373734
-38346438663966363166363464393863393861643936333536343035626239326238363131343966
-64646435663863303937646364616630633266326237326330323733396165663134383432343862
-39666238346336353531653165313066343039653430373833323832326631386430326435646530
-33343233353331626533383864303235366538663338376465316161653664386361373761376134
-65333437306165346331376664646161616230316530373630383965333434313937333637393530
-39373334653164646233323064623431313832313662313832613837646561373534623535656239
-31663939616634613235386564333962626333616164326466656163376362346437396532616238
-65656138323430633137373030376661653231303237396331333839626365376533313038316132
-35623464323934616361663164323137316135326566393339316161666437343238333031633832
-34356561333565623532656332353463343430336531383364383733323664383365356263393539
-33666332623665343336353365396163386334613232663962663131383734353762396466313464
-61396265333037636232323738373462313638663033343437376431656464636137306661636561
-39646537393131613539633032616338333265386562326532636136303039383034626465373139
-66636363316461643537356439303861356439656661643663653335383565616532623435383634
-66313436366663656464643061643531633161626635643235633930353339386663346232366235
-62386161323934343730646439353163663538633562626232323333373839363430323239366131
-62343832346235643863353134636261616262386364623236643966333636323637646532333634
-33643932656165383031303931383634623231663335613035316537373731323963376565333962
-34363939616334326134363661633833386433373430363766383461663136376466306661386639
-64343236393738326339663963396635393739623232313463333063653133343461633564393735
-61353562626362383432636430343062643166353035633232613035636634383064663734633934
-65633430613138643837346535623865613931383338306663633466343932393837333333313836
-61346163316630353133616661346133346239623763303262373637303030336639643563646665
-35646462643531356635376331303565663630356161323565333737363462666161633761623431
-63666161353639393734613631396566336137333830653531643436623462316535333537666365
-36643662353664383233613131643761346433356265333761326361303439326535396438613061
-63633335326339323437316331613033643934323238663636636431653632363165666232363631
-35363231363165306236326662656166373739373761316466353663393836336631326465646265
-66363766663333333765653032366161363437383735646664633635306562323363343863643936
-64656536333531393564303864386631663635613263316137653435303962313561646334383664
-63623133383531303563386562633233636436323236643764646336663038363062663032313232
-65643136666664306537343433393262306534356536383038323337623835326632636464656138
-39613237616365303333303737333431343361303563326266663533353639623636393961363531
-33393737643062373365633431613564383962616337666631376264356431633035303665626136
-30373731383361333035356138626162656238373337613334343739383064666133383432646665
-65396466663762613036346137636538336130326334656634656238656664343431363365376664
-63386264313665363464623335343862353432366336393032666434363131656339326632316538
-63363864373462303136323133383136653732343639343964376137613337353934353061303966
-30363433333631306432316462393137636361393535303938646662306263636639663637313037
-63616363366139303036353633663031353366373462303234343264643136393736623735393966
-32636131633065383530316336663463653134323566633262666635303831343035333433623235
-37616331366263643231383264386336316264343531663736383736643235376532363736323637
-62343831636636663137313032303837663331633135633632366337386161633631393438653862
-64326161626131646536313830383166613163373134623532663164656265306138313766313438
-61376635326165366335393730343736366536623566373866363730626434343931636531343166
-34383830396530393631326135386262323037303162343665663339616266343565363433363630
-31656238383533366333376463303538646538333735306435326565303833353333636439626438
-62343232303863663733623231633439613333313336303733373032613862363736336137663935
-37373230356234636438303966323934633530396335653463333137366533333930343236666336
-35333030623835376635353936343437653563383031663133663264366530303830376336373731
-37326334616538623931346462623130333165643232386566356366313431393736633765396334
-39376564323431303630363836613963323532386234656431363165393439373532613139373734
-61363434633363356165616664316336373335383030393732306432633765326161313934343038
-33323065356539633761643032383132656466646235623131663830346535613130313964373033
-34343134666463633135313036323237386235616636613237376630303536376166303137653534
-38316238366665653166613937623465376332386238643066643161363666303338386366323164
-64663531383162373865623063396562336639393837623062356631303266643533346232613234
-62623430346165373139343562373463623166623138396435616234623961656663633163626466
-31663061666630653664356463336363383462343766616162313866623734376337346533623762
-32643330393161633262333230363366613837386138636536316665656435383336373835393039
-62363436663435633462633761396439306264666638636230383038396635393037353134306566
-39373661633030323332333733343366343333303263323861383365663132356334373465336539
-65316530626663333665663338346430333032333933353839333165356465373361343765613833
-31303265303538396662613164393038366261383739623963613562363234363035643166343164
-63346336323737643732643863633138373831393735313036316632646138363032616462626337
-35386631303266313932346466383533356634643733376536636535623063653632356362376566
-64313963643461326533363164373634663663303233666136336535366539633135323335386539
-31323265633234323563396666323065623236623837616362353261663235623836663566616232
-31326666653533383838346565386131373238333630613634386662343630323136333438333866
-39343030326632373334636430353538396237653366663434396531303031326331626633316436
-31626165316333343266343764666138663034316139366332663165393264663136363866363239
-35393032666638333130356666613862643761313065666430663332306561663734373061363438
-31623433383162333066303362653966383638616364623262623062623539303336646333326363
-62616433643731643462663362663030306264616365653531633138316361363865306237333636
-32323732613364393232343833343731323037623331333739613538646361363064383736646336
-35646331323265313166653232393731646562333962333339336630316538333834383366663466
-61663033636636626166623861393433366261336139656136316366343264363735666132633632
-34363539336662656661326139346561303061366262616130626232313030313664623130306238
-31663062653734303136336634313736346437326266346537633533316238356464643534623766
-61383934636636366565393330363666363131646330343434393938663231333435323062636464
-38363265663566313535353565623733323363666132636139383638306635363661306463653537
-36343734356562323164396136383261623464646534643738333864653035336266383131353866
-37363436393039653431336562363263363536336639396632323937323431366139313235663839
-63663263326232333162326633623863623333653932643339626263326337646264656134383733
-38613065393931393862633732306139646663346136393765343432313131636165336630616537
-37646461313764666138386538303937623034336163376130623365383566653463313930653333
-64316134663438636664313339393734383464663631346465666363363961313562376336373965
-65373430343962303339626164656234346234363033636339656362333136626631356233363365
-31313131643030633364306162303238303163663934366262636639353636326339616530316563
-36626530336335333338343535633137663961363363613933336230306533353434643534306166
-37663334626263316538366637376562316537386632366637623235343838626639306131313138
-38393636313037393535
+38353762626535363837346634333565643931386536313339336365663162656533363636383931
+3737373161623364396366323338613062386466313539640a653334643937326338386262623261
+65643635373532636439396235373964303537646334343633633531633435323037313433346636
+3866306363303338360a356166353265386130616163616662623764313536616666656237636563
+30323036353635303438363234646234656530373365396530666539393132643831653039666562
+65383962306465363862333131383263353736623264616465336139313638343462653361333239
+64363562653366396664623662376433663335313231653935626237663430303734326433333739
+62616265373732316530366331323664373637386661353664626464646264356465346466663539
+31613435366362343564313732616639376664613630316236373333653634386130663463626231
+31396631623466666364316237313363366439326231653035316437616134643035393138383364
+35313738373562353632366637663232393638396330626165323535343538633264353366663738
+30663135646162396331623837343661613333313437313434313365623664316135626239636230
+65376137303439323166346536353831653537326662356330393362666430633831323537623830
+65326164663136383339353138663936306166633662346363353063663435323266653137666630
+61353263653735626236373233313436343466653238376634623366356431333439323932343938
+33303432613063383135633261653837633961643737623462626439373335613430356532353031
+31626666663963643736323731613735376239663530373166626365666339346435323761333637
+35383464626437646665653931653932653033376464386132383038633734373138313830303466
+39313532333866303565353161636435646231313461646639316566386639323561363633636139
+37613661626162306431313266383964323434343039386533333535646565373933396565613565
+34666136633265663035306261623531333665636336303665613635333232316331643935353461
+32643735623532313363663530656630653531666335323565353063316537396334383230386462
+33333565616634356537376466373332356663376363353166656139623336396130653564333739
+39303733303939313838363331356437646632386631343466383332313037616430313566396335
+31363038373437643266656463373662653966653832613935303462303031653761336165646162
+31646631373335336435383638666562373236656231613662646161613533376237366463383630
+36393532316336303531353032303937353963306164663162386137393664353962323865616532
+63326462626130386234643639363762323863326134623063343731366433306431303763363233
+36366334386266616261616266386439623665326339653562373836306165353137353137376337
+37316363653935623736613138356333653936363866356665303737363032363564643532303234
+37656432656363336564393263353430373437303337303461613763346461646565646535366638
+34366337343033666134383966646563356533626665373337646231313431346239303635353261
+62313939383762303235373537643531623465353062303939383666323139396630346461626136
+38656632373637616532666433626564376338363239326234656561636239653536366331633234
+65366139623238336234363564616430646435666562616636303064663437663731303839313365
+38636438386162623862363865646233346336636439663833343136316165343564393339653565
+38346166346434386338303032303430303535373635336562663030336566666435623537363137
+61373161343138656365376531633830313561336632633330323035346431643837383062343537
+66663961306666333535656432393134363565656635333633363732626665656365356138623164
+65303936633666643034313636663262616661313739663135653335366261613133643630343362
+66343033363835613031626635336538303362393561313032336136306465316231366137373736
+62303335393333306132326135393562666431303631306538326433613362306131316139386361
+31383665386466653066613038633335636233396335383764336462636138333034383836386365
+38323739346630643532346161383336646165333336393961663930623531303434366265313861
+39613231373335373338656434636134663036636234393534353033613133383034343437626434
+31646339613430343265333833303231333739666266646436336161363330396264313636616461
+61396332363537636162316261363030393466356263353938343236323932306366316535366533
+38633165393339356339383939666161336461653438353632653530326639313238323761386461
+63653765313532646166306237386435663432633934343039666637323362626338313135623034
+30356438633635363738383932393861376235353962303663313963313964383530306530316363
+64656638363436326562323234303961396333323931666365656433663865616439336138656232
+66653964383034343837663936306632336562373637346132333063663263306237303461333732
+65363661623064643663623661393563353739373535373764356163666639376236313839336438
+35386265646331313663653761353864663934663261313037396135373938343265353934353361
+30343564623631316366343838656135393364353836613330393536623662383637333039383133
+37653733626662646631616563306638366263323634303636616331323964393962643061646361
+39363562396634656637626630653533396236613334343332326439656165306537326464613436
+37333632663731316165613432353339356561316431623038303365303663326666303666646363
+66656630396661353765666131393737636630366666373136313837373165303437316233656261
+38346463303964343132393162663762346163363739383733326635643264616166393264633934
+64333137373532343032303431316633613836323631613231346133366635616435366436316239
+64353633366431386664623239353735623037623364346431633733336563303430653233313637
+35353138616164643834343339653739373038633531303039333632663566323565383637646561
+31383965396365653364343761363161656432656665383963656463613637633938376234353532
+33653837613266666661613165376665626432643439363637623333336234313836373232333736
+65313232373233613763376463663161643636663162643864363962376232326462643936383131
+39366164323038376633376238363663313238336166386663616261306532633331643537376631
+31376663393036363566653061353636326565376636346466656263663266326332656461336437
+32646162313932646632663738646532663439313630393038383530653562313439336631663535
+36396265353231373435353137303164356633653938373166363663616632303764633738333439
+62626533346561333565626163643235393164353861636662636531333834623965323034363735
+33336138356663303462393864343434636364346432383665313931653062363138623261326438
+31616533643163363261386635653732343939633965363362643536626264323537656238633539
+62393935386433313366656133633532353131343237623466376632623434626362363062326531
+33346165643164363365626432333631393664316266613731663162313764386336333231396632
+36666536336333623063346166306164376138343566353063343866316432333266366337623866
+61313039663661643863663434343732313139653037373065333463383635393061323938643162
+61383064303461366162636439343438376266313931323934313563623435346634663739666565
+62333035346634303139626432313262383262633437663436323763313361633235393037343665
+62316564376464333133343134333230383765303834613233613232626131343631326433373062
+36343466396430313534336332636233623337613134333861646334326633396434353765636163
+37343638363234313030363661306337393361333332306331396164346633336130336366396430
+62306539656332313162626239303066656664383639353730633738643132386662643733393761
+62666339346130626163656237623730363066343838303036613038613763356263363365366238
+62623435303838623630333231663137393362323234383533393763623235376164626461373736
+36343761353362623433663936623433353439646463613233363732613435373564616239626564
+61313066333939326435656535333963313831316231356232346534633531613963353130333432
+37656163663230626632393939363532356366643764323330366630656334623261656334633865
+61303066333566363061626437643132353664383061383364333338666230313034373535613063
+63386237383638333263323337313336373830303865303466363965303839316162663431656538
+33376332643335366537306133613761613132643232316438623939356331656263633933613935
+65653465383434386561323462626362623566663330656439386361616562353430303938636436
+66636531343063633561363330663436383930613438323764356562383536393933646264323135
+64633764356166343965346362323466306636363633656466653934313230326435336536306230
+38353432323537393131313239373861386237313530366139313338313330326632313536353837
+63386161336335363834356437326630353031373435316462613634633039336132646134653236
+31346664353932323339366464356161333637313761666138386164313163333531626235663338
+62386333303264306363646136646463393134373939346438383465393439343337643336633039
+62316464663038326439656334373331303165346534346466663538313632633561393335333931
+65363964363335616639643462393463343437626539363838626439386164303464316666633663
+63656639626133653266306266306531646331386366343936316136363935323662336335326338
+30666130316265666631306635646565363039306138313462376662626161313134383633653834
+32376163383763306165323466306264616366343332636564636162666434333732643635336163
+61626162626331613438373464336465303739316130343965633532336531313661613961313164
+39636165316638616338653965373833333732396363393463383433383930353361636166346232
+61323935663536306533336137356566383130393564623938666231393431626136396137633066
+36633133313861353338616561373838363833353531633465363731336237663561383561326635
+62306338643965613635353536613335363934666362366466663461646135346436336164346536
+62666631303638386137356233303235613636346661303834613335616161396238663530643165
+65366364336139303766303938643038303461656335303438396565346330313665636165626432
+64326666313562646239356231663834326566313331303363343064346539626636346438313266
+65643364656164336166353435343730376266333633666230316464356439336463316464653137
+66303865613961373732323439326535373933393537656462303831333432636261613564636330
+63323361366332386331376437666234346661373233653432343733346363306130383665626437
+33313330336365633464643563643465393935653132376135663163393161616462353838336664
+35393833656135643733623765626639386561333336623930303465323963613164666531396632
+35326365386566353966383635643132316230383363393539653335633934646239316131653536
+66656161653030343462346337653434313062343663633665363838393865336536626532623132
+66643636656134353363636433636538623930396262663864343332303066333566653063336464
+32303030396137346636636164323133396364623532643332363638643761323938616530353836
+65366331633561623331393231323534343239323565333330636136383836616230343034633036
+38373530616532653166653932643665396434373465376530313663646236336238656266616261
+33396463303963646633373038336662623161643135656136326533646337316562323932613833
+65616434316239353531666131383335383733333830613934393465663138353662613063323537
+31393337343737646537666430323666366338303731623339323063393636353132636233343436
+61653862333837623666343061633531396235633565313631663937393337303764316466613130
+33653732373034613639326338353438643664653461616133646235393864386564353765313932
+36613165323465333937626165316632313334313364353463366239356630653530313761373261
+35326331313438656238646535643131656634396238363734626431633734336238616538383636
+32303331666531653331306263303534613332653535643833303062653566393632333030383263
+63393636643264656439373165383861323534333462353763343931363065393738323433323839
+33333530323434363662633939303261636465356663326565633238663333656131376130396561
+63363636613161383465323233626630613265346162386439353665393832383961616564636538
+65333635336638646436623033343831356339656638333231666439643337306636313931643466
+32393765303361323735646130613035346564356562656631373435653832663165313131336236
+31636634663466366234386262623234626161663461386661656435656133616339383633386230
+34313065396335636630333066633339646432313632373131306235333164336534363630313939
+32623062393230633732323130613338363833356533306662616637326337343330303635343532
+38396665633938313932656130303263396631343761616631616637633831666139343130313236
+62356630346264376432
--- a/roles/caddy/defaults/main.yml
+++ b/roles/caddy/defaults/main.yml
@@ -2,7 +2,7 @@
 # file: roles/caddy/defaults/main.yml

 # parent directory of vhost document roots
-caddy_root_prefix: /var/www
+caddy_root_prefix: "{{ web_root_prefix }}"

 # Email address to use for the ACME account managing the site's certificates.
 # Not sure what Caddy does if this doesn't exist.
--- a/roles/caddy/handlers/main.yml
+++ b/roles/caddy/handlers/main.yml
@@ -3,7 +3,7 @@

 # I'm currently not sure when we need to restart versus reload
 - name: reload caddy
-  ansible.builtin.systemd:
+  ansible.builtin.systemd_service:
    name: caddy
    state: reloaded

--- a/roles/caddy/tasks/main.yml
+++ b/roles/caddy/tasks/main.yml
@@ -71,6 +71,7 @@
    mode: "0755"
    owner: root
    group: root
+  tags: caddy

 # TODO: the variable is still named nginx_vhosts
 - name: Configure Caddy virtual hosts
--- a/roles/caddy/templates/etc/caddy/conf.d/vhost.j2
+++ b/roles/caddy/templates/etc/caddy/conf.d/vhost.j2
@@ -8,6 +8,12 @@
 {% set needs_php      = item.needs_php | default(false) %}
 {% set has_gitea      = item.has_gitea | default(false) %}
 {% set static_site    = item.static_site | default(false) %}
+{# Allow sites to override the document root #}
+{% if item.document_root is defined %}
+{%   set document_root = item.document_root %}
+{% else %}
+{%   set document_root = (caddy_root_prefix, domain_name) | ansible.builtin.path_join %}
+{% endif %}

 {% if domain_aliases %}
 {#   domain_aliases is a string, so we split on space #}
@@ -21,15 +27,20 @@
 {{ domain_name }} {
    {% if has_gitea %}
    reverse_proxy :3000
-    {% endif %}
+    {% elif static_site -%}
+    root * {{ document_root }}

-    {% if static_site -%}
-    root * {{ item.document_root }}
-
-    encode zstd gzip
+    encode

    file_server
-    {% endif %}
+    {% elif has_wordpress -%}
+    root * {{ document_root }}
+    encode
+    {%   if ansible_distribution_major_version is version('12', '==') -%}
+    php_fastcgi unix//run/php/php8.2-fpm-{{ domain_name }}.sock
+    {%   endif -%}
+    file_server
+    {% endif -%}

    import security-headers
 }
--- a/roles/common/defaults/main.yml
+++ b/roles/common/defaults/main.yml
@@ -8,7 +8,7 @@ fail2ban_maxretry: 6
 fail2ban_findtime: 3600
 # 2 weeks in seconds
 fail2ban_bantime: 1209600
-fail2ban_ignoreip: 127.0.0.1/8 172.26.0.0/16 192.168.5.0/24
+fail2ban_ignoreip: 127.0.0.0/8

 # Disable SSH passwords. Must use SSH keys. This is OK because we add the keys
 # before re-configuring the SSH daemon to disable passwords.
--- a/roles/common/files/abuseipdb-ipv4.nft
+++ b/roles/common/files/abuseipdb-ipv4.nft
--- a/roles/common/files/abuseipdb-ipv6.nft
+++ b/roles/common/files/abuseipdb-ipv6.nft
@@ -1,5 +0,0 @@
-#!/usr/sbin/nft -f
-
-define ABUSEIPDB_IPV6 = {
-fd21:3523:74e0:7301::
-}
--- a/roles/common/files/aggregate-cidr-addresses.pl
+++ b/roles/common/files/aggregate-cidr-addresses.pl
@@ -1,89 +0,0 @@
-#!/usr/bin/perl
-#
-# aggregate-cidr-addresses - combine a list of CIDR address blocks
-# Copyright (C) 2001,2007 Mark Suter <suter@zwitterion.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see L<http://www.gnu.org/licenses/>.
-#
-# [MJS 22 Oct 2001] Aggregate CIDR addresses
-# [MJS  9 Oct 2007] Overlap idea from Anthony Ledesma at theplanet dot com.
-# [MJS 16 Feb 2012] Prompted to clarify license by Alexander Talos-Zens - at at univie dot ac dot at
-# [MJS 21 Feb 2012] IPv6 fixes by Alexander Talos-Zens
-# [MJS 21 Feb 2012] Split ranges into prefixes (fixes a 10+ year old bug)
-
-use strict;
-use warnings;
-use English qw( -no_match_vars );
-use Net::IP;
-
-## Read in all the IP addresses
-my @addrs = map { Net::IP->new($_) or die "$PROGRAM_NAME: Not an IP: \"$_\"."; }
-    map { / \A \s* (.+?) \s* \Z /msix and $1; } <>;
-
-## Split any ranges into prefixes
-@addrs = map {
-    defined $_->prefixlen ? $_ : map { Net::IP->new($_) }
-        $_->find_prefixes
-} @addrs;
-
-## Sort the IP addresses
-@addrs = sort { $a->version <=> $b->version or $a->bincomp( 'lt', $b ) ? -1 : $a->bincomp( 'gt', $b ) ? 1 : 0 } @addrs;
-
-## Handle overlaps
-my $count   = 0;
-my $current = $addrs[0];
-foreach my $next ( @addrs[ 1 .. $#addrs ] ) {
-    my $r = $current->overlaps($next);
-    if ( $current->version != $next->version or $r == $IP_NO_OVERLAP ) {
-        $current = $next;
-        $count++;
-    }
-    elsif ( $r == $IP_A_IN_B_OVERLAP ) {
-        $current = $next;
-        splice @addrs, $count, 1;
-    }
-    elsif ( $r == $IP_B_IN_A_OVERLAP or $r == $IP_IDENTICAL ) {
-        splice @addrs, $count + 1, 1;
-    }
-    else {
-        die "$PROGRAM_NAME: internal error - overlaps() returned an unexpected value!\n";
-    }
-}
-
-## Keep aggregating until we don't change anything
-my $change = 1;
-while ($change) {
-    $change = 0;
-    my @new_addrs = ();
-    $current = $addrs[0];
-    foreach my $next ( @addrs[ 1 .. $#addrs ] ) {
-        if ( my $total = $current->aggregate($next) ) {
-            $current = $total;
-            $change  = 1;
-        }
-        else {
-            push @new_addrs, $current;
-            $current = $next;
-        }
-    }
-    push @new_addrs, $current;
-    @addrs = @new_addrs;
-}
-
-## Print out the IP addresses
-foreach (@addrs) {
-    print $_->prefix(), "\n";
-}
-
-# $Id: aggregate-cidr-addresses,v 1.9 2012/02/21 10:14:22 suter Exp suter $
--- a/roles/common/files/etc/cron-apt/3-download
+++ b/roles/common/files/etc/cron-apt/3-download
@@ -1,2 +0,0 @@
-autoclean -y
-upgrade -y -o APT::Get::Show-Upgraded=true
--- a/roles/common/files/etc/cron-apt/config
+++ b/roles/common/files/etc/cron-apt/config
@@ -1,5 +0,0 @@
-# Configuration for cron-apt. For further information about the possible
-# configuration settings see the README file.
-
-MAILON="never"
-OPTIONS="-o quiet=1 -o Dir::Etc::SourceList=/etc/apt/security.sources.list -o Dir::Etc::SourceParts=\"/dev/null\""
--- a/roles/common/files/etc/sudoers.d/provisioning
+++ b/roles/common/files/etc/sudoers.d/provisioning
@@ -1 +0,0 @@
-provisioning   ALL=(ALL)  ALL
--- a/roles/common/files/firehol_level1-ipv4.nft
+++ b/roles/common/files/firehol_level1-ipv4.nft
@@ -1,5 +1,5 @@
 #!/usr/sbin/nft -f

-define SPAMHAUS_IPV4 = {
+define FIREHOL_LEVEL1_IPV4 = {
 192.168.254.254/32
 }
--- a/roles/common/files/spamhaus-ipv6.nft
+++ b/roles/common/files/spamhaus-ipv6.nft
@@ -1,5 +0,0 @@
-#!/usr/sbin/nft -f
-
-define SPAMHAUS_IPV6 = {
-fd21:3523:74e0:7301::/64
-}
--- a/roles/common/files/update-abusech-nftables.service
+++ b/roles/common/files/update-abusech-nftables.service
@@ -1,27 +0,0 @@
-[Unit]
-Description=Update Abuse.ch SSL Blacklist IPs
-# This service will fail if nftables is not running so we use Requires to make
-# sure that nftables is started.
-Requires=nftables.service
-# Make sure the network is up and nftables is started
-After=network-online.target nftables.service
-Wants=network-online.target update-abusech-nftables.timer
-
-[Service]
-# https://www.ctrl.blog/entry/systemd-service-hardening.html
-# Doesn't need access to /home or /root
-ProtectHome=true
-# Possibly only works on Ubuntu 18.04+
-ProtectKernelTunables=true
-ProtectSystem=full
-# Newer systemd can use ReadWritePaths to list files, but this works everywhere
-ReadWriteDirectories=/etc/nftables
-PrivateTmp=true
-WorkingDirectory=/var/tmp
-
-SyslogIdentifier=update-abusech-nftables
-ExecStart=/usr/bin/flock -x update-abusech-nftables.lck \
-          /usr/local/bin/update-abusech-nftables.sh
-
-[Install]
-WantedBy=multi-user.target
--- a/roles/common/files/update-abusech-nftables.sh
+++ b/roles/common/files/update-abusech-nftables.sh
@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-#
-# update-abuseipdb-nftables.sh v0.0.1
-#
-# Download IP addresses seen using a blacklisted SSL certificate and load them
-# into nftables sets. As of 2021-07-28 these appear to only be IPv4.
-# 
-# See: https://sslbl.abuse.ch/blacklist
-#
-# Copyright (C) 2021 Alan Orth
-#
-# SPDX-License-Identifier: GPL-3.0-only
-
-# Exit on first error
-set -o errexit
-
-abusech_ipv4_set_path=/etc/nftables/abusech-ipv4.nft
-abusech_list_temp=$(mktemp)
-
-echo "Downloading Abuse.sh SSL Blacklist IPs"
-
-abusech_response=$(curl -s -G -w "%{http_code}\n" https://sslbl.abuse.ch/blacklist/sslipblacklist.txt --output "$abusech_list_temp")
-
-if [[ $abusech_response -ne 200 ]]; then
-	echo "Abuse.ch responded: HTTP $abusech_response"
-
-	exit 1
-fi
-
-if [[ -f "$abusech_list_temp" ]]; then
-    echo "Processing IPv4 list"
-
-    abusech_ipv4_list_temp=$(mktemp)
-    abusech_ipv4_set_temp=$(mktemp)
-
-    # Remove comments, DOS carriage returns, and IPv6 addresses (even though
-    # Abuse.ch seems to only have IPv4 addresses, let's not break our shit on
-    # that assumption some time down the line).
-    sed -e '/#/d' -e 's/
-//' -e '/:/d' "$abusech_list_temp" > "$abusech_ipv4_list_temp"
-
-    echo "Building abusech-ipv4 set"
-    cat << NFT_HEAD > "$abusech_ipv4_set_temp"
-#!/usr/sbin/nft -f
-
-define ABUSECH_IPV4 = {
-NFT_HEAD
-
-    while read -r network; do
-        # nftables doesn't mind if the last element in the set has a trailing
-        # comma so we don't need to do anything special here.
-        echo "$network," >> "$abusech_ipv4_set_temp"
-    done < $abusech_ipv4_list_temp
-
-    echo "}" >> "$abusech_ipv4_set_temp"
-
-    install -m 0600 "$abusech_ipv4_set_temp" "$abusech_ipv4_set_path"
-
-    rm -f "$abusech_list_temp" "$abusech_ipv4_list_temp" "$abusech_ipv4_set_temp"
-fi
-
-echo "Reloading nftables"
-# The abusech nftables sets are included by nftables.conf
--- a/roles/common/files/update-abusech-nftables.timer
+++ b/roles/common/files/update-abusech-nftables.timer
@@ -1,12 +0,0 @@
-[Unit]
-Description=Update Abuse.ch SSL Blacklist IPs
-
-[Timer]
-# Once a day at midnight
-OnCalendar=*-*-* 00:00:00
-# Add a random delay of 0–3600 seconds
-RandomizedDelaySec=3600
-Persistent=true
-
-[Install]
-WantedBy=timers.target
--- a/roles/common/files/update-firehol-nftables.service
+++ b/roles/common/files/update-firehol-nftables.service
@@ -0,0 +1,24 @@
+[Unit]
+Description=Update FireHOL lists
+# Make sure the network is up
+After=network-online.target
+Wants=network-online.target update-firehol-nftables.timer
+
+[Service]
+# https://www.ctrl.blog/entry/systemd-service-hardening.html
+# Doesn't need access to /home or /root
+ProtectHome=true
+# Possibly only works on Ubuntu 18.04+
+ProtectKernelTunables=true
+ProtectSystem=full
+# Newer systemd can use ReadWritePaths to list files, but this works everywhere
+ReadWriteDirectories=/etc/nftables
+PrivateTmp=true
+WorkingDirectory=/var/tmp
+
+SyslogIdentifier=update-firehol-nftables
+ExecStart=/usr/bin/flock -x update-firehol-nftables.lck \
+          /usr/local/bin/update-firehol-nftables.sh
+
+[Install]
+WantedBy=multi-user.target
--- a/roles/common/files/update-spamhaus-nftables.timer
+++ b/roles/common/files/update-spamhaus-nftables.timer
@@ -1,5 +1,5 @@
 [Unit]
-Description=Update Spamhaus lists
+Description=Update FireHOL lists

 [Timer]
 # Once a day at midnight
--- a/roles/common/files/update-spamhaus-nftables.service
+++ b/roles/common/files/update-spamhaus-nftables.service
@@ -1,27 +0,0 @@
-[Unit]
-Description=Update Spamhaus lists
-# This service will fail if nftables is not running so we use Requires to make
-# sure that nftables is started.
-Requires=nftables.service
-# Make sure the network is up and nftables is started
-After=network-online.target nftables.service
-Wants=network-online.target update-spamhaus-nftables.timer
-
-[Service]
-# https://www.ctrl.blog/entry/systemd-service-hardening.html
-# Doesn't need access to /home or /root
-ProtectHome=true
-# Possibly only works on Ubuntu 18.04+
-ProtectKernelTunables=true
-ProtectSystem=full
-# Newer systemd can use ReadWritePaths to list files, but this works everywhere
-ReadWriteDirectories=/etc/nftables
-PrivateTmp=true
-WorkingDirectory=/var/tmp
-
-SyslogIdentifier=update-spamhaus-nftables
-ExecStart=/usr/bin/flock -x update-spamhaus-nftables.lck \
-          /usr/local/bin/update-spamhaus-nftables.sh
-
-[Install]
-WantedBy=multi-user.target
--- a/roles/common/files/update-spamhaus-nftables.sh
+++ b/roles/common/files/update-spamhaus-nftables.sh
@@ -1,91 +0,0 @@
-#!/usr/bin/env bash
-#
-# update-spamhaus-nftables.sh v0.0.1
-#
-# Download Spamhaus DROP lists and load them into nftables sets.
-# 
-# See: https://www.spamhaus.org/drop/
-#
-# Copyright (C) 2021 Alan Orth
-#
-# SPDX-License-Identifier: GPL-3.0-only
-
-# Exit on first error
-set -o errexit
-
-spamhaus_ipv4_set_path=/etc/nftables/spamhaus-ipv4.nft
-spamhaus_ipv6_set_path=/etc/nftables/spamhaus-ipv6.nft
-
-function download() {
-    echo "Downloading $1"
-    wget -q -O - "https://www.spamhaus.org/drop/$1" > "$1"
-}
-
-download drop.txt
-download edrop.txt
-download dropv6.txt
-
-if [[ -f "drop.txt" && -f "edrop.txt" ]]; then
-    echo "Processing IPv4 DROP lists"
-
-    spamhaus_ipv4_list_temp=$(mktemp)
-    spamhaus_ipv4_set_temp=$(mktemp)
-
-    # Extract all networks from drop.txt and edrop.txt, skipping blank lines and
-    # comments. Use aggregate-cidr-addresses.pl to merge overlapping IPv4 CIDR
-    # ranges to work around a firewalld bug.
-    #
-    # See: https://bugzilla.redhat.com/show_bug.cgi?id=1836571
-    cat drop.txt edrop.txt | sed -e '/^$/d' -e '/^;.*/d' -e 's/[[:space:]];[[:space:]].*//' | aggregate-cidr-addresses.pl > "$spamhaus_ipv4_list_temp"
-
-    echo "Building spamhaus-ipv4 set"
-    cat << NFT_HEAD > "$spamhaus_ipv4_set_temp"
-#!/usr/sbin/nft -f
-
-define SPAMHAUS_IPV4 = {
-NFT_HEAD
-
-    while read -r network; do
-        # nftables doesn't mind if the last element in the set has a trailing
-        # comma so we don't need to do anything special here.
-        echo "$network," >> "$spamhaus_ipv4_set_temp"
-    done < $spamhaus_ipv4_list_temp
-
-    echo "}" >> "$spamhaus_ipv4_set_temp"
-
-    install -m 0600 "$spamhaus_ipv4_set_temp" "$spamhaus_ipv4_set_path"
-
-    rm -f "$spamhaus_ipv4_list_temp" "$spamhaus_ipv4_set_temp"
-fi
-
-if [[ -f "dropv6.txt" ]]; then
-    echo "Processing IPv6 DROP lists"
-
-    spamhaus_ipv6_list_temp=$(mktemp)
-    spamhaus_ipv6_set_temp=$(mktemp)
-
-    sed -e '/^$/d' -e '/^;.*/d' -e 's/[[:space:]];[[:space:]].*//' dropv6.txt > "$spamhaus_ipv6_list_temp"
-
-    echo "Building spamhaus-ipv6 set"
-    cat << NFT_HEAD > "$spamhaus_ipv6_set_temp"
-#!/usr/sbin/nft -f
-
-define SPAMHAUS_IPV6 = {
-NFT_HEAD
-
-    while read -r network; do
-        echo "$network," >> "$spamhaus_ipv6_set_temp"
-    done < $spamhaus_ipv6_list_temp
-
-    echo "}" >> "$spamhaus_ipv6_set_temp"
-
-    install -m 0600 "$spamhaus_ipv6_set_temp" "$spamhaus_ipv6_set_path"
-
-    rm -f "$spamhaus_ipv6_list_temp" "$spamhaus_ipv6_set_temp"
-fi
-
-echo "Reloading nftables"
-# The spamhaus nftables sets are included by nftables.conf
-/usr/sbin/nft -f /etc/nftables.conf
-
-rm -v drop.txt edrop.txt dropv6.txt
--- a/roles/common/handlers/main.yml
+++ b/roles/common/handlers/main.yml
@@ -1,27 +1,27 @@
 ---
 # ansible.builtin.file: roles/common/handlers/main.yml

- name: reload sshd
-  ansible.builtin.systemd:
+- name: Reload sshd
+  ansible.builtin.systemd_service:
    name: "{{ sshd_service_name }}"
    state: reloaded

- name: reload sysctl
-  command: sysctl -p /etc/sysctl.conf
+- name: Reload sysctl
+  ansible.builtin.command: sysctl -p /etc/sysctl.conf

- name: reload systemd
-  ansible.builtin.systemd:
+- name: Reload systemd
+  ansible.builtin.systemd_service:
    daemon_reload: true

- name: restart nftables
-  ansible.builtin.systemd:
+- name: Restart nftables
+  ansible.builtin.systemd_service:
    name: nftables
    state: restarted

 # 2021-09-28: note to self to keep fail2ban at the end, as handlers are executed
 # in the order they are defined, not in the order they are listed in the task's
 # notify statement and we must restart fail2ban after updating the firewall.
- name: restart fail2ban
-  ansible.builtin.systemd:
+- name: Restart fail2ban
+  ansible.builtin.systemd_service:
    name: fail2ban
    state: restarted
--- a/roles/common/tasks/cron-apt.yml
+++ b/roles/common/tasks/cron-apt.yml
@@ -1,11 +1,17 @@
 ---
- name: Configure cron-apt (config)
-  ansible.builtin.copy: src={{ item.src }} dest={{ item.dest }} mode={{ item.mode }} owner={{ item.owner }} group={{ item.group }}
-  loop:
-    - { src: etc/cron-apt/config, dest: /etc/cron-apt/config, mode: "0644", owner: root, group: root }
-    - { src: etc/cron-apt/3-download, dest: /etc/cron-apt/action.d/3-download, mode: "0644", owner: root, group: root }
+- name: Remove cron-apt
+  ansible.builtin.apt:
+    name: cron-apt
+    state: absent
+    cache_valid_time: 3600

- name: Configure cron-apt (security)
-  ansible.builtin.template: src=security.sources.list.j2 dest=/etc/apt/security.sources.list mode=0644 owner=root group=root
+- name: Remove cron-apt configs
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: absent
+  loop:
+    - /etc/cron-apt/config
+    - /etc/cron-apt/action.d/3-download
+    - /etc/apt/security.sources.list

 # vim: set ts=2 sw=2:
--- a/roles/common/tasks/fail2ban.yml
+++ b/roles/common/tasks/fail2ban.yml
@@ -1,8 +1,7 @@
 ---
 - name: Install fail2ban
-  when:
-    - ansible_distribution_major_version is version('11', '>=')
-  ansible.builtin.package:
+  when: ansible_distribution_version is version('11', '>=')
+  ansible.builtin.apt:
    name:
      - fail2ban
      - python3-systemd
@@ -15,7 +14,7 @@
    dest: /etc/fail2ban/jail.d/sshd.local
    owner: root
    mode: "0644"
-  notify: restart fail2ban
+  notify: Restart fail2ban

 - name: Configure fail2ban nginx filter
  when:
@@ -27,7 +26,7 @@
    dest: /etc/fail2ban/jail.d/nginx.local
    owner: root
    mode: "0644"
-  notify: restart fail2ban
+  notify: Restart fail2ban

 - name: Create fail2ban service override directory
  ansible.builtin.file:
@@ -44,11 +43,11 @@
    owner: root
    mode: "0644"
  notify:
-    - reload systemd
-    - restart fail2ban
+    - Reload systemd
+    - Restart fail2ban

 - name: Start and enable fail2ban service
-  ansible.builtin.systemd:
+  ansible.builtin.systemd_service:
    name: fail2ban
    state: started
    enabled: true
--- a/roles/common/tasks/firewall.yml
+++ b/roles/common/tasks/firewall.yml
@@ -0,0 +1,25 @@
+---
+# Debian 11+ will use nftables directly, with no firewalld.
+
+- name: Install Debian firewall packages
+  when: ansible_distribution_version is version('11', '>=')
+  ansible.builtin.apt:
+    name: nftables
+    state: present
+    cache_valid_time: 3600
+
+- name: Remove iptables on newer Debian
+  when: ansible_distribution_version is version('11', '>=')
+  ansible.builtin.apt:
+    pkg: iptables
+    state: absent
+
+- name: Configure nftables
+  when: ansible_distribution_version is version('11', '>=')
+  ansible.builtin.include_tasks: nftables.yml
+
+- name: Configure fail2ban
+  when: ansible_distribution_version is version('9', '>=')
+  ansible.builtin.include_tasks: fail2ban.yml
+
+# vim: set sw=2 ts=2:
--- a/roles/common/tasks/firewall_Debian.yml
+++ b/roles/common/tasks/firewall_Debian.yml
@@ -1,115 +0,0 @@
---
-# Debian 11+ will use nftables directly, with no firewalld.
-
- block:
-    - name: Install Debian firewall packages
-      when: ansible_distribution_major_version is version('11', '>=')
-      ansible.builtin.package:
-        name:
-          - libnet-ip-perl # for aggregate-cidr-addresses.pl
-          - nftables
-          - curl # for nftables update scripts
-        state: present
-        cache_valid_time: 3600
-
-    - name: Remove iptables on newer Debian
-      when: ansible_distribution_major_version is version('11', '>=')
-      ansible.builtin.apt:
-        pkg: iptables
-        state: absent
-
-    - name: Copy nftables.conf
-      when: ansible_distribution_major_version is version('11', '>=')
-      ansible.builtin.template:
-        src: nftables.conf.j2
-        dest: /etc/nftables.conf
-        owner: root
-        mode: "0644"
-      notify:
-        - restart nftables
-        - restart fail2ban
-
-    - name: Create /etc/nftables extra config directory
-      when: ansible_distribution_major_version is version('11', '>=')
-      ansible.builtin.file:
-        path: /etc/nftables
-        state: directory
-        owner: root
-        mode: "0755"
-
-    - name: Copy extra nftables configuration files
-      when: ansible_distribution_major_version is version('11', '>=')
-      ansible.builtin.copy:
-        src: "{{ item.src }}"
-        dest: /etc/nftables/{{ item.src }}
-        owner: root
-        group: root
-        mode: "0644"
-        force: "{{ item.force }}"
-      loop:
-        - { src: spamhaus-ipv4.nft, force: "no" }
-        - { src: spamhaus-ipv6.nft, force: "no" }
-        - { src: abusech-ipv4.nft, force: "no" }
-        - { src: abuseipdb-ipv4.nft, force: "yes" }
-        - { src: abuseipdb-ipv6.nft, force: "yes" }
-      notify:
-        - restart nftables
-        - restart fail2ban
-
-    - name: Copy nftables update scripts
-      when: ansible_distribution_version is version('11', '>=')
-      ansible.builtin.copy:
-        src: "{{ item }}"
-        dest: /usr/local/bin/{{ item }}
-        mode: "0755"
-        owner: root
-        group: root
-      loop:
-        - update-spamhaus-nftables.sh
-        - aggregate-cidr-addresses.pl
-        - update-abusech-nftables.sh
-
-    - name: Copy nftables systemd units
-      when: ansible_distribution_version is version('11', '>=')
-      ansible.builtin.copy:
-        src: "{{ item }}"
-        dest: /etc/systemd/system/{{ item }}
-        mode: "0644"
-        owner: root
-        group: root
-      loop:
-        - update-spamhaus-nftables.service
-        - update-spamhaus-nftables.timer
-        - update-abusech-nftables.service
-        - update-abusech-nftables.timer
-      register: nftables_systemd_units
-
-    # need to reload to pick up service/timer/environment changes
-    - name: Reload systemd daemon
-      ansible.builtin.systemd:
-        daemon_reload: true
-      when: nftables_systemd_units is changed
-
-    - name: Start and enable nftables update timers
-      when: ansible_distribution_version is version('11', '>=')
-      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: true
-
-    - ansible.builtin.include_tasks: fail2ban.yml
-      when:
-        - ansible_distribution_major_version is version('9', '>=')
-  tags: firewall
-
-# vim: set sw=2 ts=2:
--- a/roles/common/tasks/firewall_Ubuntu.yml
+++ b/roles/common/tasks/firewall_Ubuntu.yml
@@ -1,114 +0,0 @@
---
-# Ubuntu 20.04 will use nftables directly, with no firewalld.
-
- block:
-    - name: Install Ubuntu firewall packages
-      when: ansible_distribution_version is version('20.04', '>=')
-      ansible.builtin.package:
-        name:
-          - libnet-ip-perl # for aggregate-cidr-addresses.pl
-          - nftables
-          - curl # for nftables update scripts
-        state: present
-        cache_valid_time: 3600
-
-    - name: Remove ufw
-      ansible.builtin.package:
-        name: ufw
-        state: absent
-
-    - name: Copy nftables.conf
-      when: ansible_distribution_version is version('20.04', '>=')
-      ansible.builtin.template:
-        src: nftables.conf.j2
-        dest: /etc/nftables.conf
-        owner: root
-        mode: "0644"
-      notify:
-        - restart nftables
-        - restart fail2ban
-
-    - name: Create /etc/nftables extra config directory
-      when: ansible_distribution_version is version('20.04', '>=')
-      ansible.builtin.file:
-        path: /etc/nftables
-        state: directory
-        owner: root
-        mode: "0755"
-
-    - name: Copy extra nftables configuration files
-      when: ansible_distribution_version is version('20.04', '>=')
-      ansible.builtin.copy:
-        src: "{{ item.src }}"
-        dest: /etc/nftables/{{ item.src }}
-        owner: root
-        group: root
-        mode: "0644"
-        force: "{{ item.force }}"
-      loop:
-        - { src: spamhaus-ipv4.nft, force: "no" }
-        - { src: spamhaus-ipv6.nft, force: "no" }
-        - { src: abusech-ipv4.nft, force: "no" }
-        - { src: abuseipdb-ipv4.nft, force: "yes" }
-        - { src: abuseipdb-ipv6.nft, force: "yes" }
-      notify:
-        - restart nftables
-        - restart fail2ban
-
-    - name: Copy nftables update scripts
-      when: ansible_distribution_version is version('20.04', '>=')
-      ansible.builtin.copy:
-        src: "{{ item }}"
-        dest: /usr/local/bin/{{ item }}
-        mode: "0755"
-        owner: root
-        group: root
-      loop:
-        - update-spamhaus-nftables.sh
-        - aggregate-cidr-addresses.pl
-        - update-abusech-nftables.sh
-
-    - name: Copy nftables systemd units
-      when: ansible_distribution_version is version('20.04', '>=')
-      ansible.builtin.copy:
-        src: "{{ item }}"
-        dest: /etc/systemd/system/{{ item }}
-        mode: "0644"
-        owner: root
-        group: root
-      loop:
-        - update-spamhaus-nftables.service
-        - update-spamhaus-nftables.timer
-        - update-abusech-nftables.service
-        - update-abusech-nftables.timer
-      register: nftables_systemd_units
-
-    # need to reload to pick up service/timer/environment changes
-    - name: Reload systemd daemon
-      ansible.builtin.systemd:
-        daemon_reload: true
-      when: nftables_systemd_units is changed
-
-    - name: Start and enable nftables update timers
-      when: ansible_distribution_version is version('20.04', '>=')
-      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: true
-
-    - ansible.builtin.include_tasks: fail2ban.yml
-      when:
-        - ansible_distribution_version is version('16.04', '>=')
-  tags: firewall
-
-# vim: set sw=2 ts=2:
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -8,23 +8,11 @@
  tags: ntp

 - name: Install common packages
-  ansible.builtin.include_tasks: packages_Debian.yml
-  when: ansible_distribution == 'Debian'
-  tags: packages
-
- name: Install common packages
-  ansible.builtin.include_tasks: packages_Ubuntu.yml
-  when: ansible_distribution == 'Ubuntu'
+  ansible.builtin.include_tasks: packages.yml
  tags: packages

 - name: Configure firewall
-  ansible.builtin.include_tasks: firewall_Debian.yml
-  when: ansible_distribution == 'Debian'
-  tags: firewall
-
- name: Configure firewall
-  ansible.builtin.include_tasks: firewall_Ubuntu.yml
-  when: ansible_distribution == 'Ubuntu'
+  ansible.builtin.import_tasks: firewall.yml
  tags: firewall

 - name: Configure secure shell daemon
@@ -34,13 +22,23 @@
 # containers identify as virtualization hosts, which makes this tricky, because we have actual Debian VM hosts!
 - name: Reconfigure /etc/sysctl.conf
  when: ansible_virtualization_role != 'host'
-  ansible.builtin.template: src=sysctl_{{ ansible_distribution }}.j2 dest=/etc/sysctl.conf owner=root group=root mode=0644
+  ansible.builtin.template:
+    src: "sysctl_{{ ansible_distribution }}.j2"
+    dest: /etc/sysctl.conf
+    owner: root
+    group: root
+    mode: "0644"
  notify:
-    - reload sysctl
+    - Reload sysctl
  tags: sysctl

 - name: Set I/O scheduler
-  ansible.builtin.template: src=etc/udev/rules.d/60-scheduler.rules.j2 dest=/etc/udev/rules.d/60-scheduler.rules owner=root group=root mode=0644
+  ansible.builtin.template:
+    src: etc/udev/rules.d/60-scheduler.rules.j2
+    dest: /etc/udev/rules.d/60-scheduler.rules
+    owner: root
+    group: root
+    mode: "0644"
  tags: udev

 - name: Copy admin SSH keys
--- a/roles/common/tasks/nftables.yml
+++ b/roles/common/tasks/nftables.yml
@@ -0,0 +1,96 @@
+---
+# Common nftables tasks for Debian 11 and Debian 12.
+
+- name: Copy nftables.conf
+  ansible.builtin.template:
+    src: nftables.conf.j2
+    dest: /etc/nftables.conf
+    owner: root
+    mode: "0644"
+  notify:
+    - Restart nftables
+    - Restart fail2ban
+
+- name: Create /etc/nftables extra config directory
+  ansible.builtin.file:
+    path: /etc/nftables
+    state: directory
+    owner: root
+    mode: "0755"
+
+- name: Copy extra nftables configuration files
+  ansible.builtin.copy:
+    src: "{{ item.src }}"
+    dest: /etc/nftables/{{ item.src }}
+    owner: root
+    group: root
+    mode: "0644"
+    force: "{{ item.force }}"
+  loop:
+    - { src: firehol_level1-ipv4.nft, force: false }
+  notify:
+    - Restart nftables
+    - Restart fail2ban
+
+- name: Copy nftables update scripts
+  ansible.builtin.template:
+    src: update-firehol-nftables.sh.j2
+    dest: /usr/local/bin/update-firehol-nftables.sh
+    mode: "0755"
+    owner: root
+    group: root
+
+- name: Remove deprecated data and scripts
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: absent
+  loop:
+    - /etc/nftables/spamhaus-ipv4.nft
+    - /etc/nftables/spamhaus-ipv6.nft
+    - /etc/nftables/abuseipdb-ipv4.nft
+    - /etc/nftables/abuseipdb-ipv6.nft
+    - /etc/nftables/abusech-ipv4.nft
+    - /usr/local/bin/update-abusech-nftables.sh
+    - /usr/local/bin/update-spamhaus-nftables.sh
+    - /etc/systemd/system/update-abusech-nftables.service
+    - /etc/systemd/system/update-abusech-nftables.timer
+    - /etc/systemd/system/update-spamhaus-nftables.service
+    - /etc/systemd/system/update-spamhaus-nftables.timer
+    - /usr/local/bin/aggregate-cidr-addresses.pl
+  notify:
+    - Restart nftables
+    - Restart fail2ban
+
+- name: Copy nftables systemd units
+  ansible.builtin.copy:
+    src: "{{ item }}"
+    dest: /etc/systemd/system/{{ item }}
+    mode: "0644"
+    owner: root
+    group: root
+  loop:
+    - update-firehol-nftables.service
+    - update-firehol-nftables.timer
+  register: nftables_systemd_units
+
+# need to reload to pick up service/timer/environment changes
+- name: Reload systemd daemon
+  when: nftables_systemd_units is changed
+  ansible.builtin.systemd_service: # noqa no-handler
+    daemon_reload: true
+
+- name: Start and enable nftables update timers
+  ansible.builtin.systemd_service:
+    name: "{{ item }}"
+    state: started
+    enabled: true
+  loop:
+    - update-firehol-nftables.timer
+
+- name: Start and enable nftables
+  ansible.builtin.systemd_service:
+    name: nftables
+    state: started
+    enabled: true
+
+# vim: set sw=2 ts=2:
--- a/roles/common/tasks/ntp.yml
+++ b/roles/common/tasks/ntp.yml
@@ -1,27 +1,40 @@
 ---
-# Hosts running Ubuntu 16.04+ and Debian 9+ use systemd init system and should
-# use systemd-timesyncd as a network time client instead of the standalone ntp
-# client.
+# Hosts running Debian 9+ use systemd init system and can use systemd-timesyncd
+# as a network time client instead of the standalone ntp client.

 - name: Set timezone
-  when: timezone is defined and ansible_service_mgr == 'systemd'
-  command: /usr/bin/timedatectl set-timezone {{ timezone }}
+  when:
+    - timezone is defined
+    - ansible_service_mgr == 'systemd'
+  community.general.timezone:
+    name: "{{ timezone }}"
  tags: timezone

 # Apparently some cloud images don't have this installed by default. From what
 # I can see on existing servers, systemd-timesyncd is a standalone package on
-# Ubuntu 20.04 and Debian 11.
+# Debian 11 and Debian 12.
 - name: Install systemd-timesyncd
-  when: (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '==')) or (ansible_distribution == 'Debian' and ansible_distribution_version
-    is version('11', '>='))
-  ansible.builtin.apt: name=systemd-timesyncd state=present cache_valid_time=3600
+  when: ansible_distribution_version is version('11', '>=')
+  ansible.builtin.apt:
+    name: systemd-timesyncd
+    state: present
+    cache_valid_time: 3600

 - name: Start and enable systemd's NTP client
  when: ansible_service_mgr == 'systemd'
-  ansible.builtin.systemd: name=systemd-timesyncd state=started enabled=true
+  ansible.builtin.systemd_service:
+    name: systemd-timesyncd
+    state: started
+    enabled: true

- name: Uninstall ntp on modern Ubuntu/Debian
-  ansible.builtin.apt: name=ntp state=absent
-  when: ansible_service_mgr == 'systemd'
+# On Debian 12 ntp doesn't conflict with systemd-timesyncd so we should try to
+# remove it to be sure.
+- name: Uninstall ntp on Debian 12
+  when:
+    - ansible_service_mgr == 'systemd'
+    - ansible_distribution_major_version is version('12', '==')
+  ansible.builtin.apt:
+    name: ntp
+    state: absent

 # vim: set ts=2 sw=2:
--- a/roles/common/tasks/packages_Debian.yml
+++ b/roles/common/tasks/packages_Debian.yml
@@ -1,19 +1,7 @@
 ---
 - name: Configure Debian packages
+  tags: packages
  block:
-    # Create directory for third-party package signing keys. Required on distros
-    # older than Debian 12 / Ubuntu 22.04.
-    #
-    # See: https://wiki.debian.org/DebianRepository/UseThirdParty
-    - name: Create /etc/apt/keyrings
-      file:
-        path: /etc/apt/keyrings
-        mode: "0755"
-        owner: root
-        group: root
-        state: directory
-      when: ansible_distribution_major_version is version('12', '<')
-
    # Scaleway seems to use a weird sources.list format as of Debian 12?
    - name: Check for weird Debian sources
      ansible.builtin.stat:
@@ -21,10 +9,15 @@
      register: weird_debian_sources_stat

    - name: Configure apt mirror
-      ansible.builtin.template: src=sources.list.j2 dest=/etc/apt/sources.list owner=root group=root mode=0644
      when:
        - ansible_architecture != 'armv7l'
        - not weird_debian_sources_stat
+      ansible.builtin.template:
+        src: sources.list.j2
+        dest: /etc/apt/sources.list
+        owner: root
+        group: root
+        mode: "0644"

    - name: Set fact for base packages
      ansible.builtin.set_fact:
@@ -35,7 +28,6 @@
          - iotop
          - htop
          - strace
-          - cron-apt
          - safe-rm
          - debian-goodies
          - mosh
@@ -47,16 +39,19 @@
          - zstd
          - rsync
          - lsof
+          - unattended-upgrades

    - name: Install base packages
-      ansible.builtin.apt: name={{ base_packages }} state=present cache_valid_time=3600
+      ansible.builtin.apt:
+        name: "{{ base_packages }}"
+        state: present
+        cache_valid_time: 3600

-    - name: Configure cron-apt
-      ansible.builtin.import_tasks: cron-apt.yml
+    - name: Remove cron-apt
      tags: cron-apt
+      ansible.builtin.import_tasks: cron-apt.yml

    - name: Install tarsnap
      ansible.builtin.import_tasks: tarsnap.yml
-  tags: packages

 # vim: set sw=2 ts=2:
--- a/roles/common/tasks/packages_Ubuntu.yml
+++ b/roles/common/tasks/packages_Ubuntu.yml
@@ -1,105 +0,0 @@
---
- name: Configure Ubuntu packages
-  block:
-    # Create directory for third-party package signing keys. Required on distros
-    # older than Debian 12 / Ubuntu 22.04.
-    #
-    # See: https://wiki.debian.org/DebianRepository/UseThirdParty
-    - name: Create /etc/apt/keyrings
-      file:
-        path: /etc/apt/keyrings
-        mode: "0755"
-        owner: root
-        group: root
-        state: directory
-      when: ansible_distribution_major_version is version('22.04', '<')
-
-    - name: Configure apt mirror
-      ansible.builtin.template: src=sources.list.j2 dest=/etc/apt/sources.list owner=root group=root mode=0644
-      when: ansible_architecture != 'armv7l'
-
-    - name: Upgrade base OS
-      ansible.builtin.apt: upgrade=dist cache_valid_time=3600
-
-    - name: Set Ubuntu base packages
-      ansible.builtin.set_fact:
-        ubuntu_base_packages:
-          - git
-          - git-lfs
-          - tmux
-          - iotop
-          - htop
-          - strace
-          - cron-apt
-          - safe-rm
-          - debian-goodies
-          - mosh
-          - python-pycurl # for ansible's apt_repository
-          - vim
-          - unzip
-          - apt-transport-https # for https support in apt
-          - zstd
-          - rsync
-          - lsof
-
-    - name: Install base packages
-      ansible.builtin.apt: pkg={{ ubuntu_base_packages }} state=present cache_valid_time=3600
-
-    # We have to remove snaps one by one in a specific order because some depend
-    # on others. Only after that can we remove the corresponding system packages.
-    - name: Remove lxd snap
-      community.general.snap: name=lxd state=absent
-      when: ansible_distribution_version is version('20.04', '==')
-      ignore_errors: true
-
-    - name: Remove core18 snap
-      community.general.snap: name=core18 state=absent
-      when: ansible_distribution_version is version('20.04', '==')
-      ignore_errors: true
-
-    - name: Remove snapd snap
-      community.general.snap: name=snapd state=absent
-      when: ansible_distribution_version is version('20.04', '==')
-      ignore_errors: true
-
-    - name: Set fact for packages to remove (Ubuntu 20.04)
-      ansible.builtin.set_fact:
-        ubuntu_annoying_packages:
-          - whoopsie # security (CIS 4.1)
-          - apport # security (CIS 4.1)
-          - command-not-found # annoying
-          - command-not-found-data # annoying
-          - python3-commandnotfound # annoying
-          - snapd # annoying (Ubuntu >= 16.04)
-          - lxd-agent-loader # annoying (Ubuntu 20.04)
-      when: ansible_distribution_version is version('20.04', '==')
-
-    - name: Remove packages
-      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
-      loop:
-        - /etc/update-motd.d/99-esm # Ubuntu 14.04
-        - /etc/update-motd.d/10-help-text # Ubuntu 14.04+
-        - /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: true
-
-    - name: Disable annoying Canonical spam in MOTD
-      ansible.builtin.systemd: name={{ item }} state=stopped enabled=no
-      when: ansible_service_mgr == 'systemd'
-      loop:
-        - motd-news.service
-        - motd-news.timer
-
-    - name: Configure cron-apt
-      ansible.builtin.import_tasks: cron-apt.yml
-      tags: cron-apt
-
-    - name: Install tarsnap
-      ansible.builtin.import_tasks: tarsnap.yml
-  tags: packages
-
-# vim: set sw=2 ts=2:
--- a/roles/common/tasks/ssh-keys.yml
+++ b/roles/common/tasks/ssh-keys.yml
@@ -1,6 +1,8 @@
 ---
 - name: Zero .ssh/authorized_keys for provisioning user
-  ansible.builtin.file: dest={{ provisioning_user.home }}/.ssh/authorized_keys state=absent
+  ansible.builtin.file:
+    dest: "{{ provisioning_user.home }}/.ssh/authorized_keys"
+    state: absent

 - name: Add public keys to authorized_keys
  ansible.posix.authorized_key: { user: "{{ provisioning_user.name }}", key: "{{ lookup('file', item) }}" }
--- a/roles/common/tasks/sshd.yml
+++ b/roles/common/tasks/sshd.yml
@@ -1,17 +1,26 @@
 ---
-# SSH configs don't change in Debian minor versions
+# Only override the system sshd configuration on older Debian.
 - name: Reconfigure /etc/ssh/sshd_config
-  ansible.builtin.template: src=sshd_config_{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.j2 dest=/etc/ssh/sshd_config owner=root group=root
-    mode=0600
-  when: ansible_distribution == 'Debian'
-  notify: reload sshd
+  when: ansible_distribution_version is version('12', '<=')
+  ansible.builtin.template:
+    src: "sshd_config_{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.j2"
+    dest: /etc/ssh/sshd_config
+    owner: root
+    group: root
+    mode: "0600"
+  notify: Reload sshd

-# Ubuntu is the only distro we have where SSH version is very different from 14.04 -> 14.10,
-# ie with new ciphers supported etc.
- name: Reconfigure /etc/ssh/sshd_config
-  ansible.builtin.template: src=sshd_config_{{ ansible_distribution }}-{{ ansible_distribution_version }}.j2 dest=/etc/ssh/sshd_config owner=root group=root mode=0600
-  when: ansible_distribution == 'Ubuntu'
-  notify: reload sshd
+# Newer OpenSSH versions support including extra configuration. The includes
+# happen at the beginning of the file and the first value to be read is used.
+- name: Configure sshd_config.d overrides
+  when: ansible_distribution_version is version('13', '>=')
+  ansible.builtin.template:
+    src: etc/ssh/sshd_config.d/01-{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.conf.j2
+    dest: /etc/ssh/sshd_config.d/01-custom.conf
+    owner: root
+    group: root
+    mode: "0600"
+  notify: Reload sshd

 # See: WeakDH (2015): https://weakdh.org/sysadmin.html
 - name: Remove small Diffie-Hellman SSH moduli
@@ -24,28 +33,30 @@
      register: check_unsafe_moduli

    - name: Extract safe Diffie-Hellman SSH moduli
+      when: check_unsafe_moduli.stdout | length > 0
      ansible.builtin.shell:
        cmd: awk '$5 >= 3071' moduli > moduli.safe
        chdir: /etc/ssh
        creates: moduli.safe
-      when: check_unsafe_moduli.stdout | length > 0
      register: extract_safe_moduli

    - name: Replace unsafe Diffie-Hellman SSH moduli
+      when: extract_safe_moduli is changed
      ansible.builtin.command:
        cmd: mv moduli.safe moduli
        chdir: /etc/ssh
      register: replace_small_moduli
-      when: extract_safe_moduli is changed
-      notify: reload sshd
+      notify: Reload sshd

 - name: Remove DSA and ECDSA host keys
-  ansible.builtin.file: name=/etc/ssh/{{ item }} state=absent
+  ansible.builtin.file:
+    name: "/etc/ssh/{{ item }}"
+    state: absent
  loop:
    - ssh_host_dsa_key
    - ssh_host_dsa_key.pub
    - ssh_host_ecdsa_key
    - ssh_host_ecdsa_key.pub
-  notify: reload sshd
+  notify: Reload sshd

 # vim: set sw=2 ts=2:
--- a/roles/common/tasks/tarsnap.yml
+++ b/roles/common/tasks/tarsnap.yml
@@ -5,6 +5,7 @@
  register: tarsnap_signing_key_stat

 - name: Download tarsnap apt signing key
+  when: not tarsnap_signing_key_stat.stat.exists
  ansible.builtin.get_url:
    url: https://pkg.tarsnap.com/tarsnap-deb-packaging-key.asc
    dest: /etc/apt/keyrings/tarsnap-deb-packaging-key.asc
@@ -12,9 +13,9 @@
    group: root
    mode: "0644"
  register: download_tarsnap_signing_key
-  when: not tarsnap_signing_key_stat.stat.exists

 - name: Add tarsnap.org repo
+  when: ansible_architecture != 'armv7l'
  ansible.builtin.template:
    src: tarsnap_sources.list.j2
    dest: /etc/apt/sources.list.d/tarsnap.list
@@ -22,12 +23,11 @@
    group: root
    mode: "0644"
  register: add_tarsnap_apt_repository
-  when: ansible_architecture != 'armv7l'

 - name: Update apt cache
+  when: (download_tarsnap_signing_key.status_code is defined and download_tarsnap_signing_key.status_code == 200) or add_tarsnap_apt_repository is changed
  ansible.builtin.apt: # noqa no-handler
    update_cache: true
-  when: (download_tarsnap_signing_key.status_code is defined and download_tarsnap_signing_key.status_code == 200) or add_tarsnap_apt_repository is changed

 - name: Install tarsnap
  ansible.builtin.apt:
--- a/roles/common/templates/etc/ssh/sshd_config.d/01-Debian-13.conf.j2
+++ b/roles/common/templates/etc/ssh/sshd_config.d/01-Debian-13.conf.j2
@@ -0,0 +1,40 @@
+{{ ansible_managed | comment }}
+
+HostKey /etc/ssh/ssh_host_ed25519_key
+
+# LogLevel VERBOSE logs user's key fingerprint on login. Needed to have a clear
+# audit track of which key was using to log in.
+LogLevel VERBOSE
+
+MaxAuthTries 4
+
+AuthorizedKeysFile	.ssh/authorized_keys
+
+# To disable tunneled clear text passwords, change to no here!
+{% if ssh_password_authentication == 'disabled' %}
+PasswordAuthentication no
+{% else %}
+PasswordAuthentication yes
+{% endif %}
+
+X11Forwarding no
+
+# Based on the ssh-audit profile for Debian 13, but with but with all algos with
+# less than 256 bits removed, as NSA's Suite B removed them years ago and the
+# new (2018) CNSA suite is 256 bits and up.
+#
+# See: ssh-audit.py -P "Hardened Debian 13 (version 1)"
+# See: https://en.wikipedia.org/wiki/Commercial_National_Security_Algorithm_Suite
+Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes256-ctr
+MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com
+KexAlgorithms mlkem768x25519-sha256,sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com
+
+{% if ssh_allowed_users is defined and ssh_allowed_users %}
+AllowUsers {{ ssh_allowed_users|join(" ") }} {{ provisioning_user.name }}
+{% endif %}
+
+PerSourcePenaltyExemptList {{ fail2ban_ignoreip | replace(" ", ",") }}
+
+# Mask to use for IPv4 and IPv6 respectively when applying network penalties.
+# The default is 32:128.
+PerSourceNetBlockSize 24:56
--- a/roles/common/templates/etc/systemd/system/fail2ban.service.d/override.conf.j2
+++ b/roles/common/templates/etc/systemd/system/fail2ban.service.d/override.conf.j2
@@ -1,15 +1,19 @@
+[Unit]
+# If nftables is stopped or restarted, propagate to fail2ban as well
+PartOf=nftables.service
+
 [Service]
 PrivateDevices=yes
 PrivateTmp=yes
 ProtectHome=read-only
-{% if (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version is version('18','>=')) or (ansible_distribution == 'Debian' and ansible_distribution_major_version is version('11','>=')) %}
+{% if ansible_distribution_version is version('11','>=') %}
 ProtectSystem=strict
 {% else %}
 {# Older systemd versions don't have ProtectSystem=strict #}
 ProtectSystem=full
 {% endif %}
 NoNewPrivileges=yes
-{% if (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version is version('18','>=')) or (ansible_distribution == 'Debian' and ansible_distribution_major_version is version('11','>=')) %}
+{% if ansible_distribution_version is version('11','>=') %}
 ReadWritePaths=-/var/run/fail2ban
 ReadWritePaths=-/var/lib/fail2ban
 ReadWritePaths=-/var/log/fail2ban.log
--- a/roles/common/templates/nftables.conf.j2
+++ b/roles/common/templates/nftables.conf.j2
@@ -5,47 +5,18 @@

 flush ruleset

-# Lists updated daily by update-spamhaus-nftables.sh
-include "/etc/nftables/spamhaus-ipv4.nft"
-include "/etc/nftables/spamhaus-ipv6.nft"
-
-# Lists updated monthly (manually)
-include "/etc/nftables/abuseipdb-ipv4.nft"
-include "/etc/nftables/abuseipdb-ipv6.nft"
-
-# Lists updated daily by update-abusech-nftables.sh
-include "/etc/nftables/abusech-ipv4.nft"
+# List updated daily by update-firehol-nftables.sh
+include "/etc/nftables/firehol_level1-ipv4.nft"

 # Notes:
 #   - tables hold chains, chains hold rules
 #   - inet is for both ipv4 and ipv6
 table inet filter {
-    set spamhaus-ipv4 {
+    set firehol_level1-ipv4 {
        type ipv4_addr
        # if the set contains prefixes we need to use the interval flag
        flags interval
-        elements = $SPAMHAUS_IPV4
-    }
-
-    set spamhaus-ipv6 {
-        type ipv6_addr
-        flags interval
-        elements = $SPAMHAUS_IPV6
-    }
-
-    set abusech-ipv4 {
-        type ipv4_addr
-        elements = $ABUSECH_IPV4
-    }
-
-    set abuseipdb-ipv4 {
-        type ipv4_addr
-        elements = $ABUSEIPDB_IPV4
-    }
-
-    set abuseipdb-ipv6 {
-        type ipv6_addr
-        elements = $ABUSEIPDB_IPV6
+        elements = $FIREHOL_LEVEL1_IPV4
    }

    chain input {
@@ -55,13 +26,7 @@ table inet filter {

        ct state invalid counter drop comment "Early drop of invalid connections"

-        ip saddr @spamhaus-ipv4 counter drop comment "Early drop of incoming packets matching spamhaus-ipv4 list"
-        ip6 saddr @spamhaus-ipv6 counter drop comment "Early drop of incoming packets matching spamhaus-ipv6 list"
-
-        ip saddr @abusech-ipv4 counter drop comment "Early drop of packets matching abusech-ipv4 list"
-
-        ip saddr @abuseipdb-ipv4 counter drop comment "Early drop of incoming packets matching abuseipdb-ipv4 list"
-        ip6 saddr @abuseipdb-ipv6 counter drop comment "Early drop of incoming packets matching abuseipdb-ipv6 list"
+        ip saddr @firehol_level1-ipv4 counter drop comment "Early drop of incoming packets matching firehol_level1-ipv4 list"

        iifname lo accept comment "Allow from loopback"

@@ -105,12 +70,6 @@ table inet filter {
    chain output {
        type filter hook output priority 0;

-        ip daddr @spamhaus-ipv4 counter drop comment "Drop outgoing packets matching spamhaus-ipv4 list"
-        ip6 daddr @spamhaus-ipv6 counter drop comment "Drop outgoing packets matching spamhaus-ipv6 list"
-
-        ip daddr @abusech-ipv4 counter drop comment "Drop outgoing packets matching abusech-ipv4 list"
-
-        ip daddr @abuseipdb-ipv4 counter drop comment "Drop outgoing packets matching abuseipdb-ipv4 list"
-        ip6 daddr @abuseipdb-ipv6 counter drop comment "Drop outgoing packets matching abuseipdb-ipv6 list"
+        ip daddr @firehol_level1-ipv4 counter drop comment "Drop outgoing packets matching firehol_level1-ipv4 list"
    }
 }
--- a/roles/common/templates/security.sources.list.j2
+++ b/roles/common/templates/security.sources.list.j2
@@ -1,5 +0,0 @@
-{% if ansible_distribution == 'Ubuntu' %}
-deb http://security.ubuntu.com/ubuntu {{ ansible_distribution_release }}-security main restricted universe multiverse
-{% elif ansible_distribution == 'Debian' %}
-deb http://security.debian.org/debian-security {{ ansible_distribution_release }}/updates main contrib non-free
-{% endif %}
--- a/roles/common/templates/sources.list.j2
+++ b/roles/common/templates/sources.list.j2
@@ -1,16 +1,6 @@
-{% if ansible_distribution == 'Ubuntu' %}
-{% set apt_mirror    = apt_mirror | default("ubuntu.mirror.ac.ke") %}
-
-deb http://{{ apt_mirror }}/ubuntu/ {{ ansible_distribution_release }} main restricted universe multiverse
-deb http://{{ apt_mirror }}/ubuntu/ {{ ansible_distribution_release }}-updates main restricted universe multiverse
-deb http://security.ubuntu.com/ubuntu/ {{ ansible_distribution_release }}-security main restricted universe multiverse
-
-{% else %}
 {% set apt_mirror    = apt_mirror | default('deb.debian.org') %}
 deb http://{{ apt_mirror }}/debian/ {{ ansible_distribution_release }} main contrib non-free

 deb http://security.debian.org/debian-security {{ ansible_distribution_release }}-security main contrib non-free

 deb http://{{ apt_mirror }}/debian/ {{ ansible_distribution_release }}-updates main contrib non-free
-
-{% endif %} {# ansible_distribution #}
--- a/roles/common/templates/sshd_config_Ubuntu-20.04.j2
+++ b/roles/common/templates/sshd_config_Ubuntu-20.04.j2
@@ -1,143 +0,0 @@
-#	$OpenBSD: sshd_config,v 1.103 2018/04/09 20:41:22 tj Exp $
-
-# This is the sshd server system-wide configuration file.  See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented.  Uncommented options override the
-# default value.
-
-Include /etc/ssh/sshd_config.d/*.conf
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-#HostKey /etc/ssh/ssh_host_rsa_key
-HostKey /etc/ssh/ssh_host_ed25519_key
-
-# Ciphers and keying
-#RekeyLimit default none
-
-# Logging
-#SyslogFacility AUTH
-# LogLevel VERBOSE logs user's key fingerprint on login. Needed to have a clear audit track of which key was using to log in.
-LogLevel VERBOSE
-
-# Authentication:
-
-#LoginGraceTime 2m
-PermitRootLogin prohibit-password
-#StrictModes yes
-MaxAuthTries 4
-#MaxSessions 10
-
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile	.ssh/authorized_keys
-
-#AuthorizedPrincipalsFile none
-
-#AuthorizedKeysCommand none
-#AuthorizedKeysCommandUser nobody
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# To disable tunneled clear text passwords, change to no here!
-{% if ssh_password_authentication == 'disabled' %}
-PasswordAuthentication no
-{% else %}
-PasswordAuthentication yes
-{% endif %}
-#PermitEmptyPasswords no
-
-# Change to yes to enable challenge-response passwords (beware issues with
-# some PAM modules and threads)
-ChallengeResponseAuthentication no
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-#GSSAPIStrictAcceptorCheck yes
-#GSSAPIKeyExchange no
-
-# Set this to 'yes' to enable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the ChallengeResponseAuthentication and
-# PasswordAuthentication.  Depending on your PAM configuration,
-# PAM authentication via ChallengeResponseAuthentication may bypass
-# the setting of "PermitRootLogin without-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and ChallengeResponseAuthentication to 'no'.
-UsePAM yes
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PermitTTY yes
-PrintMotd no
-#PrintLastLog yes
-#TCPKeepAlive yes
-#PermitUserEnvironment no
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS no
-#PidFile /var/run/sshd.pid
-#MaxStartups 10:30:100
-#PermitTunnel no
-#ChrootDirectory none
-#VersionAddendum none
-
-# no default banner path
-#Banner none
-
-# Allow client to pass locale environment variables
-AcceptEnv LANG LC_*
-
-# override default of no subsystems
-Subsystem sftp	/usr/lib/openssh/sftp-server
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-#	X11Forwarding no
-#	AllowTcpForwarding no
-#	PermitTTY no
-#	ForceCommand cvs server
-
-# Originally from: https://stribika.github.io/2015/01/04/secure-secure-shell.html
-# ... but with ciphers and MACs with < 256 bits removed, as NSA's Suite B now
-# does away with these! See: https://www.nsa.gov/ia/programs/suiteb_cryptography/index.shtml
-Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes256-ctr
-MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com
-KexAlgorithms curve25519-sha256,curve25519-sha256@libssh.org,diffie-hellman-group-exchange-sha256,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,diffie-hellman-group14-sha256
-
-{% if ssh_allowed_users is defined and ssh_allowed_users %}
-# Is there a list of allowed users?
-# Is it populated? (An empty list is 'None', which evaluates as False in Python)
-# merge the items of a list into one string using a space as a separator
-# http://jinja.pocoo.org/docs/dev/templates/#join
-AllowUsers {{ ssh_allowed_users|join(" ") }} {{ provisioning_user.name }}
-{% endif %}
--- a/roles/common/templates/sysctl_Ubuntu.j2
+++ b/roles/common/templates/sysctl_Ubuntu.j2
@@ -1,100 +0,0 @@
-#
-# /etc/sysctl.conf - Configuration file for setting system variables
-# See /etc/sysctl.d/ for additional system variables
-# See sysctl.conf (5) for information.
-#
-
-#kernel.domainname = example.com
-
-# Uncomment the following to stop low-level messages on console
-#kernel.printk = 3 4 1 3
-
-##############################################################3
-# Functions previously found in netbase
-#
-
-# Uncomment the next two lines to enable Spoof protection (reverse-path filter)
-# Turn on Source Address Verification in all interfaces to
-# prevent some spoofing attacks
-#net.ipv4.conf.default.rp_filter=1
-#net.ipv4.conf.all.rp_filter=1
-
-# Uncomment the next line to enable TCP/IP SYN cookies
-# See http://lwn.net/Articles/277146/
-# Note: This may impact IPv6 TCP sessions too
-#net.ipv4.tcp_syncookies=1
-
-# Uncomment the next line to enable packet forwarding for IPv4
-#net.ipv4.ip_forward=1
-
-# Uncomment the next line to enable packet forwarding for IPv6
-#  Enabling this option disables Stateless Address Autoconfiguration
-#  based on Router Advertisements for this host
-#net.ipv6.conf.all.forwarding=1
-
-
-###################################################################
-# Additional settings - these settings can improve the network
-# security of the host and prevent against some network attacks
-# including spoofing attacks and man in the middle attacks through
-# redirection. Some network environments, however, require that these
-# settings are disabled so review and enable them as needed.
-#
-# Do not accept ICMP redirects (prevent MITM attacks)
-#net.ipv4.conf.all.accept_redirects = 0
-#net.ipv6.conf.all.accept_redirects = 0
-# _or_
-# Accept ICMP redirects only for gateways listed in our default
-# gateway list (enabled by default)
-# net.ipv4.conf.all.secure_redirects = 1
-#
-# Do not send ICMP redirects (we are not a router)
-#net.ipv4.conf.all.send_redirects = 0
-#
-# Do not accept IP source route packets (we are not a router)
-#net.ipv4.conf.all.accept_source_route = 0
-#net.ipv6.conf.all.accept_source_route = 0
-#
-# Log Martian Packets
-#net.ipv4.conf.all.log_martians = 1
-#
-
-# CIS Benchmark Adjustments
-# See: https://github.com/alanorth/securekickstarts
-kernel.randomize_va_space = 2 
-net.ipv4.ip_forward = 0 
-net.ipv4.conf.all.send_redirects = 0 
-net.ipv4.conf.default.send_redirects = 0 
-net.ipv4.conf.all.accept_source_route = 0 
-net.ipv4.conf.default.accept_source_route = 0 
-net.ipv4.conf.all.accept_redirects = 0 
-net.ipv4.conf.default.accept_redirects = 0 
-net.ipv4.conf.all.secure_redirects = 0 
-net.ipv4.conf.default.secure_redirects = 0 
-net.ipv4.conf.all.log_martians = 1 
-net.ipv4.conf.default.log_martians = 1 
-net.ipv4.icmp_echo_ignore_broadcasts = 1 
-net.ipv4.icmp_ignore_bogus_error_responses = 1 
-net.ipv4.conf.all.rp_filter = 1 
-net.ipv4.conf.default.rp_filter = 1 
-net.ipv4.tcp_syncookies = 1
-
-# TCP stuff
-# See: http://fasterdata.es.net/host-tuning/linux/
-# increase TCP max buffer size settable using setsockopt()
-net.core.rmem_max = 16777216 
-net.core.wmem_max = 16777216 
-# increase Linux autotuning TCP buffer limit 
-net.ipv4.tcp_rmem = 4096 87380 16777216
-net.ipv4.tcp_wmem = 4096 65536 16777216
-# increase the length of the processor input queue
-net.core.netdev_max_backlog = 30000
-# recommended for hosts with jumbo frames enabled
-#net.ipv4.tcp_mtu_probing=1
-
-# increase quadruplets (src ip, src port, dest ip, dest port)
-# see: http://vincent.bernat.im/en/blog/2014-tcp-time-wait-state-linux.html
-net.ipv4.ip_local_port_range = 10240 65535
-# recommended for web servers, especially if running SPDY
-# see: http://www.chromium.org/spdy/spdy-best-practices
-net.ipv4.tcp_slow_start_after_idle = 0
--- a/roles/common/templates/tarsnap_sources.list.j2
+++ b/roles/common/templates/tarsnap_sources.list.j2
@@ -1 +1 @@
-deb [arch=amd64] https://pkg.tarsnap.com/deb/{{ ansible_distribution_release }} ./
+deb [arch=amd64 signed-by=/etc/apt/keyrings/tarsnap-deb-packaging-key.asc] https://pkg.tarsnap.com/deb/{{ ansible_distribution_release }} ./
--- a/roles/common/templates/update-firehol-nftables.sh.j2
+++ b/roles/common/templates/update-firehol-nftables.sh.j2
@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+#
+# update-firehol-nftables.sh v0.0.1
+#
+# Download FireHOL lists and load them into nftables sets.
+# 
+# See: https://iplists.firehol.org/
+#
+# Copyright (C) 2025 Alan Orth
+#
+# SPDX-License-Identifier: GPL-3.0-only
+
+# Exit on first error
+set -o errexit
+
+firehol_level1_ipv4_set_path=/etc/nftables/firehol_level1-ipv4.nft
+
+function download() {
+    echo "Downloading $1"
+    wget -q -O - "https://iplists.firehol.org/files/$1" > "$1"
+}
+
+download firehol_level1.netset
+
+if [[ -f "firehol_level1.netset" ]]; then
+    echo "Processing FireHOL Level 1 list"
+
+    firehol_level1_ipv4_list_temp=$(mktemp)
+    firehol_level1_ipv4_set_temp=$(mktemp)
+
+    # Filter blank lines, comments, and bogons we use inside the LAN, DMZ, and
+    # for local services like systemd-resolved and others on localhost. Ideally
+    # these are blocked already at the WAN side by network administrators.
+    cat firehol_level1.netset \
+        | sed \
+            -e '/^$/d' \
+            -e '/^#.*/d' \
+            -e '/^127\.0\.0\.0\/8/d' \
+        > "$firehol_level1_ipv4_list_temp"
+
+    echo "Building firehol_level1-ipv4 set"
+    cat << NFT_HEAD > "$firehol_level1_ipv4_set_temp"
+#!/usr/sbin/nft -f
+
+define FIREHOL_LEVEL1_IPV4 = {
+NFT_HEAD
+
+    while read -r network; do
+        # nftables doesn't mind if the last element in the set has a trailing
+        # comma so we don't need to do anything special here.
+        echo "$network," >> "$firehol_level1_ipv4_set_temp"
+    done < $firehol_level1_ipv4_list_temp
+
+    echo "}" >> "$firehol_level1_ipv4_set_temp"
+
+    install -m 0600 "$firehol_level1_ipv4_set_temp" "$firehol_level1_ipv4_set_path"
+
+    rm -f "$firehol_level1_ipv4_list_temp" "$firehol_level1_ipv4_set_temp"
+fi
+
+echo "Restarting nftables"
+
+/usr/bin/systemctl restart nftables.service
+
+rm -v firehol_level1.netset
--- a/roles/mariadb/handlers/main.yml
+++ b/roles/mariadb/handlers/main.yml
@@ -1,5 +1,7 @@
 ---
 - name: restart mariadb
-  ansible.builtin.systemd: name=mariadb state=restarted
+  ansible.builtin.systemd_service:
+    name: mariadb
+    state: restarted

 # vim: set ts=2 sw=2:
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@@ -16,6 +16,7 @@
    - mariadb

 - name: Download MariaDB package signing key
+  when: not mariadb_signing_key_stat.stat.exists
  ansible.builtin.get_url:
    url: https://mariadb.org/mariadb_release_signing_key.asc
    dest: /etc/apt/keyrings/mariadb_release_signing_key.asc
@@ -23,14 +24,13 @@
    group: root
    mode: "0644"
  register: download_mariadb_signing_key
-  when: not mariadb_signing_key_stat.stat.exists
  tags:
    - packages
    - mariadb

- name: Add MariaDB 10.6 repo
+- name: Add MariaDB 10.11 repo
  ansible.builtin.apt_repository:
-    repo: deb [arch=amd64 signed-by=/etc/apt/keyrings/mariadb_release_signing_key.asc] https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/debian {{ ansible_distribution_release
+    repo: deb [arch=amd64 signed-by=/etc/apt/keyrings/mariadb_release_signing_key.asc] https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian {{ ansible_distribution_release
      }} main
    filename: mariadb
    state: present
@@ -40,9 +40,9 @@
    - mariadb

 - name: Update apt cache
+  when: (download_mariadb_signing_key.status_code is defined and download_mariadb_signing_key.status_code == 200) or add_mariadb_apt_repository is changed
  ansible.builtin.apt: # noqa no-handler
    update_cache: true
-  when: (download_mariadb_signing_key.status_code is defined and download_mariadb_signing_key.status_code == 200) or add_mariadb_apt_repository is changed
  tags:
    - packages
    - mariadb
@@ -87,16 +87,17 @@

 # See: https://docs.ansible.com/ansible/latest/collections/community/mysql/mysql_db_module.html
 - name: Create MariaDB database(s)
+  when: mariadb_databases is defined
  community.mysql.mysql_db:
    db: "{{ item.name }}"
    state: present
    encoding: utf8mb4
    login_unix_socket: "{{ mariadb_login_unix_socket }}"
  loop: "{{ mariadb_databases }}"
-  when: mariadb_databases is defined
  tags: mariadb

 - name: Create MariaDB user(s)
+  when: mariadb_databases is defined
  community.mysql.mysql_user:
    name: "{{ item.user }}"
    password: "{{ item.pass }}"
@@ -105,7 +106,6 @@
    state: present
    login_unix_socket: "{{ mariadb_login_unix_socket }}"
  loop: "{{ mariadb_databases }}"
-  when: mariadb_databases is defined
  tags: mariadb

 # vim: set ts=2 sw=2:
--- a/roles/munin/handlers/main.yml
+++ b/roles/munin/handlers/main.yml
@@ -1,4 +1,4 @@
 ---
 # ansible.builtin.file: roles/munin/handlers/main.yml
 - name: restart munin-node
-  ansible.builtin.systemd: name=munin-node state=restarted
+  ansible.builtin.systemd_service: name=munin-node state=restarted
--- a/roles/munin/tasks/munin-node.yml
+++ b/roles/munin/tasks/munin-node.yml
@@ -1,16 +1,22 @@
 ---
 - name: Install munin-node
-  ansible.builtin.apt: name=munin-node state=present
+  ansible.builtin.apt:
+    name: munin-node
+    state: present
  tags: packages

 # some nice things to have for munin-node on Ubuntu
 # libwww-perl: for munin's nginx_status check
 - name: Install munin-node deps
-  ansible.builtin.apt: name=libwww-perl state=present
+  ansible.builtin.apt:
+    name: libwww-perl
+    state: present
  tags: packages

 - name: Create munin-node.conf
-  ansible.builtin.template: src=munin-node.conf.j2 dest=/etc/munin/munin-node.conf
+  ansible.builtin.template:
+    src: munin-node.conf.j2
+    dest: /etc/munin/munin-node.conf
  notify:
    - restart munin-node

@@ -20,6 +26,9 @@
    - restart munin-node

 - name: Start munin-node
-  ansible.builtin.systemd: name=munin-node state=started enabled=true
+  ansible.builtin.systemd_service:
+    name: munin-node
+    state: started
+    enabled: true

 # vim: set ts=2 sw=2:
--- a/roles/munin/tasks/munin.yml
+++ b/roles/munin/tasks/munin.yml
@@ -1,9 +1,16 @@
 ---
 - name: Install munin package
-  ansible.builtin.apt: name=munin state=present
+  ansible.builtin.apt:
+    name: munin
+    state: present
  tags: packages

 - name: Create munin configuration file
-  ansible.builtin.template: src=munin.conf.j2 dest=/etc/munin/munin.conf owner=root group=root mode=0644
+  ansible.builtin.template:
+    src: munin.conf.j2
+    dest: /etc/munin/munin.conf
+    owner: root
+    group: root
+    mode: "0644"

 # vim: set ts=2 sw=2:
--- a/roles/nginx/defaults/main.yml
+++ b/roles/nginx/defaults/main.yml
@@ -5,16 +5,16 @@
 nginx_confd_path: /etc/nginx/conf.d

 # parent directory of vhost roots
-nginx_root_prefix: /var/www
+nginx_root_prefix: "{{ web_root_prefix }}"

-# 1 hour timeout
-nginx_ssl_session_timeout: 1h
+# 1 day timeout
+nginx_ssl_session_timeout: 1d
 # 10MB -> 40,000 sessions
 nginx_ssl_session_cache: shared:SSL:10m
-# 1400 bytes to fit in one MTU (default is 16k!)
-nginx_ssl_buffer_size: 1400
+nginx_ssl_buffer_size: 4k
 nginx_ssl_dhparam: /etc/ssl/certs/dhparam.pem
 nginx_ssl_protocols: TLSv1.2 TLSv1.3
+nginx_ssl_ecdh_curve: X25519:prime256v1:secp384r1

 # DNS resolvers for OCSP stapling (default to Cloudflare public DNS)
 # See: https://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_stapling
@@ -37,8 +37,8 @@ letsencrypt_root: /etc/ssl
 letsencrypt_acme_script_temp: /root/acme.sh
 letsencrypt_acme_home: /root/.acme.sh

-# stable is 1.20.x
-# mainline is 1.21.x
+# stable is 1.26.x
+# mainline is 1.27.x
 nginx_version: mainline

 # vim: set ts=2 sw=2:
--- a/roles/nginx/handlers/main.yml
+++ b/roles/nginx/handlers/main.yml
@@ -1,5 +1,7 @@
 ---
- name: reload nginx
-  ansible.builtin.systemd: name=nginx state=reloaded
+- name: Reload nginx
+  ansible.builtin.systemd_service:
+    name: nginx
+    state: reloaded

 # vim: set ts=2 sw=2:
--- a/roles/nginx/tasks/letsencrypt.yml
+++ b/roles/nginx/tasks/letsencrypt.yml
@@ -1,7 +1,12 @@
 ---
 # Use acme.sh instead of certbot because they only support installation via
 # snap now.
- block:
+- name: Install and configure Let's Encrypt
+  tags: letsencrypt
+  when:
+    - ansible_distribution == 'Debian'
+    - ansible_distribution_version is version('11', '>='))
+  block:
    - name: Remove certbot
      ansible.builtin.apt:
        name: certbot
@@ -21,31 +26,31 @@
      register: acme_home

    - name: Download acme.sh
+      when: not acme_home.stat.exists
      ansible.builtin.get_url:
        url: https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh
        dest: "{{ letsencrypt_acme_script_temp }}"
        mode: "0700"
      register: acme_download
-      when: not acme_home.stat.exists

    # Run the "install" for acme.sh so it creates the .acme.sh dir (currently I
    # have to chdir to the /root directory where the script exists or else it
    # fails. Ansible runs it, but the script can't find itself...).
    - name: Install acme.sh
+      when: acme_download is changed
      ansible.builtin.command:
        cmd: "{{ letsencrypt_acme_script_temp }} --install --no-profile --no-cron"
        creates: "{{ letsencrypt_acme_home }}/acme.sh"
        chdir: /root
      register: acme_install
-      when: acme_download is changed

    - name: Remove temporary acme.sh script
-      ansible.builtin.file:
-        dest: "{{ letsencrypt_acme_script_temp }}"
-        state: absent
      when:
        - acme_install.rc is defined
        - acme_install.rc == 0
+      ansible.builtin.file:
+        dest: "{{ letsencrypt_acme_script_temp }}"
+        state: absent

    - name: Set default certificate authority for acme.sh
      ansible.builtin.command:
@@ -77,14 +82,10 @@

    # always issues daemon-reload just in case the service/timer changed
    - name: Start and enable systemd timer to renew Let's Encrypt certs
-      ansible.builtin.systemd:
+      ansible.builtin.systemd_service:
        name: renew-letsencrypt.timer
        state: started
        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', '>='))
-  tags: letsencrypt
-
 # vim: set ts=2 sw=2:
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -7,14 +7,6 @@
    - packages
    - nginx

- name: Check nginx apt signing key
-  ansible.builtin.stat:
-    path: /usr/share/keyrings/nginx_signing.key
-  register: nginx_signing_key_stat
-  tags:
-    - packages
-    - nginx
-
 - name: Download nginx apt signing key
  ansible.builtin.get_url:
    url: https://nginx.org/keys/nginx_signing.key
@@ -22,8 +14,8 @@
    owner: root
    group: root
    mode: "0644"
+    checksum: sha256:55385da31d198fa6a5012d40ae98ecb272a6c4e8fffffba94719ffd3e87de37a
  register: download_nginx_signing_key
-  when: not nginx_signing_key_stat.stat.exists
  tags:
    - packages
    - nginx
@@ -41,9 +33,9 @@
    - packages

 - name: Update apt cache
+  when: (download_nginx_signing_key.status_code is defined and download_nginx_signing_key.status_code == 200) or add_nginx_apt_repository is changed
  ansible.builtin.apt: # noqa no-handler
    update_cache: true
-  when: (download_nginx_signing_key.status_code is defined and download_nginx_signing_key.status_code == 200) or add_nginx_apt_repository is changed

 - name: Install nginx
  ansible.builtin.apt:
@@ -62,7 +54,7 @@
    owner: root
    group: root
  notify:
-    - reload nginx
+    - Reload nginx
  tags: nginx

 - name: Copy extra nginx configs
@@ -76,7 +68,7 @@
    - extra-security.conf
    - fastcgi_cache
  notify:
-    - reload nginx
+    - Reload nginx
  tags: nginx

 - name: Remove default nginx vhost
@@ -95,13 +87,13 @@
  tags: nginx

 - name: Configure nginx virtual hosts
-  ansible.builtin.include_tasks: vhosts.yml
  when: nginx_vhosts is defined
+  ansible.builtin.include_tasks: vhosts.yml
  tags: nginx

 - name: Configure WordPress
-  ansible.builtin.include_tasks: wordpress.yml
  when: nginx_vhosts is defined
+  ansible.builtin.include_tasks: wordpress.yml
  tags: wordpress

 - name: Configure blank nginx vhost
@@ -112,7 +104,7 @@
    owner: root
    group: root
  notify:
-    - reload nginx
+    - Reload nginx
  tags: nginx

 - name: Configure munin vhost
@@ -123,11 +115,11 @@
    owner: root
    group: root
  notify:
-    - reload nginx
+    - Reload nginx
  tags: nginx

 - name: Start and enable nginx service
-  ansible.builtin.systemd:
+  ansible.builtin.systemd_service:
    name: nginx
    state: started
    enabled: true
--- a/roles/nginx/tasks/vhosts.yml
+++ b/roles/nginx/tasks/vhosts.yml
@@ -1,16 +1,23 @@
 ---
- block:
 - name: Configure https vhosts
-      ansible.builtin.template: src=vhost.conf.j2 dest={{ nginx_confd_path }}/{{ item.domain_name }}.conf mode=0644 owner=root group=root
+  tags: nginx
+  block:
+    - name: Configure https vhosts
+      ansible.builtin.template:
+        src: vhost.conf.j2
+        dest: "{{ nginx_confd_path }}/{{ item.domain_name }}.conf"
+        mode: "0644"
+        owner: root
+        group: root
      loop: "{{ nginx_vhosts }}"
      notify:
-        - reload nginx
+        - Reload nginx

    - name: Generate self-signed TLS cert
      ansible.builtin.command: openssl req -x509 -nodes -sha256 -days 365 -subj "/C=SO/ST=SO/L=snakeoil/O=snakeoil/CN=snakeoil" -newkey rsa:2048 -keyout /etc/ssl/private/nginx-snakeoil.key
        -out /etc/ssl/certs/nginx-snakeoil.crt -extensions v3_ca creates=/etc/ssl/certs/nginx-snakeoil.crt
      notify:
-        - reload nginx
+        - Reload nginx

    - name: Download 4096-bit RFC 7919 dhparams
      ansible.builtin.get_url:
@@ -18,12 +25,16 @@
        checksum: sha256:64852d6890ff9e62eecd1ee89c72af9af244dfef5b853bcedea3dfd7aade22b3
        dest: "{{ nginx_ssl_dhparam }}"
      notify:
-        - reload nginx
+        - Reload nginx

    # TODO: this could break because we can override the document root in host vars
    - name: Create vhost document roots
-      ansible.builtin.file: path={{ nginx_root_prefix }}/{{ item.domain_name }} state=directory mode=0755 owner=nginx group=nginx
+      ansible.builtin.file:
+        path: "{{ nginx_root_prefix }}/{{ item.domain_name }}"
+        state: directory
+        mode: "0755"
+        owner: nginx
+        group: nginx
      loop: "{{ nginx_vhosts }}"
-  tags: nginx

 # vim: set ts=2 sw=2:
--- a/roles/nginx/tasks/wordpress.yml
+++ b/roles/nginx/tasks/wordpress.yml
@@ -1,19 +1,29 @@
 ---
- block:
+- name: Install and configure WordPress
+  tags: wordpress
+  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=true
      when:
        - item.has_wordpress is defined
        - item.has_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: true
      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=true
      when:
        - item.has_wordpress is defined
        - item.has_wordpress
+      ansible.builtin.file:
+        path: "{{ nginx_root_prefix }}/{{ item.domain_name }}"
+        state: directory
+        owner: nginx
+        group: nginx
+        recurse: true
      loop: "{{ nginx_vhosts }}"
-  tags: wordpress

 # vim: set ts=2 sw=2:
--- a/roles/nginx/templates/blank-vhost.conf.j2
+++ b/roles/nginx/templates/blank-vhost.conf.j2
@@ -11,9 +11,11 @@ server {

    return 444;
 }
+
 server {
-    listen 443 ssl http2 default_server;
-    listen [::]:443 ssl http2 default_server;
+    listen 443 ssl default_server;
+    listen [::]:443 ssl default_server;
+    http2 on;
    server_name _;

    # self-signed "snakeoil" certificate
--- a/roles/nginx/templates/https.j2
+++ b/roles/nginx/templates/https.j2
@@ -27,8 +27,9 @@

    ssl_dhparam {{ nginx_ssl_dhparam }};
    ssl_protocols {{ nginx_ssl_protocols }};
+    ssl_ecdh_curve {{ nginx_ssl_ecdh_curve }};
    ssl_ciphers "{{ tls_cipher_suite }}";
-    ssl_prefer_server_ciphers on;
+    ssl_prefer_server_ciphers off;

    {# OSCP stapling only works with real certs #}
    {% if use_letsencrypt == true or item.tls_certificate_path %}
@@ -38,15 +39,6 @@
    resolver {{ nginx_ssl_stapling_resolver }};
    {% endif %} {# end: use_letsencrypt #}

-    # nginx does not auto-rotate session ticket keys: only a HUP / restart will do so and
-    # when a restart is performed the previous key is lost, which resets all previous
-    # sessions. The fix for this is to setup a manual rotation mechanism:
-    # http://trac.nginx.org/nginx/changeset/1356a3b9692441e163b4e78be4e9f5a46c7479e9/nginx
-    #
-    # Note that you'll have to define and rotate the keys securely by yourself. In absence
-    # of such infrastructure, consider turning off session tickets:
-    ssl_session_tickets off;
-
    {% 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
--- a/roles/nginx/templates/nginx_org_sources.list.j2
+++ b/roles/nginx/templates/nginx_org_sources.list.j2
@@ -1,19 +1,7 @@
 {{ ansible_managed | comment }}

-{% if ansible_distribution == 'Ubuntu' %}
-
-{% if nginx_version == "stable" %}
-deb [arch=amd64 signed-by=/usr/share/keyrings/nginx_signing.key] https://nginx.org/packages/ubuntu/ {{ ansible_distribution_release }} nginx
-{% elif nginx_version == "mainline" %}
-deb [arch=amd64 signed-by=/usr/share/keyrings/nginx_signing.key] https://nginx.org/packages/mainline/ubuntu/ {{ ansible_distribution_release }} nginx
-{% endif %}
-
-{% elif ansible_distribution == 'Debian' %}
-
 {% if nginx_version == "stable" %}
 deb [arch=amd64 signed-by=/usr/share/keyrings/nginx_signing.key] https://nginx.org/packages/debian/ {{ ansible_distribution_release }} nginx
 {% elif nginx_version == "mainline" %}
 deb [arch=amd64 signed-by=/usr/share/keyrings/nginx_signing.key] https://nginx.org/packages/mainline/debian/ {{ ansible_distribution_release }} nginx
 {% endif %}
-
-{% endif %}
--- a/roles/nginx/templates/vhost.conf.j2
+++ b/roles/nginx/templates/vhost.conf.j2
@@ -8,6 +8,12 @@
 {% set has_wordpress  = item.has_wordpress | default(false) %}
 {% set needs_php      = item.needs_php | default(false) %}
 {% set has_gitea      = item.has_gitea | default(false) %}
+{# Allow sites to override the document root #}
+{% if item.document_root is defined %}
+{%   set document_root = item.document_root %}
+{% else %}
+{%   set document_root = (nginx_root_prefix, domain_name) | ansible.builtin.path_join %}
+{% endif %}

 # http -> https vhost
 server {
@@ -26,15 +32,11 @@ server {
 }

 server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+    listen 443 ssl;
+    listen [::]:443 ssl;
+    http2 on;

-    {# Allow sites to override the nginx document root #}
-    {% if item.document_root is defined %}
-    root {{ item.document_root }};
-    {% else %}
-    root {{ nginx_root_prefix }}/{{ domain_name }};
-    {% endif %}
+    root {{ document_root }};

    {# will only work if the TLS cert covers the domain + aliases, like example.com and www.example.com #}
    server_name {{ domain_name }} {{ domain_aliases }};
@@ -75,10 +77,8 @@ server {
        # See: https://httpoxy.org/
        fastcgi_param HTTP_PROXY "";

-        {% if (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '==')) or (ansible_distribution == 'Debian' and ansible_distribution_major_version is version('11', '==')) %}
-        fastcgi_pass unix:/run/php/php7.4-fpm-{{ domain_name }}.sock;
-        {% else %}
-        fastcgi_pass unix:/var/run/php5-fpm-{{ domain_name }}.sock;
+        {% if ansible_distribution_major_version is version('12', '==') %}
+        fastcgi_pass unix:/run/php/php8.2-fpm-{{ domain_name }}.sock;
        {% endif %}
        fastcgi_index index.php;
        # set script path relative to document root in server block
--- a/roles/php-fpm/handlers/main.yml
+++ b/roles/php-fpm/handlers/main.yml
@@ -1,12 +0,0 @@
---
-# For Ubuntu 20.04 and Debian 11
- name: reload php7.4-fpm
-  ansible.builtin.systemd: name=php7.4-fpm state=reloaded
-
-# For Debian 12
- name: reload php8.2-fpm
-  ansible.builtin.systemd:
-    name: php8.2-fpm
-    state: reloaded
-
-# vim: set ts=2 sw=2:
--- a/roles/php-fpm/tasks/Ubuntu_20.04.yml
+++ b/roles/php-fpm/tasks/Ubuntu_20.04.yml
@@ -1,35 +0,0 @@
---
- block:
-    - name: Set php-fpm packages
-      ansible.builtin.set_fact:
-        php_fpm_packages:
-          - php7.4-fpm
-          # for WordPress
-          - php7.4-mysql
-          - php7.4-gd
-          - php7.4-curl
-          - php7.4-xml
-
-    - name: Install php-fpm and deps
-      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
-      ansible.builtin.template: src=php7.4-pool.conf.j2 dest=/etc/php/7.4/fpm/pool.d/{{ item.domain_name }}.conf owner=root group=root mode=0644
-      loop: "{{ nginx_vhosts }}"
-      when: (item.has_wordpress is defined and item.has_wordpress) or (item.needs_php is defined and item.needs_php)
-      notify: reload php7.4-fpm
-
-    - name: Remove default www pool
-      ansible.builtin.file: path=/etc/php/7.4/fpm/pool.d/www.conf state=absent
-      notify: reload php7.4-fpm
-
-    # re-configure php.ini
-    - name: Update php.ini
-      ansible.builtin.template: src=php7.4-php.ini.j2 dest=/etc/php/7.4/fpm/php.ini owner=root group=root mode=0644
-      notify: reload php7.4-fpm
-
-  tags: php-fpm
-  when: install_php
-
-# vim: set ts=2 sw=2:
--- a/roles/php-fpm/templates/php7.4-php.ini.j2
+++ b/roles/php-fpm/templates/php7.4-php.ini.j2
--- a/roles/php-fpm/templates/php7.4-pool.conf.j2
+++ b/roles/php-fpm/templates/php7.4-pool.conf.j2
@@ -1,436 +0,0 @@
-{% set domain_name  = item.domain_name %}
-
-; Start a new pool named '{{ domain_name }}'.
-; the variable $pool can be used in any directive and will be replaced by the
-; pool name ('{{ domain_name }}' here)
-[{{ domain_name }}]
-
-; Per pool prefix
-; It only applies on the following directives:
-; - 'access.log'
-; - 'slowlog'
-; - 'listen' (unixsocket)
-; - 'chroot'
-; - 'chdir'
-; - 'php_values'
-; - 'php_admin_values'
-; When not set, the global prefix (or /usr) applies instead.
-; Note: This directive can also be relative to the global prefix.
-; Default Value: none
-;prefix = /path/to/pools/$pool
-
-; Unix user/group of processes
-; Note: The user is mandatory. If the group is not set, the default user's group
-;       will be used.
-user = nginx
-group = nginx
-
-; The address on which to accept FastCGI requests.
-; Valid syntaxes are:
-;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
-;                            a specific port;
-;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
-;                            a specific port;
-;   'port'                 - to listen on a TCP socket to all addresses
-;                            (IPv6 and IPv4-mapped) on a specific port;
-;   '/path/to/unix/socket' - to listen on a unix socket.
-; Note: This value is mandatory.
-listen = /run/php/php7.4-fpm-{{ domain_name }}.sock
-
-; Set listen(2) backlog.
-; Default Value: 511 (-1 on FreeBSD and OpenBSD)
-;listen.backlog = 511
-
-; Set permissions for unix socket, if one is used. In Linux, read/write
-; permissions must be set in order to allow connections from a web server. Many
-; BSD-derived systems allow connections regardless of permissions.
-; Default Values: user and group are set as the running user
-;                 mode is set to 0660
-listen.owner = nginx
-listen.group = nginx
-;listen.mode = 0660
-; When POSIX Access Control Lists are supported you can set them using
-; these options, value is a comma separated list of user/group names.
-; When set, listen.owner and listen.group are ignored
-;listen.acl_users =
-;listen.acl_groups =
-
-; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
-; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
-; must be separated by a comma. If this value is left blank, connections will be
-; accepted from any ip address.
-; Default Value: any
-;listen.allowed_clients = 127.0.0.1
-
-; Specify the nice(2) priority to apply to the pool processes (only if set)
-; The value can vary from -19 (highest priority) to 20 (lower priority)
-; Note: - It will only work if the FPM master process is launched as root
-;       - The pool processes will inherit the master process priority
-;         unless it specified otherwise
-; Default Value: no set
-; process.priority = -19
-
-; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
-; or group is differrent than the master process user. It allows to create process
-; core dump and ptrace the process for the pool user.
-; Default Value: no
-; process.dumpable = yes
-
-; Choose how the process manager will control the number of child processes.
-; Possible Values:
-;   static  - a fixed number (pm.max_children) of child processes;
-;   dynamic - the number of child processes are set dynamically based on the
-;             following directives. With this process management, there will be
-;             always at least 1 children.
-;             pm.max_children      - the maximum number of children that can
-;                                    be alive at the same time.
-;             pm.start_servers     - the number of children created on startup.
-;             pm.min_spare_servers - the minimum number of children in 'idle'
-;                                    state (waiting to process). If the number
-;                                    of 'idle' processes is less than this
-;                                    number then some children will be created.
-;             pm.max_spare_servers - the maximum number of children in 'idle'
-;                                    state (waiting to process). If the number
-;                                    of 'idle' processes is greater than this
-;                                    number then some children will be killed.
-;  ondemand - no children are created at startup. Children will be forked when
-;             new requests will connect. The following parameter are used:
-;             pm.max_children           - the maximum number of children that
-;                                         can be alive at the same time.
-;             pm.process_idle_timeout   - The number of seconds after which
-;                                         an idle process will be killed.
-; Note: This value is mandatory.
-pm = dynamic
-
-; The number of child processes to be created when pm is set to 'static' and the
-; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
-; This value sets the limit on the number of simultaneous requests that will be
-; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
-; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
-; CGI. The below defaults are based on a server without much resources. Don't
-; forget to tweak pm.* to fit your needs.
-; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
-; Note: This value is mandatory.
-pm.max_children = 5
-
-; The number of child processes created on startup.
-; Note: Used only when pm is set to 'dynamic'
-; Default Value: (min_spare_servers + max_spare_servers) / 2
-pm.start_servers = 2
-
-; The desired minimum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.min_spare_servers = 1
-
-; The desired maximum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.max_spare_servers = 3
-
-; The number of seconds after which an idle process will be killed.
-; Note: Used only when pm is set to 'ondemand'
-; Default Value: 10s
-;pm.process_idle_timeout = 10s;
-
-; The number of requests each child process should execute before respawning.
-; This can be useful to work around memory leaks in 3rd party libraries. For
-; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
-; Default Value: 0
-;pm.max_requests = 500
-
-; The URI to view the FPM status page. If this value is not set, no URI will be
-; recognized as a status page. It shows the following informations:
-;   pool                 - the name of the pool;
-;   process manager      - static, dynamic or ondemand;
-;   start time           - the date and time FPM has started;
-;   start since          - number of seconds since FPM has started;
-;   accepted conn        - the number of request accepted by the pool;
-;   listen queue         - the number of request in the queue of pending
-;                          connections (see backlog in listen(2));
-;   max listen queue     - the maximum number of requests in the queue
-;                          of pending connections since FPM has started;
-;   listen queue len     - the size of the socket queue of pending connections;
-;   idle processes       - the number of idle processes;
-;   active processes     - the number of active processes;
-;   total processes      - the number of idle + active processes;
-;   max active processes - the maximum number of active processes since FPM
-;                          has started;
-;   max children reached - number of times, the process limit has been reached,
-;                          when pm tries to start more children (works only for
-;                          pm 'dynamic' and 'ondemand');
-; Value are updated in real time.
-; Example output:
-;   pool:                 www
-;   process manager:      static
-;   start time:           01/Jul/2011:17:53:49 +0200
-;   start since:          62636
-;   accepted conn:        190460
-;   listen queue:         0
-;   max listen queue:     1
-;   listen queue len:     42
-;   idle processes:       4
-;   active processes:     11
-;   total processes:      15
-;   max active processes: 12
-;   max children reached: 0
-;
-; By default the status page output is formatted as text/plain. Passing either
-; 'html', 'xml' or 'json' in the query string will return the corresponding
-; output syntax. Example:
-;   http://www.foo.bar/status
-;   http://www.foo.bar/status?json
-;   http://www.foo.bar/status?html
-;   http://www.foo.bar/status?xml
-;
-; By default the status page only outputs short status. Passing 'full' in the
-; query string will also return status for each pool process.
-; Example:
-;   http://www.foo.bar/status?full
-;   http://www.foo.bar/status?json&full
-;   http://www.foo.bar/status?html&full
-;   http://www.foo.bar/status?xml&full
-; The Full status returns for each process:
-;   pid                  - the PID of the process;
-;   state                - the state of the process (Idle, Running, ...);
-;   start time           - the date and time the process has started;
-;   start since          - the number of seconds since the process has started;
-;   requests             - the number of requests the process has served;
-;   request duration     - the duration in µs of the requests;
-;   request method       - the request method (GET, POST, ...);
-;   request URI          - the request URI with the query string;
-;   content length       - the content length of the request (only with POST);
-;   user                 - the user (PHP_AUTH_USER) (or '-' if not set);
-;   script               - the main script called (or '-' if not set);
-;   last request cpu     - the %cpu the last request consumed
-;                          it's always 0 if the process is not in Idle state
-;                          because CPU calculation is done when the request
-;                          processing has terminated;
-;   last request memory  - the max amount of memory the last request consumed
-;                          it's always 0 if the process is not in Idle state
-;                          because memory calculation is done when the request
-;                          processing has terminated;
-; If the process is in Idle state, then informations are related to the
-; last request the process has served. Otherwise informations are related to
-; the current request being served.
-; Example output:
-;   ************************
-;   pid:                  31330
-;   state:                Running
-;   start time:           01/Jul/2011:17:53:49 +0200
-;   start since:          63087
-;   requests:             12808
-;   request duration:     1250261
-;   request method:       GET
-;   request URI:          /test_mem.php?N=10000
-;   content length:       0
-;   user:                 -
-;   script:               /home/fat/web/docs/php/test_mem.php
-;   last request cpu:     0.00
-;   last request memory:  0
-;
-; Note: There is a real-time FPM status monitoring sample web page available
-;       It's available in: /usr/share/php/7.4/fpm/status.html
-;
-; Note: The value must start with a leading slash (/). The value can be
-;       anything, but it may not be a good idea to use the .php extension or it
-;       may conflict with a real PHP file.
-; Default Value: not set
-;pm.status_path = /status
-
-; The ping URI to call the monitoring page of FPM. If this value is not set, no
-; URI will be recognized as a ping page. This could be used to test from outside
-; that FPM is alive and responding, or to
-; - create a graph of FPM availability (rrd or such);
-; - remove a server from a group if it is not responding (load balancing);
-; - trigger alerts for the operating team (24/7).
-; Note: The value must start with a leading slash (/). The value can be
-;       anything, but it may not be a good idea to use the .php extension or it
-;       may conflict with a real PHP file.
-; Default Value: not set
-;ping.path = /ping
-
-; This directive may be used to customize the response of a ping request. The
-; response is formatted as text/plain with a 200 response code.
-; Default Value: pong
-;ping.response = pong
-
-; The access log file
-; Default: not set
-;access.log = log/$pool.access.log
-
-; The access log format.
-; The following syntax is allowed
-;  %%: the '%' character
-;  %C: %CPU used by the request
-;      it can accept the following format:
-;      - %{user}C for user CPU only
-;      - %{system}C for system CPU only
-;      - %{total}C  for user + system CPU (default)
-;  %d: time taken to serve the request
-;      it can accept the following format:
-;      - %{seconds}d (default)
-;      - %{miliseconds}d
-;      - %{mili}d
-;      - %{microseconds}d
-;      - %{micro}d
-;  %e: an environment variable (same as $_ENV or $_SERVER)
-;      it must be associated with embraces to specify the name of the env
-;      variable. Some exemples:
-;      - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
-;      - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
-;  %f: script filename
-;  %l: content-length of the request (for POST request only)
-;  %m: request method
-;  %M: peak of memory allocated by PHP
-;      it can accept the following format:
-;      - %{bytes}M (default)
-;      - %{kilobytes}M
-;      - %{kilo}M
-;      - %{megabytes}M
-;      - %{mega}M
-;  %n: pool name
-;  %o: output header
-;      it must be associated with embraces to specify the name of the header:
-;      - %{Content-Type}o
-;      - %{X-Powered-By}o
-;      - %{Transfert-Encoding}o
-;      - ....
-;  %p: PID of the child that serviced the request
-;  %P: PID of the parent of the child that serviced the request
-;  %q: the query string
-;  %Q: the '?' character if query string exists
-;  %r: the request URI (without the query string, see %q and %Q)
-;  %R: remote IP address
-;  %s: status (response code)
-;  %t: server time the request was received
-;      it can accept a strftime(3) format:
-;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
-;  %T: time the log has been written (the request has finished)
-;      it can accept a strftime(3) format:
-;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
-;  %u: remote user
-;
-; Default: "%R - %u %t \"%m %r\" %s"
-;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
-
-; The log file for slow requests
-; Default Value: not set
-; Note: slowlog is mandatory if request_slowlog_timeout is set
-;slowlog = log/$pool.log.slow
-
-; The timeout for serving a single request after which a PHP backtrace will be
-; dumped to the 'slowlog' file. A value of '0s' means 'off'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-;request_slowlog_timeout = 0
-
-; Depth of slow log stack trace.
-; Default Value: 20
-;request_slowlog_trace_depth = 20
-
-; The timeout for serving a single request after which the worker process will
-; be killed. This option should be used when the 'max_execution_time' ini option
-; does not stop script execution for some reason. A value of '0' means 'off'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-;request_terminate_timeout = 0
-
-; The timeout set by 'request_terminate_timeout' ini option is not engaged after
-; application calls 'fastcgi_finish_request' or when application has finished and
-; shutdown functions are being called (registered via register_shutdown_function).
-; This option will enable timeout limit to be applied unconditionally
-; even in such cases.
-; Default Value: no
-;request_terminate_timeout_track_finished = no
-
-; Set open file descriptor rlimit.
-; Default Value: system defined value
-;rlimit_files = 1024
-
-; Set max core size rlimit.
-; Possible Values: 'unlimited' or an integer greater or equal to 0
-; Default Value: system defined value
-;rlimit_core = 0
-
-; Chroot to this directory at the start. This value must be defined as an
-; absolute path. When this value is not set, chroot is not used.
-; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
-; of its subdirectories. If the pool prefix is not set, the global prefix
-; will be used instead.
-; Note: chrooting is a great security feature and should be used whenever
-;       possible. However, all PHP paths will be relative to the chroot
-;       (error_log, sessions.save_path, ...).
-; Default Value: not set
-;chroot =
-
-; Chdir to this directory at the start.
-; Note: relative path can be used.
-; Default Value: current directory or / when chroot
-;chdir = /var/www
-
-; Redirect worker stdout and stderr into main error log. If not set, stdout and
-; stderr will be redirected to /dev/null according to FastCGI specs.
-; Note: on highloaded environement, this can cause some delay in the page
-; process time (several ms).
-; Default Value: no
-;catch_workers_output = yes
-
-; Decorate worker output with prefix and suffix containing information about
-; the child that writes to the log and if stdout or stderr is used as well as
-; log level and time. This options is used only if catch_workers_output is yes.
-; Settings to "no" will output data as written to the stdout or stderr.
-; Default value: yes
-;decorate_workers_output = no
-
-; Clear environment in FPM workers
-; Prevents arbitrary environment variables from reaching FPM worker processes
-; by clearing the environment in workers before env vars specified in this
-; pool configuration are added.
-; Setting to "no" will make all environment variables available to PHP code
-; via getenv(), $_ENV and $_SERVER.
-; Default Value: yes
-;clear_env = no
-
-; Limits the extensions of the main script FPM will allow to parse. This can
-; prevent configuration mistakes on the web server side. You should only limit
-; FPM to .php extensions to prevent malicious users to use other extensions to
-; execute php code.
-; Note: set an empty value to allow all extensions.
-; Default Value: .php
-;security.limit_extensions = .php .php3 .php4 .php5 .php7
-
-; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
-; the current environment.
-; Default Value: clean env
-;env[HOSTNAME] = $HOSTNAME
-;env[PATH] = /usr/local/bin:/usr/bin:/bin
-;env[TMP] = /tmp
-;env[TMPDIR] = /tmp
-;env[TEMP] = /tmp
-
-; Additional php.ini defines, specific to this pool of workers. These settings
-; overwrite the values previously defined in the php.ini. The directives are the
-; same as the PHP SAPI:
-;   php_value/php_flag             - you can set classic ini defines which can
-;                                    be overwritten from PHP call 'ini_set'.
-;   php_admin_value/php_admin_flag - these directives won't be overwritten by
-;                                     PHP call 'ini_set'
-; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
-
-; Defining 'extension' will load the corresponding shared extension from
-; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
-; overwrite previously defined php.ini values, but will append the new value
-; instead.
-
-; Note: path INI options can be relative and will be expanded with the prefix
-; (pool, global or /usr)
-
-; Default Value: nothing is defined by default except the values in php.ini and
-;                specified at startup with the -d argument
-;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
-;php_flag[display_errors] = off
-;php_admin_value[error_log] = /var/log/fpm-php.www.log
-;php_admin_flag[log_errors] = on
-;php_admin_value[memory_limit] = 32M
--- a/roles/php_fpm/defaults/main.yml
+++ b/roles/php_fpm/defaults/main.yml
--- a/roles/php_fpm/handlers/main.yml
+++ b/roles/php_fpm/handlers/main.yml
@@ -0,0 +1,8 @@
+---
+# For Debian 12
+- name: Reload php8.2-fpm
+  ansible.builtin.systemd_service:
+    name: php8.2-fpm
+    state: reloaded
+
+# vim: set ts=2 sw=2:
--- a/roles/php_fpm/tasks/Debian_12.yml
+++ b/roles/php_fpm/tasks/Debian_12.yml
@@ -1,5 +1,8 @@
 ---
- block:
+- name: Install and configure php-fpm
+  tags: php-fpm
+  when: install_php
+  block:
    - name: Set php-fpm packages
      ansible.builtin.set_fact:
        php_fpm_packages:
@@ -26,13 +29,13 @@
        mode: "0644"
      loop: "{{ nginx_vhosts }}"
      when: (item.has_wordpress is defined and item.has_wordpress) or (item.needs_php is defined and item.needs_php)
-      notify: reload php8.2-fpm
+      notify: Reload php8.2-fpm

    - name: Remove default www pool
      ansible.builtin.file:
        path: /etc/php/8.2/fpm/pool.d/www.conf
        state: absent
-      notify: reload php8.2-fpm
+      notify: Reload php8.2-fpm

    # re-configure php.ini
    - name: Update php.ini
@@ -42,9 +45,6 @@
        owner: root
        group: root
        mode: "0644"
-      notify: reload php8.2-fpm
-
-  tags: php-fpm
-  when: install_php
+      notify: Reload php8.2-fpm

 # vim: set ts=2 sw=2:
--- a/roles/php_fpm/tasks/main.yml
+++ b/roles/php_fpm/tasks/main.yml
@@ -1,6 +1,4 @@
 ---
-# Ubuntu 20.04 uses PHP 7.4
-# Debian 11 uses PHP 7.4
 # Debian 12 uses PHP 8.2

 # If any of the vhosts on this host need WordPress then we need to install PHP.
@@ -26,22 +24,6 @@
    install_php: false
  when: install_php is not defined

- name: Configure php-fpm on Ubuntu 20.04
-  ansible.builtin.include_tasks: Ubuntu_20.04.yml
-  when:
-    - ansible_distribution == 'Ubuntu'
-    - ansible_distribution_version is version('20.04', '==')
-    - install_php
-  tags: php-fpm
-
- name: Configure php-fpm on Debian 11
-  ansible.builtin.include_tasks: Ubuntu_20.04.yml
-  when:
-    - ansible_distribution == 'Debian'
-    - ansible_distribution_major_version is version('11', '==')
-    - install_php
-  tags: php-fpm
-
 - name: Configure php-fpm on Debian 12
  ansible.builtin.include_tasks: Debian_12.yml
  when:
--- a/roles/php_fpm/templates/php8.2-php.ini.j2
+++ b/roles/php_fpm/templates/php8.2-php.ini.j2
--- a/roles/php_fpm/templates/php8.2-pool.conf.j2
+++ b/roles/php_fpm/templates/php8.2-pool.conf.j2
@@ -27,8 +27,8 @@
 ;       --allow-to-run-as-root option to work.
 ; Default Values: The user is set to master process running user by default.
 ;                 If the group is not set, the user's group is used.
-user = www-data
-group = www-data
+user = {{ webserver }}
+group = {{ webserver }}

 ; The address on which to accept FastCGI requests.
 ; Valid syntaxes are:
@@ -52,8 +52,8 @@ listen = /run/php/php8.2-fpm-{{ domain_name }}.sock
 ; and group can be specified either by name or by their numeric IDs.
 ; Default Values: Owner is set to the master process running user. If the group
 ;                 is not set, the owner's group is used. Mode is set to 0660.
-listen.owner = www-data
-listen.group = www-data
+listen.owner = {{ webserver }}
+listen.group = {{ webserver }}
 ;listen.mode = 0660

 ; When POSIX Access Control Lists are supported you can set them using
@@ -342,14 +342,10 @@ pm.max_spare_servers = 3
 ;  %s: status (response code)
 ;  %t: server time the request was received
 ;      it can accept a strftime(3) format:
-;      %d/%b/%Y:%H:%M:%S %z (default)
 ;      The strftime(3) format must be encapsulated in a %{<strftime_format>}t tag
-;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
 ;  %T: time the log has been written (the request has finished)
 ;      it can accept a strftime(3) format:
-;      %d/%b/%Y:%H:%M:%S %z (default)
 ;      The strftime(3) format must be encapsulated in a %{<strftime_format>}t tag
-;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
 ;  %u: remote user
 ;
 ; Default: "%R - %u %t \"%m %r\" %s"
--- a/vars/Ubuntu.yml
+++ b/vars/Ubuntu.yml
@@ -1,10 +0,0 @@
---
-
-# sshd service name is `ssh` on Debian/Ubuntu, but it's
-# `sshd` on CentOS
-sshd_service_name: ssh
-
-# provisioning user vars
-provisioning_user: { name: 'provisioning', home: '/home/provisioning' }
-
-# vim: set ts=2 sw=2:
--- a/web.yml
+++ b/web.yml
@@ -9,7 +9,7 @@
    - { role: mariadb, when: mariadb_databases is defined}
    - { role: nginx, when: webserver is defined and webserver == 'nginx' }
    - { role: caddy, when: webserver is defined and webserver == 'caddy' }
-    - php-fpm
+    - php_fpm
    - munin
  vars_files:
    - vars/ipsets.yml
Author	SHA1	Message	Date
Alan Orth	d51f8fefaa	roles/common: minor configuration of Debian 13 SSH Tweak some of the new OpenSSH per-source penalty settings on Debian 13. For now only adjusting the source network masks and reusing the list of IPs to exempt from fail2ban. These being built in makes them easier to use, but I think I will end up sticking with fail2ban for the heavy lifting because it per- sists across restarts of the daemon, whereas OpenSSH's doesn't. I will monitor OpenSSH on Debian 13 to see how to best use it along side fail2ban.	2025-09-23 10:33:24 +03:00
Alan Orth	9ff6e19135	roles/common: use 127.0.0.0/8 for fail2ban ignoreip We can re-use our fail2ban ignoreip setting for Debian 13's OpenSSH PerSourcePenaltyExemptList, but OpenSSH is more strict with regards to masks not being applied to the host portion. I had never noticed that fail2ban's default was applying the mask on the host portion!	2025-09-23 10:33:23 +03:00
Alan Orth	4680999680	roles/common: sshd overrides for Debian 13	2025-09-23 10:33:23 +03:00
Alan Orth	602734acce	roles: update ansible.builtin.systemd builtin Use ansible.builtin.systemd_service instead.	2025-09-23 10:33:11 +03:00
Alan Orth	0db7911b70	roles/common: remove sudoers.d We are not using this.	2025-09-21 23:09:40 +03:00
Alan Orth	ee4c62e5f9	roles: remove tests for Debian We only run on Debian now.	2025-09-21 22:20:31 +03:00
Alan Orth	a315db8a7c	roles/common: use ansible_distribution_version In most cases it is enough to use the full version (ie 12.12) since we use Ansible's version comparison function. We rarely need to use the major version (ie 12) directly.	2025-09-21 22:19:00 +03:00
Alan Orth	5f00892df3	roles/common: adjust when in tasks	2025-09-21 22:04:25 +03:00
Alan Orth	9357265d27	roles/common: use ansible.builtin.apt module	2025-09-21 22:00:39 +03:00
Alan Orth	dd62266340	roles/common: update comment in ntp task	2025-09-21 21:58:11 +03:00
Alan Orth	a1bec20824	roles/common: simplify when logic in ntp task	2025-09-21 21:57:34 +03:00
Alan Orth	8e91c44529	roles/common: fix syntax error in npt when	2025-09-21 21:56:15 +03:00
Alan Orth	02d4135c79	roles/common: adjust ntp task On Debian 12 we need to explicitly remove ntp because it does not conflict with other time daemons.	2025-09-21 21:55:09 +03:00
Alan Orth	37e148d009	Re-work ansible_managed This is no longer a configuration setting. Now we must set it like any other template variabled.	2025-09-21 21:15:12 +03:00
Alan Orth	73dbbd23b6	roles/common: adjust handlers Should start with an upper case letter.	2025-09-21 20:22:58 +03:00
Alan Orth	b84283aa38	roles/common: remove unneeded firewall packages We don't need curl or libnet-ip-perl anymore.	2025-09-21 20:15:11 +03:00
Alan Orth	1695fdf8d1	roles/common: syntax in firewall play	2025-09-21 20:11:46 +03:00
Alan Orth	9f1f7b1c69	roles/nginx: more syntax fixes to tasks	2025-09-21 20:08:51 +03:00
Alan Orth	7d725f2084	roles/nginx: adjust task syntax Tasks should start with an upper case letter and we should not use free form syntax anymore.	2025-09-21 20:04:53 +03:00
Alan Orth	4c39b0d48c	roles/php_fpm: adjust task syntax All tasks need names, and we can use name, tags, when, block order for task keys. Suggested by ansible-lint.	2025-09-21 20:02:46 +03:00
Alan Orth	f4023d0b20	roles/php_fpm: rename handler Suggested by ansible-lint.	2025-09-21 19:59:23 +03:00
Alan Orth	6aaface4a2	Rename roles/php-fpm to roles/php_fpm Suggested by ansible-lint.	2025-09-21 19:56:20 +03:00
Alan Orth	333e1cbeb9	roles/mariadb/handlers/main.yml: update syntax	2025-09-21 17:32:57 +03:00
Alan Orth	0c62f4bdf0	roles/common/tasks/packages.yml: improve task key order Suggested by ansible-lint. Makes it easier to see the tags after the very long block.	2025-09-21 17:30:54 +03:00
Alan Orth	26f22c0447	roles/munin: update task syntax	2025-09-21 17:29:22 +03:00
Alan Orth	05881e2585	roles: fix unquoted octal modes	2025-09-21 17:25:22 +03:00
Alan Orth	d4d326c2f7	roles/common: use FQCN in handler	2025-09-21 17:09:45 +03:00
Alan Orth	1d4a6f208b	roles/common: update default fail2ban ignores	2025-09-21 17:06:48 +03:00
Alan Orth	8b22076d4a	roles/common: json spacing	2025-09-21 17:06:01 +03:00
Alan Orth	38176cb34c	roles/nginx: update task syntax for plays	2025-09-21 16:59:08 +03:00
Alan Orth	da737b71f7	roles/mariadb: update task syntax for mariadb play	2025-09-21 16:54:19 +03:00
Alan Orth	c28189a1a5	roles/common: update task syntax for fail2ban play	2025-09-21 16:54:03 +03:00
Alan Orth	b600141e89	roles/common: update task syntax for sshd play	2025-09-21 16:51:23 +03:00
Alan Orth	4be98d1a33	roles/common: update task syntax for ssh-keys play	2025-09-21 16:49:32 +03:00
Alan Orth	2bb018a40c	roles/common: rename firewall and packages task files Don't use firewall_Debian.yml or packages_Debian.yml since I am not deploying Ubuntu anymore there is no need to distinguish.	2025-09-21 16:45:51 +03:00
Alan Orth	89a1e11b7a	roles/common: update task syntax in main play	2025-09-21 16:40:37 +03:00
Alan Orth	0c0cad9084	Remove Ubuntu logic For a few years now I have only been deploying Debian for personal use.	2025-09-21 16:34:57 +03:00
Alan Orth	9dce701a19	roles/common: update task syntax in packages play	2025-09-21 16:23:10 +03:00
Alan Orth	3e9ee44d5b	roles/common: update task syntax in ntp play	2025-09-21 16:18:32 +03:00
Alan Orth	599b5e5e83	Pipfile.lock: run pipenv update	2025-09-21 15:57:28 +03:00
Alan Orth	bc700ea532	Pipfile.lock: pipenv update	2025-08-17 10:28:23 +03:00
Alan Orth	8016701b57	host_vars/web22: WordPress 6.8.2	2025-08-17 10:26:43 +03:00
Alan Orth	00558c7dea	roles/common: re-work fail2ban and nftables Re-work the fail2ban and nftables interaction. Use systemd's PartOf to indicate that fail2ban is part of the nftables service, which tells systemd to propogate stop/start signals to it. Then we tell the firehol update script to restart nftables instead of reload. The different between restart and reload is meaningless for nftables but we want systemd to propagate the stop/start signals to fail2ban.	2025-07-08 10:39:17 +03:00
Alan Orth	c927186837	roles/common: adjust update-firehol-nftables.service This service does not actually depend on nftables, at least not in the systemd sense of dependency. Furthermore, this hard dependency was causing the service to fail when it restarts nftables at the end, which causes systemd to start it again and again until it hits a restarting too quickly error.	2025-07-08 10:37:39 +03:00
Alan Orth	690774c862	host_vars/web22: WordPress 6.8.1	2025-07-08 10:34:34 +03:00
Alan Orth	cc021bd14a	Pipfile.lock: run pipenv update	2025-07-08 10:25:09 +03:00
Alan Orth	73fd06fe3a	roles/common: remove cron-apt Use unattended-upgrades instead. It has sane defaults on Debian at least (I haven't checked Ubuntu).	2025-04-07 09:51:09 +03:00
Alan Orth	88cb3a370e	Remove logic for Ubuntu 20.04 and Debian 11	2025-03-29 23:09:44 +03:00
Alan Orth	027a43ddbe	roles/caddy: use default for encode	2025-03-29 22:49:30 +03:00
Alan Orth	bb30c3be20	host_vars/web22: update vhosts	2025-03-29 22:48:19 +03:00
Alan Orth	d8d9790d21	roles/nginx: enable nginx ssl_session_tickets This has apparently been supported since nginx 1.23.2 and is safe to use the default (on) now. See: https://github.com/mozilla/server-side-tls/issues/284	2025-03-29 22:35:56 +03:00
Alan Orth	9a500ebc0d	roles/nginx: disable nginx ssl_prefer_server_ciphers This is apparently the default and recommended by Mozilla's server- side SSL configurator also recommends. This lets the client choose the ciphers best for them (and the ciphers in TLS 1.2 and 1.3 are not currently known to be dangerous).	2025-03-29 22:34:41 +03:00
Alan Orth	4bae942585	roles/nginx: add nginx ssl_ecdh_curve This seems to be new since I last looked at the Mozilla server-side SSL configurator.	2025-03-29 22:34:37 +03:00
Alan Orth	99866c0c90	roles/nginx: use one day for nginx ssl_session_timeout This is a new default since I last looked at the Mozilla server-side SSL configurator.	2025-03-29 22:34:32 +03:00
Alan Orth	0afb8a4493	roles/nginx: update nginx ssl_buffer_size The old default has not been changed in eight years and I see that there have been some discussions over the years about this. I will change this from the slightly extreme 1400 bytes to 4k (nginx def- ault is still 16k so this is more "optimal" for HTML/CSS content). See: https://github.com/igrigorik/istlsfastyet.com/issues/63	2025-03-29 22:34:27 +03:00
Alan Orth	506695da31	roles/nginx/defaults: update version comments	2025-03-29 22:24:49 +03:00
Alan Orth	f67ed7762c	roles/nginx: fix http2 syntax	2025-03-29 22:20:49 +03:00
Alan Orth	014f4d9502	roles/nginx: add newline	2025-03-29 22:19:41 +03:00
Alan Orth	22c16e1ed3	roles/caddy/templates: closer to supporting WordPress I still wouldn't want to deploy WordPress on Caddy until it's more obvious and standard to block paths that shouldn't be accessible. It seems that this is still left as an exercise to the site admin. This discussion has some tips, but it is four years old and hasn't changed since I last looked. See: https://caddy.community/t/using-caddy-to-harden-wordpress/13575	2025-03-29 22:09:37 +03:00
Alan Orth	5aa6a33e51	roles/php-fpm: set user and group based on webserver We use either caddy or nginx, which are conveniently named the same as the Unix user and group.	2025-03-29 21:01:56 +03:00
Alan Orth	7f9b06af9c	roles/nginx: smarter setting of document root	2025-03-29 19:34:53 +03:00
Alan Orth	84db337fea	roles/caddy: smarter setting of document root	2025-03-29 19:33:02 +03:00
Alan Orth	7b23f5f94f	roles/caddy: add missing tag	2025-03-29 19:16:03 +03:00
Alan Orth	9830338be3	Use one default root prefix for nginx and caddy	2025-03-29 19:15:56 +03:00
Alan Orth	e3eed26765	roles/caddy: update vhost template	2025-03-29 18:37:28 +03:00
Alan Orth	8b31c7e148	host_vars/web22: WordPress 6.7.2	2025-03-29 16:10:23 +03:00
Alan Orth	3ff8043aaf	Pipfile.lock: run pipenv update	2025-03-29 15:30:08 +03:00
Alan Orth	cb79f7ef70	roles/common: minor change to firehol update script They include bogons like 127.0.0.1 that should not be routed on the public Internet, but this blocks local applications we proxy to.	2025-01-28 09:14:48 +03:00
Alan Orth	bb14f05d2a	roles/common: use Ansible timezone module No need to use a command for that. The module does it better because it doesn't register a change unless the timezone changes.	2025-01-27 23:11:56 +03:00
Alan Orth	5b1530fa91	roles/common: rework firewall Use firehol instead of all the others. AbuseIPDB.com can't be upd- ated automatically, Abuse.ch is no longer maintained, and Spamhaus is already in firehol.	2025-01-27 23:05:45 +03:00
Alan Orth	5312dc6bd5	roles/common: use common nftables task Use a common nftables task on Debian and Ubuntu.	2025-01-27 23:05:38 +03:00
Alan Orth	d6e060d3af	roles/common: simplify firewall tasks Apply firewall tag to included tasks, then we don't need to use a block.	2025-01-27 22:30:50 +03:00
Alan Orth	b873af004a	roles/common: single firewall task include Use one include from the main tasks file.	2025-01-27 22:28:27 +03:00
Alan Orth	7ea3ab46f8	host_vars/web22: WordPress 6.7.1	2025-01-27 21:48:16 +03:00
Alan Orth	0561bd5b52	Pipfile.lock: run pipenv update	2025-01-27 21:36:13 +03:00
Alan Orth	d62572f02c	Pipfile: python 3.13	2025-01-27 21:35:58 +03:00
Alan Orth	2ffe5e87d9	host_vars/web22: WordPress 6.6.2	2024-12-30 11:03:47 +03:00
Alan Orth	38d4f1a303	Pipfile.lock: run pipenv update	2024-12-30 11:03:35 +03:00
Alan Orth	ed8cb88038	host_vars/web22: WordPress 6.5.5	2024-06-25 08:18:22 +03:00
Alan Orth	c31e447861	roles/nginx: update signing key	2024-06-25 08:11:59 +03:00
Alan Orth	545684467c	host_vars/nomad03: remove	2024-06-05 20:35:29 +03:00
Alan Orth	24ae5eaab1	host_vars/web22: WordPress 6.5.3	2024-05-13 14:51:45 +03:00
Alan Orth	dac23f1427	Pipfile: use Python 3.12	2024-05-13 14:51:34 +03:00
Alan Orth	41fbc73dd1	host_vars/web22: WordPress 6.4.3	2024-03-20 20:28:13 +03:00
Alan Orth	fee794bcf0	Update Pipfile	2024-03-20 20:28:00 +03:00
Alan Orth	8bce1d8b1b	host_vars/web22: WordPress 6.4.1	2023-12-02 22:40:06 +03:00
Alan Orth	6dc2ea36b6	roles/nginx: fix path to php 8.2 socket	2023-09-11 19:55:24 +03:00
Alan Orth	af71a9b5f8	roles/php-fpm: remove fmt strings Ansible confuses them for jinja2 tokens.	2023-09-11 19:52:18 +03:00
Alan Orth	4dd57803e2	roles/php-fpm: fix user/group for php 8.2 configs	2023-09-11 19:51:59 +03:00
Alan Orth	18d4245fc0	roles/common: fix tarsnap signing of apt repo	2023-09-11 19:37:49 +03:00
Alan Orth	1bddf3cccd	Pipfile.lock: run pipenv update	2023-09-11 18:52:25 +03:00
Alan Orth	20dbe61fe1	roles/mariadb: use MariaDB 10.11 The server has already been updated from 10.6 to 10.11. See: https://mariadb.com/kb/en/upgrading-from-mariadb-10-6-to-mariadb-10-11/	2023-09-10 22:53:10 +03:00
Alan Orth	899e87321b	host_vars/web22: WordPress 6.3.1	2023-09-10 22:44:23 +03:00