chore(deps): update mediawiki docker tag to v1.44.2

| datasource | package   | from   | to     |
| ---------- | --------- | ------ | ------ |
| docker     | mediawiki | 1.44.0 | 1.44.2 |

.gitea/workflows/deploy-containers.yml

@@ -26,5 +26,4 @@ jobs:
           echo "StrictHostKeyChecking no" >> ~/.ssh/config
           echo "${{ secrets.ANSIBLE_VAULT_PASSWORD }}" > ~/.vault_password.txt
           echo "nameserver 10.10.10.1" > /etc/resolv.conf
-          ansible-galaxy install oefenweb.fail2ban
           ./.gitea/workflows/deploy.sh "${{ github.event.before }}" "${{ github.sha }}"

.gitea/workflows/deploy.sh

@@ -5,6 +5,8 @@ if [ ! -z "$changed_tasks" ]; then
         tag=$(echo "$task" | awk -F/ '{print $2}')
         if [[ "$tag" != "deploy-homelab.yml" && "$tag" != "main.yml" && "$tag" != "all.yml" && "$tag" != "all.example.yml" && "$tag" != "ISSUE_TEMPLATE" && "$tag" != "workflows"   ]] ; then
            tag=${tag%.*}_install
+           ansible-galaxy install -r requirements.yml
+           echo "Running playbook with tag: $tag"
            ansible-playbook main.yml --tags "$tag" --vault-password-file ~/.vault_password.txt          
         fi
     done

ansible.cfg

@@ -1,5 +1,5 @@
 [defaults]
-inventory=hosts
+inventory=hosts.ini
 deprecation_warnings=False
 host_key_checking=False
 interpreter_python=auto_silent

build-debian-promox-template.yml

@@ -3,12 +3,6 @@
   become: yes
 
   tasks:
-
-    - name: Write notify script
-      ansible.builtin.template:
-       src: scripts/notify.sh.j2
-       dest: /tmp/notify.sh
-
     - name: Delete existing template
       community.general.proxmox_kvm:
         api_host: "{{ api_host }}"
@@ -21,9 +15,9 @@
     - name: Download cloud-init image
       register: image
       ansible.builtin.get_url:
-        url: "https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.qcow2"
+        url: "https://cloud.debian.org/images/cloud/trixie/latest/debian-13-generic-amd64.qcow2"
         dest: /tmp
-        mode: '0644'
+        mode: "0644"
         force: true
 
     - name: Install Tools
@@ -39,8 +33,6 @@
 
     - name: Install Tools to cloud-init image
       ansible.builtin.shell: |
-        virt-copy-in -a {{ image.dest }} /tmp/notify.sh /usr/local/bin
-        virt-customize -a {{ image.dest }} --run-command 'chmod +x /usr/local/bin/notify.sh'
         virt-customize -a {{ image.dest }} --run-command 'sed -i "s|primary.*|primary: https://deb.debian.org/debian|g" /etc/cloud/cloud.cfg'
         virt-customize -a {{ image.dest }} --run-command 'apt update'
         virt-customize -a {{ image.dest }} --install qemu-guest-agent
@@ -57,22 +49,22 @@
         name: "debian-12-generic-amd64"
         agent: "enabled=1"
         bios: ovmf
-        boot: 'order=scsi0'
+        boot: "order=scsi0"
         cores: 4
         sockets: 1
         machine: q35
         memory: 4096
         ostype: "l26"
         vga: std
-        scsihw: 'virtio-scsi-single'
+        scsihw: "virtio-scsi-single"
         net:
-          net0: 'virtio,bridge=vmbr0,firewall=1,tag=10'
+          net0: "virtio,bridge=vmbr0,firewall=1,tag=10"
         ipconfig:
-          ipconfig0: 'ip=dhcp'
+          ipconfig0: "ip=dhcp"
         template: true
         timeout: 600
         vmid: 10000
 
     - name: Import HDD to Template
       command:
-        cmd: "qm set 10000 --scsi0 {{ storage_target }}:0,iothread=1,discard=on,import-from=/tmp/debian-12-generic-amd64.qcow2,format=raw"
+        cmd: "qm set 10000 --scsi0 {{ storage_target }}:0,iothread=1,discard=on,import-from=/tmp/debian-13-generic-amd64.qcow2,format=raw"

group_vars/all.yml

@@ -1,124 +1,105 @@
 $ANSIBLE_VAULT;1.1;AES256
-38386463636233373264323131333862626466386564393661613466323530633631613133656138
+32313431343036613839316331656566626633623961326139376566303335323438326235376635
-3135346230633433346361376665316331666231386339610a393037323931653836626262626263
+3865393439633138366164383762323665366266626562330a313935383933363164313731623131
-32386638393261393037663262626266306565626363663263666231313939643964316264316233
+37323330656161633230366332346236626637363366396565306166646563646432393062353832
-3531653138643236660a656165383736373438646235633566373839393038303263343265306231
+3865623265656262610a643132353830346636623936303361333263393861373032343431353965
-37393930643634656665336531616337353063343537396266646530613162356264343730366161
+35396137613434643735343035643635643963316134373563653935373861346334313333336162
-65643264343462396634363739656264643330393832383233313031363937653565663831323134
+63633332393364356233366638396666353365643638313962373533336633316238336662363930
-32356565646433386263643866633261383864626231316134376331646339396134616136623934
+30623632353137363631366462373463633730343938376265653130643462666234646337613530
-66363739303661316338323237656463616331333233303331636662663439333533313063663738
+34333733343635626561333539653532313932653737373337303537393363643339343566643237
-66666162343131313631373765303732323461643539356135386466613164393463623230633938
+35323139333633316333613265306339326666303761396231653838663138643666633532616234
-62643134393033653634376333666230613636666239386439343562383034663561326438356434
+64613137393666653266393332643863343864383030396634626433646139313835623364336563
-31303762643863353531363937343237663964363830316539613739396163393163326538303332
+30373866363236343364353932356435663063656435366139366531353166623361373466393038
-62383436303537363765633465383661663433643466646131303464306130393237353665666466
+39613366616238316638613934333732633736393762386638356534303138343064643738316538
-65613530383233353561656235303531343065613364363931633962373233666135646433396338
+32393234633366356263343737613939623930633264346131346661663138653535656334643436
-38313738376431616161653961646265386166643965343364393263353837373536366461633766
+63613931323639316232656238353631373432386437346638313430633636613534663439373464
-65306463626435613431363565303966396362393366373361653138646266346433356363333035
+64623165666238386366383834653639626432636530306539613933363438316662633332336136
-64393664366232623231386237626131333165303132313935613564333038323662373238633364
+32646265393638343862313931646236306638623133633034636266383736376166313939306366
-30383030323236313333616266643433616232383636633664363064383833633165656136306464
+30333331373037356330353065656665393134656130303530643335663038383633393032343136
-34313461626531333530396536393937613363323061393436353161393034613762326264613331
+66356566303538356436653933356132396139366633326538633732323532323338656337636464
-63626462643337353430623766333232393162346632343462303734623461623033616636313333
+32636634313162383566616164393533303965353662303263646135373966396134373162613034
-66346135366530343134656361653035373832323835336637663535303337393662626134373762
+36666539623363323930313933373739303262313261633336663337636465303731336537383165
-62656561343366313763366335646266323164366665633631376230386634336362316362336462
+35656366333231653339396639616465633864653232346463356638356266373735393238666663
-65303536313234636661626437633265666562656330623766353731393062303236376530613263
+31333439346432616339616563623234363965306236346238646638386437343536383130333635
-36383434623030363537356430373636623365333230656637373536323866343833353831653163
+34386639383830393331333135363531353734663938623833383632383132363064333666633265
-30666530333935396261373630396331303736626433663739373437353036346561333238386665
+62396630383634343837333438633636336561333835306438343364656235646631356562616637
-32383531633331376230366632336663376438353231366639643765383337646630306531313064
+36363435393935616262393163666633323961396632373939623261346132653736376333613966
-66663566303362353264306337303638623335366339303365336234383464396264646563636536
+36316665653438363865303338636663623434613032346139393032316162636663666538623635
-33383832353739393564613236353030396533666338363231623132303436663365373865326136
+39333037643433633362366330346265373937353733356338356437663734313131616235663034
-63663631656665343632396465306234383234303732623166633031633239326131363737306361
+32396165393130633964356436636131646663346664633334326664383739396239393164373939
-36323066623839643339313863363534313231386563393364313835633635636233663536326333
+37653831373837313939373365356664303735613165623561653033396139643230313335343533
-35346461626266376637313334633039383662626161623462656535393136386363326663373463
+64643439313463376638663164353036393266636662636231643538623239363437363262393738
-66353834613939643862386565366136356237313231656437363266303231376336353532333438
+32323331633562643739646635626238636264616166323062333738623036393834313836313338
-63346165363031383136636238376635613939636165303366303266616165393863323430396362
+30643663666332653333383639383334613530636463343061643535306263363565666261316463
-38303833616462643339316439366539373066643937313134663838363131383533356466656232
+37373661303034666265323633623235313639326331623133306437646536353261633565316432
-61316264316564316330326265383766643037666138393565633133373437653934653032386136
+65663634366636656465343564613965323261373863333365356434653038336531646637353666
-39643134636431613533633139396338623631623536333930646634366636656662383133383236
+36663562393364323466626361633862616664393337313731633762343161343962633462356530
-31653266336462623565343266663134323939323637663630653164326531303934646131313932
+34626439343566393365643066313761623133333366376261376163343865333733643132633962
-35643330353033613731366164323534386633623565633564376436343532396530636165616438
+32646461656335373430383266646236363433353232396363333763666635623166343432386138
-31383130653230383730623939656437316161306235643132313633633162626561343339303761
+64303965643262633761633431633561333964393335626333666632373066373538383162356434
-32343637366362346235383765366633333337366232386661363662643633613830366661393832
+65633430616165663333663836376162316438383162396238623038323362633339316261356433
-38313565616433633039636665383539333633383734313661313766353062626430363034333862
+65336438623533316634623666323364623261316563326465633062396664313263653933333336
-34336332306335646362333766346135383738333065633934396134373463333162666362653630
+66623561633965373531323136356630343532616164346564633537316366366165396133303565
-30633365346165383361646633353231343532343532353536383464636566643665346236363632
+31656332356464663134306361623831646134386234396261326533646331316366393663613961
-62333766343138393763333539633532623330623136613738626136633162366534613932643463
+62623238356130393933306563643762313161323030363962616636336266336566663061353130
-62613131376263333063376638323737666564653664306632366331366332663566666133613534
+35306637333934613137643166636537643732346239613936666666396333636364366563626139
-61393435333332333961376534363131633461373331323634333833306436663938386166393635
+37333764343133646461623536336439323862663332373761323132663736336661653438643864
-38373136393737333736373062363837363533323031356665353766383164383036346530313831
+63393262333837383539656238353732633435353030633430393236633462633233393861616533
-36393033323331353836623362386630643737343536376662643931393863653865613139353138
+34316363626563326238316437666437343661353232646632393661346263626363363236383361
-38633064343837313564343834613132306239666630636336626234363964653939303366363566
+37633366363133626661386638623234383938383430353037353435616337313762623130366438
-39666465396465356261346234346435356162366564643436313033316338376431303330313539
+64323762373938613439616531326365396437313663643230376531633336323037663633343661
-61613538326336386230616339363462353138666362306565653766323639333638343863326636
+30356137616365366539386636623532633464653564353637663135313539663433643039356336
-32363534333131356535643063316233376336636633643630363761396464646438613239386563
+62633535613631363533613664626637336462373763306132666136306562373736396432316334
-37356333303133666439653632653533636336306266376535356330353337343332313637616336
+31376631376634613265383738353361336464316430336262306436386565376364326130643264
-62396131633162356135356439363534353032373765373635366533393061646331386633633239
+36626135653563373239636137623339366364306232653839623565666661353231303332393638
-37346566353736653830633238623530393537373164323861343961366263303764643937316234
+64373339646637623233333637663264333732343434383034333665656536636564643462303538
-38326361343163313135396461643037323962386262636566313761353033323263666631393830
+63363665633863643830626265656536303233633864626261323630396162613433366539663138
-62326362333264323666616638313135636233646466366433306533393031353831366266393130
+66646164376232363465313037376333396134303063323037316635326463383365396530383439
-30653630626239343330633736303831353336356636643938306239363533393066353034316338
+31643535323735306666356365633839356436663530663164343030636263633930353036316362
-37336332386565646364336331316632393864623066646231346135303163623833636632376338
+35643434356333616430373230633933626361636531396432313839636338346234326263396366
-30363234313863396663633237613165373137343536623831366261393264326133356461643239
+64353531353565363064383834643134666461663832393664656634643133326231333038326661
-35633937363761356564373230646365666666346630663935636262313932343534343963623635
+35386132316338626236643639356230356361633766396665636435383331656335633464356633
-34326365646565616634386137323933653931373061303465663939373831366336653830653566
+36373139643265626638643161323462353233393435363162303335346234363937353639356536
-36656631366434633065613430366236373165366365346664303266326136393438306563353265
+61373632643566636666306636373436643137303939616639636262616232343936373538663837
-33323732653330373764363664363363363662626434626537386337383531303566663836356464
+32663966306663366434643135383535626334363766656564366430306434663734643938316539
-34363635636161376530383930323361653063313338666162643234316363373835643633353738
+30346636323964333962633535313661353461306330366130346338386437623039643038613034
-37663762326665336339373665626534303436626639313636636333383666613966343563613861
+37653762336230623762336362653064353136316261376164343233656434383236616165373132
-36343961353339363137363539653435373132663263303533343935336435353161313036633364
+34653032383833383436356266363763613238333430373534386563303663666236633639393962
-38326265313163623864666563373632303461393430613639616634613632303935393438333663
+35323465623336646464313834313765383332306261666137666639663334623933313331373832
-61666166613738633163646130386364393137356436376666646162653937663137333764353032
+39376631363734343538333562326665363562353462653530346139363637343062663031313963
-37353238613732623361613965316231623631623536623261643839323431396130363063316165
+32663338346631343539636639613933393536346563626465666536623031376539633936366461
-38656635623762336465393764306261303666366538633565306637376664643963343239356466
+30386239646336323238333636633566613562643730383033313863353362666261356332643866
-35656337643361326262643262326136306666303138663533373966363739663131653463363935
+36366133656138633139383030613463636334623232346464336436613534626162643361313736
-33326438393464643436326263663066623233386132636136636636646133303565326231306237
+61373630303666303030393836643064313661353231386532396664613434633636333738663830
-34383235356238326561396130306362303263376466393462663938643362353165386435666430
+37616637333736623336356461303935636134626564386162363465623435376235363964383936
-62656234323537323534356561646662306630383330386631323334373934393864666664306566
+63643865323538646164613963383034656537396238393761663738313035393232666130336131
-39303661656231373032643239303866633434626131366164316439656466613830626262663538
+66326161613166326238386465393664616331313965646166653763633864373465353532363563
-36373437646464323265643365393165396230316636343466623962663038356163373433313335
+63396262333037656162383034323735356234323431646136613939383438643935323563313665
-31663566626136313436643237316631636133353635613862333632613537313531623036623961
+34633665363236626433353361396236613161633534333233613634383765396437616636653639
-66313131653731386333383962346634346138663666393138323661306239643736383533376432
+35303233633538323635613634366233383361333861303733373366356430373463633765633866
-65653663303539326566646637333235653030356364623565633964303866313364663539303935
+37623238623762613635313134393266313037613034343632383661303434643034623034633064
-34373536663935623638613930366533316334303566366265386266333466623331326635346330
+32616463383430333530396635616166386332313038393263313666623862316630353030336663
-62323537666361626166323630303961363763386164613866613262336366633235323231626638
+32633935366638303164363632313234366263613235353965666638356535623836353066303565
-30663038356535666638303134656634613134373837323736363430316137613335656531643062
+63633239376161363661343035353066616633343338663833626165326239623662623130623966
-36356562383361393061663466323732383965313733633034346162653966313735393563656536
+30393662343639633962396237313261336239396261616562623562663037646638393766326530
-32666361366430323239613437313833373330333336373636613463613566363337393161376535
+36326264363536396534346463646434393563646439333263373563643832316465363038306362
-39336538323635656663613133356535373562383933616666666338373532346238353163616535
+64656237663438323863666363373364363164303635306236376538373861393735313730663166
-33393461393365313764623332343332326535333533343934346138303132656234643731373238
+63656437393231326334336536343336656164373764653933643838356236653431356466623435
-66633034643965633834333966323462323433613165303930343834663532626531343431396430
+65616465336536653664326238373332623364363462306337643862663361623233616138393630
-33383732623165393032363437646430303062393032353632306439333261633963653638666232
+38613431633430303731376637313637363930363534323437393964313133303838613331653237
-36613433303432623164646637316131333364323830323334633538333166306537343936393961
+65333564386231333763376661333436633565623163306563376236373464366430646666343636
-61353831396338383436646636616363336564396336653634393666316566326165643562386534
+61303530616630323836326361643263626132626662623766373738656438313164343464623166
-30383462323863336630643261613561663066343665313161643161333339623739323966383663
+34383831666130303737633534336465333830333632323337643565313861386436316462613739
-65366562643363653534666666666234323964613732656334353534613966386233643335313736
+61333666353366653738373939656133623630303534613963383038333136613430386636333431
-32303632336635656239326562386234383136346163396261653363316136343034386262333838
+35313064636532303337616133353637616130373432646262313639333235333630616433613534
-62663966643530393964306437313534336666363765333431303239666164616665633332306466
+64373837626438303665653235653231656461353838383766353034343632633439653862386439
-35356432393430663638376334663235663337393637343437376261653438663365653730343366
+62326531323864366537346636366337633664663138356632386461643137623430643964303333
-38636538613731383833336231336432353561366265323933313239613836656437653935373663
+64396361663361333865626235643665393331386632386639643165376365646439343137653537
-39303535613365343834373934343066383233326565623438373161626433323264353664316464
+61356332326461393035653863303663646462353861376530643538616537646435306534376464
-61353265333636653039643934386361643931383033373636303138303635303361383538353965
+36613763363265333036336134666165663361313966633864306436303862333761656266393665
-61613639616136376633303634643135613134373763323635386230393339633133373332636161
+62333538646632346363653038656235376565393837616337653363333664383466333562303435
-66616338343737613333656234363663636132326665333734303036643966383239303563636563
+66633666616137653136386461386135366632613363636664653334303763336632363538393239
-64366437656265656466376465613233653838343038663862643330653430613237656435383835
+33396432316366356266333831326330363263346161633064636263383666323664356464323336
-37663866626663303032656163663635373037323839623439323264303333386338653930343666
+61306366343761653631633534363165646364646366643064303337323163633138386335646235
-61306630653461346632313265313964393932376539663233333336313232363838343839643239
+37393632313038333764363531343866613265646162363133383162333836653761666637313762
-61383062306333376330393337356364343131383530653461383737366431646236366538376632
+62333362303061616162
-61636638323166303666633766623836626431333636626462653633343538303135323532343636
-62646333623164343665363039373139643466363366653935643365386131333632653031306165
-62663864383739303161356134643664396363303964663161383033393333303733626366316662
-39646466313534386637636562313163393865366631613838353637653533313232313666313838
-31613166653262386633393663366639336232383166633033303435643262656131343338643832
-66626533306430623733386233633561306536386262623030306630363362646338616634396339
-62363736646234383935383930343464643864393162656663386437323636613033643439613333
-34633266363264636466353135356537653931383131653863386137643032646664643133656536
-34343864643366376663616437373363636233343439353264656638326338333262386534346136
-35656130643533343736623564386537363737343761303739646361633165643963393166336265
-38336530333933653462393263316164383162373065663937363736623430373863303330323261
-34656534363235353032366237646336373039613836626130633738313664663162393031386561
-39373564343533373263306261653537663439326462393735343964323565343031646163333939
-62623834623939313438353939653138626165353434386638613439363739363465613037616636
-37333732333634333934633037613038323934636434303731363535663732663361613261663734
-35373061356665663936333438336132643930323463373635633137663132333362306136303830
-34613962356439303664323734643265313131643135366531643235633037646337313537323033
-31313837376134363664343766316436346162363264383165383561656362316633383136316533
-653961363033343965336230373962656537

hosts.ini

@@ -1,6 +1,3 @@
-[proxmox]
-pve2.comprofix.xyz ansible_user=root
-
 [cloud] 
 vps02.comprofix.com
 
@@ -16,3 +13,4 @@ vps01.comprofix.com
 [jellyfin]
 jellyfin.comprofix.xyz
 
+

main.yml

@@ -2,32 +2,63 @@
 - hosts: all
   name: Configure all servers
   tasks:
-    - name: Gather facts if run with tags
+    - name: Gather facts (always, even with tags)
       ansible.builtin.setup:
-      when: (ansible_run_tags | length) > 0
+      tags: always
-  tags: always
 
-- hosts: jellyfin
+
-  become: yes
+- name: Prepare all servers
-  tasks:
+  hosts: all
-    - include_tasks: tasks/base.yml
+  become: true
+  pre_tasks:
+    - name: Create directories
+      file:
+        path: "/data"
+        state: directory
+
+    - name: Setup base system
+      import_tasks: tasks/base.yml
+
+  roles:
+    - role: geerlingguy.docker
+      docker_users:
+        - administrator
+  
+    - role: grzegorzfranus.fail2ban
+      vars:
+        fail2ban_ignoreip:
+          - 127.0.0.1/8 # loopback
+          - 10.0.0.0/8 # Private
+          - 172.16.0.0/12 # Private
+          - 192.168.0.0/16 # Private
+          - 169.254.0.0/16 # link-local / APIPA
+          - 100.64.0.0/10 # CGNAT
+          - 203.0.113.0/24 # TEST-NETs
+          - 192.0.2.0/24 # TEST-NETs
+          - 198.51.100.0/24 # TEST-NETs
+          - ::1 # ULA - fc00::/7 # Private
+          - fe80::/10 # Private
+        fail2ban_bantime: "1h"
+        fail2ban_findtime: "30m"
+        fail2ban_maxretry: 3
+        fail2ban_custom_jail_files:
+          - name: sshd-strict # This will create /etc/fail2ban/jail.d/sshd-strict.conf
+            content: |
+              [sshd-strict]
+              enabled = true
+              filter = sshd
+              port = ssh
+              logpath = journal
+              backend = systemd
+              maxretry = 3
+              bantime = 3600
+              findtime = 300
   tags: base_install
     
+
 - hosts: cloud
   become: yes
   roles:
-    - role: oefenweb.fail2ban
-      vars:
-        fail2ban_services:
-          - name: sshd
-            port: 22
-            maxretry: 3
-            bantime: -1
-      tags: fail2ban
-
-    - role: docker
-      tags: docker_install
-
     - name: traefik
       vars:
         traefik_host: traefik01.comprofix.com
@@ -49,33 +80,27 @@
 
 - hosts: docker
   become: yes
+  vars_files:
+    - vars/gitea-images.yml
+
   pre_tasks:
     - name: Connect iscsi
       import_tasks: tasks/iscsi.yml
       tags: iscsi_connect
 
   roles:
-    - role: oefenweb.fail2ban
-      vars:
-        fail2ban_services:
-          - name: sshd
-            port: 22
-            maxretry: 3
-            bantime: -1
-      tags: fail2ban
-
-    - role: docker
-      tags: docker_install
     - role: nfs
       mounts:
         - name: Data share
           path: /mnt/nfs/data
           src: truenas.comprofix.xyz:/mnt/datapool/data
       tags: nfs_install
+
     - role: traefik
       vars:
         traefik_host: traefik02.comprofix.xyz
       tags: traefik_install
+
   tasks:
     - name: Deploy comprofix.com website
       import_tasks: tasks/comprofix.com.yml
@@ -97,10 +122,6 @@
       import_tasks: tasks/homepage.yml
       tags: homepage_install
 
-    # - name: Deploy osTicket
-    #   import_tasks: tasks/osticket.yml
-    #   tags: osticket_install
-
     - name: Deploy speedtest-tracker
       import_tasks: tasks/speedtest.yml
       tags: speedtest_install
@@ -125,10 +146,6 @@
       import_tasks: tasks/radarr.yml
       tags: radarr_install
 
-    # - name: Deploy readarr
-    #   import_tasks: tasks/readarr.yml
-    #   tags: readarr_install
-
     - name: Deploy sonarr
       import_tasks: tasks/sonarr.yml
       tags: sonarr_install
@@ -157,23 +174,15 @@
       import_tasks: tasks/gitea-runner-homelab.yml
       tags: gitea-runner-homelab_install
     
+    # - name: Deploy mssql
+    #   import_tasks: tasks/mssql.yml
+    #   tags: mssql_install
+
   tags: dockerserver_install
 
 - hosts: omada
   become: yes
-  pre_tasks:
-    - name: Update packages
-      import_tasks: tasks/base.yml
-
-    - name: Create directories
-      file:
-        path: "{{ item }}"
-        state: directory
-      with_items:
-        - "/data"
   roles:
-    - role: docker
-      tags: docker_install
     - role: nfs
       mounts:
         - name: Data share

requirements.yml

@@ -0,0 +1,7 @@
+roles:
+  - name: grzegorzfranus.fail2ban
+    src: git+https://github.com/grzegorzfranus/ansible-role-fail2ban
+    version: main
+  - name: geerlingguy.docker
+    src: git+https://github.com/geerlingguy/ansible-role-docker
+    version: master

roles/base/defaults/main.yml

@@ -0,0 +1,26 @@
+---
+install_packages: # Add addition packages here
+  - rsyslog
+  - htop
+  - vim-nox
+  - git
+  - zsh
+  - curl
+  - wget
+  - apt-transport-https
+  - ca-certificates
+  - gnupg2
+  - python3
+  - python3-pip
+  - nfs-common
+  - cron
+  - jq
+  - sudo
+  - logwatch
+  - sendemail
+  - libio-socket-ssl-perl
+  - libnet-ssleay-perl
+  - iptables-persistent
+  - rclone
+  - parted
+  - open-iscsi

roles/base/tasks/bookworm_to_trixie.yml

@@ -0,0 +1,26 @@
+---
+- name: Replace sources.list entries for Trixie
+  lineinfile:
+    path: /etc/apt/sources.list
+    regexp: "^deb "
+    line: "deb https://deb.debian.org/debian trixie main"
+  become: yes
+
+- name: Update cache for Trixie
+  apt:
+    update_cache: yes
+    force_apt_get: yes
+
+- name: Dist-upgrade to Trixie
+  apt:
+    upgrade: dist
+    force_apt_get: yes
+  register: trixie_upgrade
+
+- name: Reboot after Trixie upgrade
+  reboot:
+    reboot_timeout: 600
+    test_command: whoami
+  when:
+    - ansible_virtualization_type != "lxc"
+    - trixie_upgrade.changed

roles/base/tasks/main.yml

@@ -0,0 +1,17 @@
+---
+# Gather initial facts
+- name: Gather facts
+  ansible.builtin.setup:
+
+# Update system and install packages
+- import_tasks: system_update.yml
+
+# Upgrade Bookworm -> Trixie if applicable
+- import_tasks: bookworm_to_trixie.yml
+  when: ansible_distribution_release == "bookworm"
+
+# Move to Trixie sources.list.d layout
+- import_tasks: sources_list.yml
+
+# Remove EXTERNALLY-MANAGED files
+- import_tasks: python_cleanup.yml

roles/base/tasks/python_cleanup.yml

@@ -0,0 +1,17 @@
+---
+- name: Find all EXTERNALLY-MANAGED files under /usr/lib/python*
+  find:
+    paths: /usr/lib
+    patterns: "EXTERNALLY-MANAGED"
+    file_type: file
+    recurse: yes
+  register: externally_managed_files
+  become: yes
+
+- name: Delete EXTERNALLY-MANAGED files
+  file:
+    path: "{{ item.path }}"
+    state: absent
+  loop: "{{ externally_managed_files.files }}"
+  when: externally_managed_files.matched > 0
+  become: yes

roles/base/tasks/sources_list.yml

@@ -0,0 +1,42 @@
+---
+- name: Remove old sources.list and sources.list.d
+  file:
+    path: "{{ item }}"
+    state: absent
+  loop:
+    - /etc/apt/sources.list
+    - /etc/apt/sources.list.d
+  become: yes
+
+- name: Ensure sources.list.d directory exists
+  file:
+    path: /etc/apt/sources.list.d
+    state: directory
+    mode: 0755
+  become: yes
+
+- name: Create Trixie sources.list.d
+  copy:
+    dest: /etc/apt/sources.list.d/debian.sources
+    content: |
+      Types: deb deb-src
+      URIs: https://deb.debian.org/debian
+      Suites: trixie trixie-updates trixie-backports
+      Components: main
+      Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+
+      Types: deb deb-src
+      URIs: https://deb.debian.org/debian-security
+      Suites: trixie-security
+      Components: main
+      Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+    owner: root
+    group: root
+    mode: 0644
+  become: yes
+
+- name: Update APT cache after sources.list.d
+  apt:
+    update_cache: yes
+    force_apt_get: yes
+  become: yes

roles/base/tasks/system_update.yml

@@ -0,0 +1,48 @@
+---
+- name: Ensure debian-archive-keyring is installed
+  apt:
+    name: debian-archive-keyring
+    state: present
+    update_cache: yes
+  become: yes
+
+- name: Update APT cache
+  apt:
+    update_cache: yes
+    force_apt_get: yes
+  when: ansible_distribution in ['Debian', 'Ubuntu']
+
+- name: Upgrade all packages to latest
+  apt:
+    name: "*"
+    state: latest
+    force_apt_get: yes
+  when: ansible_distribution in ['Debian', 'Ubuntu']
+  register: upgrade_result
+
+- name: Dist-upgrade packages
+  apt:
+    upgrade: dist
+    force_apt_get: yes
+  when: ansible_distribution in ['Debian', 'Ubuntu']
+  register: dist_upgrade_result
+
+- name: Install required packages
+  apt:
+    name: "{{ install_packages }}"
+    state: present
+  become: yes
+  when: ansible_distribution in ['Debian', 'Ubuntu']
+  register: install_result
+
+- name: Reboot if required after updates
+  reboot:
+    reboot_timeout: 600
+    test_command: whoami
+  when:
+    - upgrade_result.changed or dist_upgrade_result.changed or install_result.changed
+    - ansible_virtualization_type != "lxc"
+  become: yes
+
+- name: Gather facts after reboot
+  setup:

roles/docker/vars/main.yml

@@ -1,51 +1,51 @@
 $ANSIBLE_VAULT;1.1;AES256
-32396236613762346266373632613335306233666563346466653731653034613637656335636463
+66633332373830623139666134663234303066626136383861353962336436383634323261393138
-3864336133316534333262373835643732303963353538320a343235363461613837383962303762
+6333336361366430366262383061323836653539643732350a313837653930383637393962363130
-62373739653137326664306563646632663661323339626636333461303132366133393266313833
+39663033393836656538333163303266663061353364316137663035383765363232653735396237
-6137313537666138320a376334396531643233626265643538613133313866623236383338353035
+6333653739316163330a626533613330336539626664313733656261336135396466356663313832
-62623166316366393837313166646539376362383363353862303439303230376163366335353237
+39326131336261313162666162316562626434623366663530656130623737643765383362393261
-66626130373762333536396265663262376335323162633961656139313435333765363163633161
+64616465323438656665323864383431373133346537663930353163643330613763623230316162
-65393532663339363738623232316135326338656330303764633530663661626163343533643430
+34636236316263313362616230363161366633636330653937356333633933356539663130333139
-63646337363636386337373435373939363434646161616638326665316636383362346232303763
+39383864313434646233343762633130396536386231643539323661623731626637383262353763
-39656636643261383137306339633433613534313362636537393433656230613333333463396437
+65323865656330633830646563613666333932323131643434623532623366353530633538393362
-32623630636464313665656562393766376330633038366534623634656535303237666332363638
+35383161643363623031386364376435363166306565386530333338363031376134363938666238
-36373566303432653664383230626436663362323336336233396363353430353535336464376137
+65313266366535666563666265386565323532386538366332623334356165636364373462633539
-33393762363330633963656161383535306365383062616466626266373637396338643930333931
+62326664663834643361343933323630366465636537343265626130633735356263393838396639
-66373739303232393233303131663031333639346236633030346337313938383739386561386263
+30666632663034363934363966386130643161313035623862623636343864633665653166396363
-36643831323930666665376237656163393532333438346332653562306532636530386365636331
+66326134323638316539333235346261656263633737333038363233613531666139373236666636
-38643637613261373030323963656266613661656663643330383333336336383433393633383335
+37636638313635336531623835313630316336386464336231626338333033343437316361386432
-65326130646536323861346437336362333630613034366639656536353430326366316530396436
+64363438616634323566336165303066353139396234343932623332653037303533613537306234
-34636235336433666261386163316330363337393963643761646261633932666134316331386463
+38346165623861396434333130306239663462663365313365643636616434366463343565643339
-63643463343162313162323537623764303564343438636133643162646530643435306262653838
+32383538663865353765313532666464613735363764336334323262633133653131383766353934
-30376539303130303536316136383761333836646231316563633564643635376230313333653739
+64326261623833653731356366323138336330396131623836353536306332643531393837613432
-38663032343736626461303835656662323064666139323935323534346362383636636237333937
+63366232653561613862316535306666623631633665613838343965326431353761386161616266
-34616663666364323734643530343936383030326539623065356561633563653764386134633562
+38323064636632646132393666313339623237383437386635316663383734626466376466623438
-37616463633931336233623335336331313463656132653331303530616332306332613936623130
+30303661633932303864326462396364653634306566353234346131663062386337336536366564
-63616264333531303762663665323636663466313933393064623534653561343561633632636565
+30303231643461366334306661626336363737376534663330633634353435396431353563303633
-39633435313963393034366336316665323339333962343666666533646632343666393332323635
+34346361383635353131353063663836343337643961623934663934613161636466613539303836
-65653062643332663362343666643433336562353639656366623961306132313734613838336237
+31363739653739623038303334343364643762643162613866306439653933393866336265363231
-36653962353839636662363335373238393433613037623364356637336562303765313466313166
+37623865316139363139396339363835393461356432626134363433353161626137366136363966
-34326365393433646166653461333138386166663537343566633565316163323866333932366432
+36663832346338393766363234646336663832656438636536333930356532626638366631336330
-34666532346164316232663964666132653232393264633066333734333238636135376263643937
+64313933366166653836313033343637636138653566383264636363626364353766616464386133
-66353665353564353938343934363337396165616462336439363338343065306533653334636566
+66636565663331613036323461616531663834303161306531306539656131343164643261636566
-35356231346431646237636662633030313135633663336163383965656136393238636334396137
+32613738653564383331323266366339663137656138653862633636333465656232613737353961
-65613833666662353339616434623735386638656331643831383134626163386636313633323333
+35306135323132303933383463373262633263613663656162333233393634386364366138393766
-34383862373634373732613333656437323436383962306163633833343430303336383433366336
+65313061326132376335656661616238663464303265383362313237323430316337373732313737
-63313138383237373330623536383438306330373164336637646165313562343935656566653531
+65343531333163333735396132303162353630356535636138633562626234623362636136393862
-30356365333863383165633634343230653735343164393030313339653563376435313832396266
+33643966616465393535383865393762303066353461323133633239383963353162616434333039
-65623237393066666163363530356163313861323366373233383531386533623965306237623137
+30386630343834663632303638306664303832373937663465353233386266633963316331633037
-33363239396634306466663535323736373333643266336164336230303836643939343335626339
+33353435333939356339386235336231343337623230313130333138666231336136623434333437
-35373166616136633666323034313364613334303462616564383861343738653964663332616536
+64333162323237323535643336373939623939303331306433626433396533623339303365393164
-32353135633331336239353834666237313939386334383261663532333139636363353436363864
+66353235653062363164343534303134336330653131333635663834386665613433363464353230
-33396336623566346532613738353332643965623335653162323534613330663964353833333937
+61386564373861323461643439376165636231646632616333333763313262646232626437383736
-30373761393834323964633039393339376538353261396331316336323333383064356363633264
+66316139636532616631396334613966636161653363363333633261616334383034656139393664
-62613432313436353163383837363935373164366236343936313366623936336439613364336639
+33633635356562353238313136376639373962643764653338636336666138323337383933656132
-63336536333732326236323761323033613965333763366237316431303363346263373131663338
+66363663306336663535333737613838653735626535386431356262623462356433336535613437
-65376535386239353362326630396232623533626266376233326330316466383564313935663134
+35356530616365343639656630643063393263626335383461396262396430383839303433376365
-65363839323134663537356663346437616662366463393036353736353664356538656163353562
+34653364663939336361373834386431393163656664633536616530643830633239346261396164
-65323162663934653462353136353065333666353564313066613466663734623066623439613964
+30326138386565646636636539653761366466663461386366386430396331313434616130633364
-36353035653163306661393335636430623233633962303033656539363265663135666663643164
+35386638336536666333633263323030643766323665303763356466393430333336316534306136
-37613334653964366433646366613861336335373137393065373739363863626334316631323332
+61396263323636323835623935336135323363633837363364623664646335623163666131666532
-66623465373730373231316265653330383061326231373931636132663233643735343564313636
+64346164316133393866316561346137383665363532393064663436333637393737656538313031
-36313330336461616134663336306566646639383435396236383162366266366662383635333832
+65653531383830393733663465313437646335316537386530313631636634663564303165366532
-3266363963363362343563653131373339666163663536653032
+6432376363336661313535353436316231666462346364373337

roles/traefik/tasks/main.yml

@@ -79,9 +79,9 @@
       traefik.enable: "true"
       traefik.http.routers.traefik.entrypoints: "http"
       traefik.http.routers.traefik.rule: "Host(`{{traefik_host}}`)"
-      traefik.http.middlewares.traefik-auth.basicauth.users: "{{ traefik_api_user }}:{{ traefik_api_password | password_hash('blowfish','1234567890123456789012') }}"
       traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme: "https"
       traefik.http.middlewares.sslheader.headers.customrequestheaders.X-Forwarded-Proto: "https"
+      traefik.http.middlewares.traefik-auth.basicauth.users: "{{ traefik_api_userpass }}"
       traefik.http.routers.traefik.middlewares: "traefik-https-redirect"
       traefik.http.routers.traefik-secure.entrypoints: "https"
       traefik.http.routers.traefik-secure.rule: "Host(`{{traefik_host}}`)"

roles/traefik/vars/main.yml

@@ -1,14 +1,18 @@
 $ANSIBLE_VAULT;1.1;AES256
-61386364396339353533653064303734346336653531366139333738353461613037396365663265
+33613965373066613539323138336234303066356362393063343234653436393361663464353266
-3731366362343630646162353636316565356563323135350a636335653931376137666139653739
+3438373135383330313563306362353061343531336231320a333263656535336265373431663637
-36306631376639336561643064386430633636343362646233623263356635636134303931356364
+39386136303432393335636662626466343639393966623234376366623466623237356464643131
-6466383864366236320a376134623032383566643166626231323432373562373864333864653032
+3036363264383535360a303030386464353630306161613239636534313163353563323763663763
-63316630303362616337383833623733316131323764626532366338333566643834326236383232
+33363362313130633430373966653530373562613737343366373136646565623831633839656432
-31646330363965386233383739336238336538666165383166393834643134663937393535333361
+33386563373864326433663130613664376536353337313465326266633265316438613631633061
-34373236386339366436643733393030313331303537636233383864623435386166366537386633
+30363833613032376536346133313566666163303562626366353861626336633530343130373362
-37653030313066393136616661356564373932643033663735656238313132396664623438343833
+38643730303530386139376661383662653834383734396633613134353561633538366365623835
-65356539386435656433393933653939313635376639366163353336373661396230336533626238
+64356530373064396563643763653735313862643335373363386437666138623861653362343930
-39643438313763343635393165376263666633363963623962643263323531616466656532646432
+64346562313533643230373831663036303835343035353036623965636565653331646331303361
-62383430346666343465613436346637333336663562316165303864376464363566343165633665
+30613732313134326339633862333532366163346261313836366362313266303734316431336561
-66353134313866393439323564353834346436326132643439383134623864333765616162353436
+37663463646162363031363662346431386566656331313235343235663732636236666237663265
-6338
+33336233623636613232333263656266393465333333333330373935346237613337313664346139
+66653236633030383835326433633737363931356139313331323731343332663937616235346533
+65636331386631303432373831393037333339316639623561313136643139306263303364383535
+61633330306630643139616231663134383932306437613138326366386565613030323539306462
+6439

scripts/rclone.conf

@@ -1,196 +1,214 @@
 $ANSIBLE_VAULT;1.1;AES256
-63623637376239613064343634336463616165333831353331633738356662303534303133363338
+33656232353663376136656237323861386264656230366637393763383262353734303562616237
-6334613838656263393764666534333434646232616662300a306638646461363133613365323635
+3564656335663830313838623264353661303930623131630a636337313932666563653130303130
-36383130373964333937643532356538303936666434653566616232363934336531353732653766
+33356365316337393935353234643432356633653734393031323834633863363539383363366461
-6166333932323764350a643331313162376239643364633337376366363663306539363962613431
+6666633038343233320a613437323032376134313837376239363063663032336332396666663830
-64336561626166613061353962323461646664343637386664363530626666333930353365383334
+38343339396233313031386131383466303933366163396566346334313831303062363866393131
-36313939626436663436623235656435666136653834336131303434663739626135643430613836
+65353233346266386434643665663930373730303566613536376461396338323066623138363632
-63386138363963646433643966613331633563633834366364353337323762663232663865363666
+35396666653961616439656563383562643738373938303964643936613864613831656436356364
-32336432323962366237323833656535386338646265336562396437663539346430636635623037
+61343639363630376661383861373835383133323236353333636233306637363462386564353033
-38613330666362396562346137316132363764376265636337646430303437663233663464353465
+64393834353139633262396434376666653934646433393233376166336164333534666537333166
-34663530323561626237333030376466636436396331643136343235316161343934646366353335
+65313139346464656564356135346262643032303561386332363930326332376532616165396165
-63333762343033353066646236633437396365363464366231333462653239666237343564313934
+61353466613562633632616435343137333963393938613366616232323535333539353763313361
-38373162616635633730316334613239383938626364633732353031616261363066653266346339
+35646537376533393036326237623665663437313264653033353432663131376536623338663032
-39383537396635626639636433396263613231303030306136653262326538636232663131633531
+31323761666563656463663137353762663335393261353336643135356134326363643866363436
-36336432666461356537353438386464396661613664303331313466663836353939383630396663
+65663739316137363333383665623266323633633133623335633335633362633235613838313462
-63316363623235333934616635303461376138646530393936353934316431386234383364353166
+32623561376466393866373966333663663830353139336135363761383433376638666465623165
-38346162633133623066343532316331313661336365323664353066663864353263653532623238
+62343965336664393465353633646135613562316664316631373231626562396236616336633530
-66326535306537363831613538363761623366626436386261343365643239323863303263363334
+33396364393466353134386164633436316366366430313236656666663561616566343761366531
-63626164656239643038663765613339633064323137303834333035343935383737646430316631
+38323737373030666231313061626162396666346436326134316565636462393565353833366531
-35386534343563393636326164653062343139353265663032393830333663323831616562393665
+38316534653036643133636463613563653438373631333666636265316536376134313134313037
-61313665633731313737626362353032316432656665623832333461353464313735623738386564
+39623733353737303832656164663236633361346137653638326562323837656131373237653038
-38343464333264626161363839333534353131366130366361656363383465656233626334323830
+37626164303862623364316662363030353536613639396638326565666332393933656566643336
-63306431353365356438393037666132366637383530653636363065323161623831346434343964
+33383663323466643263623131663530626163343861616138656663626135313562393536326565
-34303730646531386265326430313733333233636337386639613466626335326465396536653337
+66333763313030303166336461316338353233626632353965303631373962353332396534306461
-32613035646639666635366662653938326632373264343731396633383134636534343064646335
+34326363303162333135663834613638333531346334343635306438376139643039663537633235
-39326263393131323665306636633435356234393864393835323662643636346262353961393162
+35393861343336366362666364363037373063666436623236346538373664626433303166616362
-37663962613430626135653666306133613166393736633530313139613161333438383662353136
+36396538343236656431316536643739396639393663333762376239633535643138386666333335
-32303033636634306562633739393831336333383931376536326137353935383537323464613362
+61353332313663313864653739636638613031336439396430306633366636643635326633373139
-61326338643435633530333163613235386434343637346636366262336539333762643232643362
+39653962626638666535373962333565623361303062356531646335336431663062343831386362
-64643032336264613664643433356238323836393236306136633038323436656335313733356166
+37393030333635316134393634323464623935313836306536653664343866313333666134316237
-37393965643638626236626566363463633837343561353433373036636430643436613862346462
+62333562313165656634363065643864356137643439313163616437616436336363646263643164
-38386432316631623432386661353765343338323164303535613864643264343363303365316465
+39316262323862616132366635333438646633666361323361326664333363626461363438323135
-31626334646562323139623630363439613436373537626362643530613036306435383039363836
+37323136383735656334323762636132323732616637383232343638386232343062666438313136
-30353932306332613034666439356232366430626230336566666162393437323864656663346639
+34363535303061363264343061633132363335336162656139616263653064306536636366393864
-31633331386432323830343062383237356463363637336436306432396539306166613138333162
+63336135323162306138616361663232373533306634333831396531363133643838363533383766
-61346634373336383732636638376330383131333961656534636663626335366264393733373234
+35376237333934373939353662663234353334633266653235373864623337333661666239636439
-32623430336233653236633536626563356239636161373733633337643239613938336566336463
+64363062366139616534303738613666636332633361376537333134343536623839366364626531
-34343236323664363561306337646133616431303764346437313938613430386131323335346331
+62393733646639316533363537636161376163633232633436366465623861333663353563363838
-62383839633162366366613236303639643163303134383662313730666365376338376436656462
+65333037306235326534643536393437623432393862303133316333623836366337613365363032
-36643161363738303531353364393764633139336239336632346164373766666336353339633737
+63376539353836306130373938616230646638306531643433326265356131346665336333663633
-33393364306466656164616531663662613632323865623966393564613737643765343530346131
+37656434633933336433323962323561323539653330346231373965653030623066306630323036
-63653233313335333335636161326265323263306636323761396131666339323534343133333966
+62316431666461343836623839633934323235613436653934356261623566643766346665633066
-63343761343135616363363638366430313430666539303135623065313131666533386364623861
+65316332393961363439303264306162336236663565386630383039643437646133303239646135
-36356233343566303161616337343536663236643634626139643563663231353131316561633232
+35356366373030626537313530336531363561643066303232613330656564363335363735363866
-62666238653130633536626432313935353438613666353735613262336134346630343839306166
+32386165306334623237326464326165356537313364383566373361333535396663626362346465
-65653732613666656636343737336331666434363065343930656463613837323765303737643764
+35343438323766323437393732666630623262306566326566613938663966306137376237333932
-64616230373964363565306136623135663730323164623439393437366233643038303363663731
+35346432396165616437346664353235653965326562653561626334306465393565613137633334
-63333666663831653763613632666437393438386534363533356138383231303439306235636537
+64363264363563313932333936613337346161643135646638346664343336653337313764396434
-37636561613463333930323565303935313839653364653533636562653364666331326663333362
+35383536353032646239303338393833653563316432393661313436666161373236326231616632
-33393839376262346431326236633839323234363861663963616531366538333338356339323330
+66313934376361653962653036323837393864653539383332393735663035316538623135336464
-32643633656339333635363964313564343432383364323833646632343133623063383339626131
+66313864323462633338346166643533633832353862353431376133323130633034376534616235
-38633638656232306161383961383665316638666166663038353266303233396234303263333162
+65343434373539613233393335386262303731323662323934653864613530396333393730343836
-37306338363434613738643361663861613963643537353831316639323831346231633736356662
+62316138363530303664306633666438316331313935313433373238303364613964396166623265
-66623637393165623566636437636438626634323862316662386465653437666336376632373735
+32646639623663323762346130613863356330353661336463333634373962653132356261383834
-30343634393133653536616366383762323933316531343864363439616139663539663736336631
+64336231333163343538383232343130646233333332303765653564326639616130346666626334
-66376430383436313838656337653465353736396430643334356339343533373634313136336337
+63363635613965393930613736356263633661326163313839306165663431336332623531383939
-37633938353336336231383531376333653838613233363265646337353936363135313030303164
+62356230613831353535363064326562623065653663643864323336336437393237633835623235
-31376632663165383863373332313561633836363464626633626661363936643432333365666131
+36366230316234346430323162346433336133353730653564366131323962393463333830303761
-31643033636434356335363439633263343831326434316435616530666563613638326231323639
+38333961616537323563306262366463336162633032636435343637383930663739656466333135
-37333466613934636332303738313362623364353133383037383366356333663935396566633431
+36653765613134646663376663353437303839323738363639636263633532333938613461363466
-30373532326236626238396666643235303739383961663466643765373932653462356636653863
+33323631333137633364646638656435343633346465623862333635323332336630643738633464
-65396130343236653334323031626536663965313065336338643166623434336130623434383665
+34313038366665653262386132333038663134306561363762333864613832386631643037343838
-36613533316438366330393364373235326266616236363662396137666338613764633361656566
+39313863613636343432656561626331343763386561656366353164373164623963356332363234
-38633235616139363765666632363934303234633062363130663462316462666439383736353232
+36353063313931643033386131343734343239646162393165666162646561333636376337663233
-30383932396462306430663839326433303834373965663466643264663436633433656663613434
+62376435646562346332363533363165326261613835623061323833643134363435616530613062
-66356563373662626634333265333033303930653737303434303363346331303333373933336435
+62663630386661373961663031373866316230363639333265346264333565613064643966373135
-39633730613738373361383732373337666262363965656232323866316661313134396266666530
+33626466616263623239343765386265376464343964626434336133653837333835643932386534
-31346162373463383666656535386430373465646266623431653161616533393133613131313533
+66333831666238643137643639373865383231383933656364636133616232323866316538343261
-39383739613939393639616435653261323230663532363234613638303831313833326233366131
+35656236373236646138383238353339353936643531353237383361323665636564366163366637
-39363165643531666337393661366563363131623235376665613633656162343131333637333663
+33323963316530346162373030336366626230323137613662396462343562303834343563363833
-30376331666661316130616163393435343535356465326133326335373333643738306331323430
+35643362306432646335616236633431646331636261323636643739303836396166343832623231
-33646462613065393334613833346565613964616665303933326139306230613465326433396439
+64633938386563396363613737383937616539616139376233336631643236656638353263373732
-64643031626663383166326630303038656530633064376339373864303438366335393064316537
+65656663633961383763363737316262643133633063326634313633626166653836363930646662
-63666532343164363166353036663336613433366636373437643830643732396462633635633764
+39303134373532363965396439613864393162373337636338396465643030323332636333333732
-63343433313062353666383135633330353431376532393430316561633334653966306439613663
+37386435633134653564643566356163316134613861373637306232306532343863643933316430
-31333934366161343361393438383164353965333565386262333737363535633663646665343032
+32636463346234326432386333636137346331623131613261393038356563333135653365376333
-30396434636435353766343065613635613364396638343966393831646236313131633131363839
+35353231376237343232666638323938393936663833393736316433326434646131353964353938
-38376539333131333763376161346634666137326464396432636562333538373962386239303761
+39346536323933303237346263646263303233373038613234393636313261373939636566636433
-37633662376633303366613962333830393430623563303734363965663865303532376134383130
+65613465623261396639343235646266336237623531306238326265393335393363396565623165
-34373335363664313536306465346534393834666264623261616465623962626262636332306636
+31303637613466643366366132636130643663393965306162346139626438393033633662383533
-39616161656334303438666432386366646336633832626237333231333833613738346631643961
+64343136303936363238343161346632343131643738326434363834643037383565383537373534
-39616137353738363461396635636336363335353838613938303465386131633038306130643533
+37626631333763376130383164326332303836313332626264313033313930656634626632376437
-38633839653937353663636630653966653432656462346237313063613338353631666439613861
+35656264656138323331643961626264323462306562323638346164363239616330333166356137
-30633030323165376435393965336139333133653939366533316636323032323764333834623964
+65636533633731653435353864343162636530346539306161353834336136313861646564646434
-37343561396131343763313334626137386534353639383935353934333738653762383736313235
+66646265636537376261643935626266346334643063663839346234396661323834623665393561
-33353233373133353631303238363934366339393838636266396432653361616162373963343065
+66313533653532663266326532623636316265613130316463336231343831336333376631653233
-36373862616164383037343538663532313363613164383264643763376564396264323134346337
+35623562303835383664633662633633613564306661346234303234663136653934366565336235
-37366261393436616566396431323265626334376662663964323963363262353332613662393737
+30303131623931333739306431376665613664613736326532313238633662643936323362366632
-65313066386237353764363435613866613435323236643436333561346536333964666562643732
+39313033653566653137303262663230343432653038376265633339613739363232316564356235
-39333739633232353630643333623238383461313530623435333263373562333564323464373430
+64373633663461613134646433646633393634353337653431646663323734353033346662346431
-66653031333763633662646631633561656262353462386538343462633533353662633065346461
+34633635343539353733383237333639333138353236613763346234393633323837656237383361
-37643437333265333337646631653765343036313638393638373035323534383036323039376338
+37643637376264656437376636313034386333306230643036333632636663356363653765313331
-31613361306332376639636562343261343865653765633130313464666230306238353135623062
+62356461623861623137653530393361636262633561626566316161353665333634316262626165
-31383638393064333763343139666663353531623533633033373039626564346436373439666331
+32346636646534363737643337363535323530366430373366336563356362366661303330636463
-38663961663032653238633036383438393465353563363439353437366266353139383766656631
+37643964616538343638303833646265623263653336373237343533373236326136633461346631
-65363032346433393166306131333131356339633561666134653432306661313663346566653238
+62326334643461356436653535366237653531373239616338393935353166656664393432313735
-38316231363933613561313936613163356337646337653033396562613564666133613336623533
+34653031353730636466323966363139633833393066303531313934366263313831346534386530
-63616235346262663666373239373832613835323238353039633737363030323166386230303734
+65616161623134626230393231313866616133613338616335333763653436333366363438353139
-36313637383430656433613236363462343466666361303933646665346366663235306333656366
+63363430626230343638333866653165646638616435383038653936373436623566303666626461
-34316663343962363561636166313265396363636233303830646633626663353933663266366363
+63333730663937346166363136353466373832303939373139393035393230383937393363646365
-30393131313361353637663864636466323436663330343534353535643430303162633730383139
+35303432393739383034316237653033626265643338376639336364626431636333316136666531
-37343633323965333463613434326232346639383035326234383234623238333635633036353462
+34346566326139316365393561636165396361626637323335636165656161363461366632326330
-38303765643539336262656338633033366534373961373835643835633461646165656663613936
+31616535626335663339373034303064623035613131333562643934393665336537646535613732
-32373532663861646537323638613832333631323239343865396434636132656332366335323337
+33643733366463666464633564326461653237316436643831396163306633333334313263333333
-31663962366162363433353832386164333337386631653538656639383936383337623764636563
+66653434386265326563633765653534346138396433336232363133656632343164373638653065
-30383738346236623565333466323566306138373565376334396464343265383034326436323836
+61653737376134653630306139366530313566666133643634626631353463653834616239636662
-39323237396339653261626638373538383464313536343365333934306262633238383939626265
+36373365343530393635623366633162653362326237643236323862326132363236303837613837
-66626661336462366236346632316662386336353436623562356639376230386530353438616430
+39643135613263613532366537396337323533313538326664363039663638323564303764306337
-63316361626265356436343031383365323839626538393735393030666338343132663565376231
+66336166386638336338376534346338303832643134366662626466363535313530333430313162
-39623634623833333432383739346339306434383764633635613461383262316135663461393737
+33333961353437373732653431333430336632363033343661646361393962303636643764343330
-38346261323831643862383139333662666339663039386534386365656632366562633139613366
+39643061306533653564646232336639633935303366613435623030383437623165316433633335
-33326230353161313064633539333131646436376139623966326236343937616630626335656663
+35663337623938396561616266383634376663633565343763626131303430313339313236396362
-66303537633965376366303463333765613131663636373137613361363066326230643837636236
+39363831646435343338383530663064386262333030383364376330616362633333363532346262
-37316435393538353166313933313665363936303066363933336436386139303465613665386165
+31663135373464363238373231326163353834306233376436663663306666346437666162323835
-39366637313436366432623863306136363633303233313165646431656136613835623236623361
+38333564343663626365646231346338363261623664656232323732313034626436336161383830
-32333131666630336330393737396135666163346131326232306362316166343633326664623030
+38616132616165346366396566653664303631386133313032323431343530386135313933653432
-62313435623162356365623664643962343334313836333537663031343736636164383836343731
+65346436376232633639316338623434353639373163643939386166343437366637383262626139
-62316636643361666136363364643038353330373334353663646139623362636163366666343434
+37333031646264333139336664383636643663643630613761326661313935333361333131353630
-66383366643261333539333862336466376639303139666134393834336639386637376461653331
+31396337626565663538396439303332636231363266383037646562636163393761613332303036
-35343932343835323035623034323633383663616530386139616566666635343236363739613237
+35656236373839616663376231323930316636363133626639623538343136656561643063306539
-38653062383837653630323563343230303862623064306361633532356532343866373662343138
+30353961363234643134306633343930653431613034373464346139303232653337323864303166
-33636365613331396433663364616331313663333132373934663130336335613639313762373564
+61346364393765633431393037623138623038393236666334356430373830643965346661663537
-63363131346365613333633736323432386339373965623964626336626637316137346535326232
+30666133633864373034346639343036663630346261373361313039643263626164663635376661
-36363431313166626164363663303932366134313933303135613231366330663330623831633539
+66653633646339363263636334346131623662356335383466366164326435303135303336323732
-39623034343134303135643538396464316163393264353533623365613130393662626530636261
+33333831346633633563663065386661643035363336323262306131333262633063376530643738
-35656663373030663331316133646561363565356438666533316563393433623661616630336465
+33313939616334656464643238663962633635323636316361653363346231366131356661666162
-61383464366165343963623734346563616539356635356161376165356235306634636138633236
+33363836366666353735663336643836656663336639306262383765313435626633616263353132
-66643535373931363732653764383939663762373063663839363166333761353633316232393338
+35363166326165343539646336623933666636333236633863353266386162313134396135396538
-33343135623365393230303266633031343065346334363534383135343865346130653236333432
+31346337396633613930376166393064373161373432656136303633306566306433343630663631
-64383466323365313731326563386131616338663061316330323964643166636464626537643736
+33356533643163313039336565333633303937363634616535623434663066353566383735343637
-35656561353961613931613036653065363861353836386231646136643639373738643539353330
+64666166616462653337303731326366353261313661663762343563666565326566663065616339
-32373737323332636563356131346233303037336130336137383264343438373264363161643037
+30316235333738373630653635353462636137346538303462643632653664306635626566376464
-30353765393661343333366432353964383636373739346439333532336364316135343233336362
+65666266333937616461616233646130326231386662393166623463636139653839613030613964
-36383637313733653263386330663363376135633437356566343035356239306666613035666662
+35396535636637366232383764353835616233316538326237303862393463643934383439366562
-64613139303566363864303036613662636266333338386430366639356338313236633531623865
+64613033613265393930643464373939346533353331366337323131643932366161366636666630
-63636233666338373630333733396365643337373662656131313830616435333562643139313333
+34393863363337636561333931306362663936353565376635663262656133626530653233363635
-31316439663633363238316231633961613137643337306135326437643534376166666364333961
+65396462666431386333613761653738346438656330326464666430303162303263643632326561
-38353562663062373461393736623634616663373365643630366462656639633637363436643163
+33363135633961356137663631366665346533633562663664303837373730346236376132323735
-64306631653835616664303031383365643632316566383832323030643831303563336163636264
+39326137313437376434636436626335333134666163376231623130306634636330366236386139
-30653237376534323339613030366439373930316466326261356136383131323335306334613365
+32333563616339616536363430663362633537353661653136326131343437343738393330333966
-66623339643234656337643837623137326537306566383537366430333139313761663361393134
+63383265623961633864376465633232663536373962386631623161663063346463623339613534
-61313663313139356537396439316337386132343930626161366464373162306162343863313261
+30626165303866346437383364633066326330323165646561623538616235383234343234346334
-32656630636461633436306162396534313131626361363266393437353535306162326434653733
+31623961623762373966396235373161643738623631386462643764393366613937323738646235
-35623561616132343338363534383335393939333065633462643561366333333034636363386533
+34316638306663656137353366393261323132613839633733313336346633303939653231666664
-39333936663939383031356534363636383332613162323133396166303665653935376630636236
+62353232633131303631393035346239363936323633316366346631323362306238363365386134
-31633361363236353663303338363033633133613334616264663431633335353936373963383838
+63333837383734386130653061393966616463643234656566393238383035663765373837613561
-32343965396438663739646166366262323133333664386563643637373761323930383633333039
+61303035653762623536343630616465663166383266363865353137633034626131643863663261
-64616635633937346165613962643965633033663134306261383737313466313065323666366138
+61376464386434626139316532313133386132396338376232626466356532303566646138376662
-32633731363662306161353636333131623662336434366432303232306164323866646639616534
+34646462373634626333346166316232316663346330613237343439323564306266313632633264
-31613061656137643137343261366462386533636166313965656531633237386537636166316138
+39646436613033313865643038353933383431363461313537646463633963396237356336333931
-33353164313366343132636263626134656265343733646465383664653266623166616333666635
+33336364363836343863356565636436346236393435306638323531336263303562633932373230
-38343165396233343633393963616138333138303938643732393530343032663765663036643762
+36653337343930396163643663363333373563356261633833633137386134326138353536656134
-35373961303537613331323538323431343934386134663466336438323462343766653936353037
+64306530613632653535613535653266333639363334343339303436393163666431366164343834
-62303537373038323836636464643361346337393330316532353737333732366261303761373531
+65363031333533613930306433646333353232613336633230373563656361356538653366333130
-32323736336536356234643266383962623832656265303035376532663762306435323262363238
+61636665663234373430313965336334326366353163626265353063323735613766366662326634
-31353661663563653932336532646632623832343832373263376434313066303039646234373237
+37343763316431323733333834643466653638663464636232333664666337323739396539386366
-32626664343334613337386539343433336335303836616162616130613635306234343536396634
+65376566356233363064313138313035613765613035353838353265386264653136363235323031
-61633836373937656435383639373130376637393239333137396535306263303030343565306463
+34643830633361613265613732333766376363633165333866383637306438316430346333313430
-36653838323631356166363234353963353234363538353763326631366438343833626564616439
+37313230393139623633346666326566616465663638326164343764393666616166393363393365
-32386534653133383634623330653936363364366633646566623038386562626365386163363630
+36306636356333643333623334613961626132363135636630663537386230626532313262666565
-62366137633739373436633963623138366361343333666564663162346562383463666237353862
+64623135393063323239653930386463383065656262303365663536376136653139336331633332
-37383033636563393039396535383535343364353338353731303539393638633462353230643034
+64303663656136313430643231306638616361326461616666623234636366363436373464366366
-62656134346566366565646666666364646633626163623938653538353165396134636534353864
+36323733613730313233623466353765353962363934363230353231373265363435363135613338
-31643633653463313461613935663964326135376166633166313762363831636532363333353437
+64306236396561643064616631373366316162386538393734336263623033396564323665376465
-30333238323066316535303233646666613034333035383830383636633165333766663364383632
+63373462333865646265666161393263633632343537626438383833376164383635393566336539
-62303030643239383931333533636534356635363538303236396666373731336335313762626337
+61363666306466616334363561633561363435386537613233383965353330306337396663663631
-66393636353038333735326366613265653539613436303864353037316366613938356132356366
+33333335396432343365353430613662386330666464636266333731653661363833386234383763
-36376666343532353161323965653336313161373764623339626330656139623764633836343639
+36343330653533636361386536643339336630373338653333643736613062366439613031623238
-61366531353433646262303662303937306562353836626163353465393835633762353039326631
+32383463306165343538373765643939623361326263323838333333376462303762633134653635
-62393063343865616165393039323533653165376132303564316330363434643139393337353133
+37356236346462316466366461333730626333633539393035313264353162333931323365333962
-33353764333338656264643233316164613038346161383364383939626536353030346534356433
+39303261343566633735386665396134646537333866613532653065383463303062353930386430
-65366535343565393366626531623665353130323563646166366433633030653035356334353966
+65336666333561373466313066313135333732646262613063333866356336396130633330336434
-33346137633237363839383233313037663438663535623561653064356538623634336135313263
+32656365643464376431363161633732633064396336643134323338623731346163633039626665
-33623739333339616261646664646634306534323534386665303166386431336164666663646236
+35333062626233653733336563323864333666396361613564306534666633353466613434356632
-36396438653535393665666664653534353562303538656462346262316338343035303930633837
+39376233646134363263643164393766363730656161623666313862373566646462396365626234
-38656335663365636237356632623631623161653839373933366539353733323464386330386134
+35366132363264326463303932316561643939623732333939633466383234633763393435396135
-32343862623133633865313136663765366364646535326339633766333930323564386339383739
+34363734343466393930653436323861396334663966333533626165316562653730363262313065
-66353037343837303164303430316235303131306166366136313433363137346563306133616461
+38626666643639323462376639303862336164333065336534373337313133346563626635313534
-36653239323333356164636665353236353835636532623562326131323439323534316366616337
+33646662303831633130613938393231613062643165323464346462643764386461373637323636
-35366335323164356439646336663938343366316538383838323764663163663935613364663631
+62663437313135383339653065626465616564303539663363373964366334393339396361626635
-32653134613636393131623165353431376265313634396239306530393665303033393439636663
+64343430383661356237646630363362623033326133393236336136373165366666653762626637
-37386363643737386661643638303038363662623266353963613130663735356631366530643663
+65356630303135396263626139363331313038363064326436346436353765356431383165313337
-38613734373864353231363363396561303238353433373065356532303732353734613335616264
+34626633353166626663333431653436386337656365336133623662623433393364626536643438
-66613565633535323564616261353363363839326331623365383262663263366664336361643561
+33353666643934633066323565363963626138393066656632333466636632356438346165303462
-37393836323062313363386562633237353266336261383865333335356434336634303231306134
+30383032366539313039633335323438616234613233303435373833353864336138663165326331
-33373165663638623464633464623531383664333237323164633231373163336633613232323937
+61376330313132326530613634316333633339353066626238343361333666616231643031343566
-65616636393663623039623536663736636664333164363036356230653963623937356238613134
+63323232643238393463373264643934353630666165636339303933393264383832663764623437
-39393536613834386438343163316161613739303730633765643938313662356333613031613365
+36373262313934346562633333363861646539343666353532343938363366396464623436636434
-63613239303065633030666430396463383032333665383434646562306139356135616432666136
+38393439393937346263303430366263633566333336373265393837363639666464653538343930
-38613561363662303735323031626433636632616635613664386230303537396132633337366364
+61306163633339613838356661373131376165323664363366633663666633373134383162313732
-39303461373636623465383863396132393565636566313730393238306130333630343365656632
+62383433383362346135633435313563653466383864323236653164303262366363356238333363
-66316532643762663563376331666437666538343363356562343634333861353530613733313035
+65333936633365663134383364643962313739313735383665323762313131616161393266343336
-64366437393036363165316438383565633864383132343035333837663235356232646130363137
+64623930633932623464306438383039343133356235336132633936633562643165343532333564
-33386436393533626133626636393665666233366663313163323563653131363637323739323664
+66633339643837366339316631346561616331353961613333363037396264663866633831383932
-35653634616562376132363761373464323466393230616232343936666437316535303436323633
+66633863313535663138303538653131666665343038396430386435656666393966633436633866
-333637333634306336326535393964323138
+63366366653364356161616134613130303438613065643731313538393862363436393831323335
+33613063663162393338313136306262396634653535613030663136326232316364376333313962
+66343737646161643062353336373835613662636133363437656239623561346433363965663136
+34653837373535663564303932336439643162643135653936316361363566373265616462643763
+32643131663263353365316438626663623736353863373236646530353263623432393664363139
+31663331336233396639636133626333306134343232633866383030383462366533633461306131
+39393430346539323861393863306539613566666361376231613566346231326164376432303536
+38393930383335653133326236656630643233396465643233336632666130623034316332633930
+30396336643231653264333166653636663630643933343534663833646532323463363165326265
+66333837643664333230646236333339663732313532353838643638373237653636303433336139
+37353334393363363936383533623962303539343834316561643230393737343837646264623538
+64323364386635646531633938373161373832363439376530323861373437396365656437353264
+65643635656337336337623762373935613036356231356463613833393435326364373063353236
+38663137626331643462313733353563623237373664333234353832653030626435303535346263
+61373765376239333232616431643031333638626532326565613339346362626361353263306535
+37613764623537393730666364336264623434323739336235626237396137653637373839323930
+61386530656339363064323762376536333230313666356639363462633562646231656533646661
+62303265373962643838303236616538653731613962393136303861366637643535396666663336
+3864

tasks/base.yml

@@ -1,7 +1,4 @@
 ---
-- name: Ensure facts are gathered
-  setup:
-
 - name: Ensure debian-archive-keyring is installed
   apt:
     name: debian-archive-keyring
@@ -9,124 +6,34 @@
     update_cache: yes
   become: yes
 
-- name: Update cache
+- name: Update APT cache
   apt:
-    force_apt_get: yes
     update_cache: yes
+    force_apt_get: yes
   when: ansible_distribution in ['Debian', 'Ubuntu']
 
-- name: Update all packages to their latest version
+- name: Upgrade all installed packages to latest
   apt:
     name: "*"
-    force_apt_get: yes
     state: latest
+    force_apt_get: yes
+  become: yes
   when: ansible_distribution in ['Debian', 'Ubuntu']
-  register: upgrade_result
 
-- name: Upgrade all packages on servers
+- name: Dist-upgrade packages (handle removals and replacements)
   apt:
     upgrade: dist
     force_apt_get: yes
+  become: yes
   when: ansible_distribution in ['Debian', 'Ubuntu']
-  register: dist_upgrade_result
 
 - name: Install required packages
-  package:
+  apt:
     name: "{{ install_packages }}"
     state: present
   become: yes
-  register: install_result
   when: ansible_distribution in ['Debian', 'Ubuntu']
-
+  register: apt_result
-- name: Reboot if required after updates
-  reboot:
-    reboot_timeout: 600
-    test_command: whoami
-  when:
-    - upgrade_result.changed or dist_upgrade_result.changed or install_result.changed
-    - ansible_virtualization_type != "lxc"
-  become: yes
-
-- name: Gather facts after reboot
-  setup:
-
-# --- Upgrade Bookworm to Trixie ---
-- name: Upgrade Bookworm -> Trixie
-  block:
-    - name: Replace sources.list entries for Trixie
-      lineinfile:
-        path: /etc/apt/sources.list
-        regexp: "^deb "
-        line: "deb https://deb.debian.org/debian trixie main"
-      become: yes
-
-    - name: Update cache for Trixie
-      apt:
-        update_cache: yes
-        force_apt_get: yes
-
-    - name: Dist-upgrade to Trixie
-      apt:
-        upgrade: dist
-        force_apt_get: yes
-      register: trixie_upgrade
-
-    - name: Reboot to apply Trixie
-      reboot:
-        reboot_timeout: 600
-        test_command: whoami
-      when:
-        - trixie_upgrade.changed
-        - ansible_virtualization_type != "lxc"
-  when: ansible_distribution_release == "bookworm"
-
-  become: yes
-
-# --- Move to Trixie sources.list.d layout ---
-- name: Remove old sources.list.d
-  file:
-    path: /etc/apt/sources.list.d
-    state: absent
-  become: yes
-
-- name: Remove old sources.list
-  file:
-    path: /etc/apt/sources.list
-    state: absent
-  become: yes
-
-- name: Ensure sources.list.d directory exists
-  file:
-    path: /etc/apt/sources.list.d
-    state: directory
-    mode: 0755
-  become: yes
-
-- name: Create Trixie sources.list.d
-  copy:
-    dest: /etc/apt/sources.list.d/debian.sources
-    content: |
-      Types: deb deb-src
-      URIs: https://deb.debian.org/debian
-      Suites: trixie trixie-updates trixie-backports
-      Components: main
-      Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
-
-      Types: deb deb-src
-      URIs: https://deb.debian.org/debian-security
-      Suites: trixie-security
-      Components: main
-      Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
-    owner: root
-    group: root
-    mode: 0644
-  become: yes
-
-- name: Update APT cache after moving to sources.list.d layout
-  apt:
-    update_cache: yes
-    force_apt_get: yes
-  become: yes
 
 - name: Find all EXTERNALLY-MANAGED files under /usr/lib/python*
   find:
@@ -144,81 +51,3 @@
   loop: "{{ externally_managed_files.files }}"
   when: externally_managed_files.matched > 0
   become: yes
-# - name: Download Oh My Zsh installation script
-#   get_url:
-#     url: https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh
-#     dest: /tmp/install_ohmyzsh.sh
-
-# - name: Run Oh My Zsh installation script
-#   become: no
-#   command: sh /tmp/install_ohmyzsh.sh --unattended
-#   register: ohmyzsh_result
-#   failed_when: "'FAILED' in ohmyzsh_result.stderr"
-
-# - name: Download zsh Dracula Theme
-#   become: no
-#   unarchive:
-#     src: https://github.com/dracula/zsh/archive/refs/heads/master.zip
-#     dest: "/tmp"
-#     remote_src: yes
-
-# - name: Download moe theme for zsh
-#   become: no
-#   get_url:
-#     url: https://git.comprofix.com/mmckinnon/dotfiles/raw/branch/master/oh-my-zsh/moe.zsh-theme
-#     dest: "/home/{{ ansible_user }}/.oh-my-zsh/themes"
-#     force: true
-
-# - name: Move zsh theme to correct folder
-#   become: no
-#   copy:
-#     src: /tmp/zsh-master/
-#     dest: /home/{{ ansible_user }}/.oh-my-zsh/themes
-#     remote_src: yes
-
-# - name: Create vim config paths
-#   become: no
-#   file:
-#     path: "/home/{{ ansible_user }}/.vim/pack/themes/start/dracula"
-#     state: directory
-
-# - name: Download vim Dracula Theme
-#   become: no
-#   unarchive:
-#     src: https://github.com/dracula/vim/archive/refs/heads/master.zip
-#     dest: "/tmp"
-#     remote_src: yes
-
-# - name: Move vim theme to correct folder
-#   become: no
-#   copy:
-#     src: /tmp/vim-master/
-#     dest: /home/{{ ansible_user }}/.vim/pack/themes/start/dracula
-#     remote_src: yes
-
-# - name: Get zsh config
-#   become: no
-#   get_url:
-#     url: https://git.comprofix.com/mmckinnon/dotfiles/raw/branch/master/zsh/zshrc
-#     dest: "/home/{{ ansible_user }}/.zshrc"
-#     force: true
-
-# - name: Get vim config
-#   become: no
-#   get_url:
-#     url: https://git.comprofix.com/mmckinnon/dotfiles/raw/branch/master/vim/vimrc
-#     dest: "/home/{{ ansible_user }}/.vimrc"
-#     force: true
-
-# - name: Set shell zsh
-#   user:
-#     name: "{{ ansible_user }}"
-#     shell: /bin/zsh
-
-# - name: Set moe theme for zsh
-#   become: no
-#   ansible.builtin.lineinfile:
-#     path: "/home/{{ansible_user}}/.zshrc"
-#     regexp: '^ZSH_THEME="dracula"'
-#     line: 'ZSH_THEME="moe"'
-

tasks/dozzle-agent.yml

@@ -2,7 +2,7 @@
 - name: Create the dozzle container
   docker_container:
     name: dozzle_agent
-    image: amir20/dozzle:v8.13.13
+    image: amir20/dozzle:v8.14.4
     restart_policy: unless-stopped
     command: agent
     recreate: true

tasks/dozzle.yml

@@ -10,7 +10,7 @@
 - name: Create the dozzle container
   docker_container:
     name: dozzle
-    image: amir20/dozzle:v8.13.13
+    image: amir20/dozzle:v8.14.4
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/gitea-runner-homelab.yml

@@ -39,4 +39,4 @@
       GITEA_INSTANCE_URL: "https://git.comprofix.com"
       GITEA_RUNNER_REGISTRATION_TOKEN: "{{ GITEA_RUNNER_TOKEN }}"
       GITEA_RUNNER_NAME: "homelab-runner"
-      GITEA_RUNNER_LABELS: "alpine-latest:docker://alpine:latest,ubuntu-latest:docker://node:22-trixie,homelab-latest:docker://git.comprofix.com/mmckinnon/debian-latest:2025.08.31-093853"
+      GITEA_RUNNER_LABELS: "alpine-latest:docker://{{ alpine_latest_image }},ubuntu-latest:docker://{{ ubuntu_latest_image }},homelab-latest:docker://{{ debian_latest_image }}"

tasks/gitea.yml

@@ -94,7 +94,7 @@
       GITEA_INSTANCE_URL: "https://git.comprofix.com"
       GITEA_RUNNER_REGISTRATION_TOKEN: "{{ GITEA_RUNNER_TOKEN }}"
       GITEA_RUNNER_NAME: "gitea-runner"
-      GITEA_RUNNER_LABELS: "alpine-latest:docker://alpine:latest,ubuntu-latest:docker://node:22-trixie,vps-latest:docker://git.comprofix.com/mmckinnon/debian-latest:2025.08.31-093853"
+      GITEA_RUNNER_LABELS: "alpine-latest:docker://{{ alpine_latest_image }},ubuntu-latest:docker://{{ ubuntu_latest_image }},vps-latest:docker://{{ debian_latest_image }}"
 
 - name: Create directories
   file:
@@ -106,7 +106,7 @@
 - name: Create the opengist container
   docker_container:
     name: opengist
-    image: ghcr.io/thomiceli/opengist:1.10
+    image: ghcr.io/thomiceli/opengist:1.11
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/gotify.yml

@@ -10,7 +10,7 @@
 - name: Create the gotify container
   docker_container:
     name: gotify
-    image: gotify/server:2.6.3
+    image: gotify/server:2.7.3
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/homepage.yml

@@ -16,7 +16,7 @@
 - name: Create the homepage container
   docker_container:
     name: homepage
-    image: ghcr.io/gethomepage/homepage:v1.4.6
+    image: ghcr.io/gethomepage/homepage:v1.5.0
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/lidarr.yml

@@ -14,7 +14,7 @@
 - name: Create the lidarr container
   docker_container:
     name: lidarr
-    image: ghcr.io/linuxserver/lidarr:latest@sha256:186bc4d3f22bd6a71c235c1c7f57f90a8473f766278d9c929398fb5ce90eae7e
+    image: ghcr.io/linuxserver/lidarr:latest@sha256:2452f5df3b6e3a267c419382a1e492c6831a5e46a01c3aec11c61a7810e15d6f
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/mealie.yml

@@ -10,7 +10,7 @@
 - name: Create the mealie container
   docker_container:
     name: mealie
-    image: ghcr.io/mealie-recipes/mealie:v3.1.2
+    image: ghcr.io/mealie-recipes/mealie:v3.3.1
     restart_policy: unless-stopped
     networks:
       - name: proxy

tasks/mediawiki.yml

@@ -9,7 +9,7 @@
 - name: Create the wiki container
   docker_container:
     name: mediawiki
-    image: mediawiki:1.44.0
+    image: mediawiki:1.44.2
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/mssql.yml

@@ -0,0 +1,30 @@
+---
+- name: Create directories
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items:
+    - "{{ data_folder }}/mssql"
+    - "{{ data_folder }}/mssql/data"
+    - "{{ data_folder }}/mssql/log"
+    - "{{ data_folder }}/mssql/secrets"
+
+- name: Create the mssql container
+  docker_container:
+    name: mssql
+    image: mcr.microsoft.com/mssql/server:2025-latest@sha256:2c80e548ef65fb65a8ca23c3a74ed60e0964ea709f46d07c97ccaf7c437e2cc6
+    user: root
+    restart_policy: unless-stopped
+    recreate: true
+    ports:
+      - 1433:1433
+    env:
+      PUID: "0"
+      PGID: "0"
+      ACCEPT_EULA: "Y"
+      MSSQL_PID: "Express"
+      SA_PASSWORD: "{{ SA_PASSWORD }}"
+    volumes:
+      - "{{ data_folder }}/mssql/data:/var/opt/mssql/data"
+      - "{{ data_folder }}/mssql/log:/var/opt/mssql/log"
+      - "{{ data_folder }}/mssql/secrets:/var/opt/mssql/secrets"

tasks/speedtest.yml

@@ -11,7 +11,7 @@
 - name: Create the speedtest container
   docker_container:
     name: speedtest
-    image: lscr.io/linuxserver/speedtest-tracker:1.6.6
+    image: lscr.io/linuxserver/speedtest-tracker:1.6.8
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/vaultwarden.yml

@@ -43,7 +43,7 @@
 - name: Create the vaultwarden container
   docker_container:
     name: vaultwardenbackup
-    image: ttionya/vaultwarden-backup:1.25.1
+    image: ttionya/vaultwarden-backup:1.25.2
     restart_policy: unless-stopped
     recreate: true
     env:

vars/gitea-images.yml

@@ -0,0 +1,3 @@
+alpine_latest_image: "alpine:latest"
+ubuntu_latest_image: "node:22-trixie"
+debian_latest_image: "git.comprofix.com/mmckinnon/debian-latest:2025.08.31-093853"