.gitea/workflows/deploy-containers.yml

@@ -1,34 +0,0 @@
-name: Deploy
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  deploy:
-    name: Prepare Build
-    runs-on: homelab
-    container: git.comprofix.com/mmckinnon/alpine-runner:latest
-    steps:
-            
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      
-      - name: Deploy containers
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_KNOWN_HOSTS }}" >> ~/.ssh/known_hosts
-          chmod 644 ~/.ssh/known_hosts
-          eval $(ssh-agent -s)
-          ssh-add <(echo "${{ secrets.SSH_PRIVATE_KEY }}")
-          echo "HOST *" > ~/.ssh/config
-          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

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-changed_tasks=($(git diff --name-only $1 $2 | grep '\.yml$'))
-if [ ! -z "$changed_tasks" ]; then
-    for task in "${changed_tasks[@]}"; do
-        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
-           /root/.local/bin/ansible-playbook main.yml --tags "$tag" --vault-password-file ~/.vault_password.txt          
-        fi
-    done
-else
-    echo "No changes detected in task files. Skipping Ansible playbook execution."
-fi

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 }}"
@@ -39,11 +33,9 @@
     
     - 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: http://mirror.amaze.com.au/debian|g" /etc/cloud/cloud.cfg'
-        virt-customize -a {{ image.dest }} --run-command 'apt update'
         virt-customize -a {{ image.dest }} --install qemu-guest-agent
+        virt-customize -a {{ image.dest }} --install vim
+        virt-customize -a {{ image.dest }} --install git
   
     - name: Create new VM template from cloud-init image
       community.general.proxmox_kvm:
@@ -65,6 +57,9 @@
         ostype: "l26"
         vga: std
         scsihw: 'virtio-scsi-single'
+        #scsi:
+          #scsi0: "{{ storage_target }}:0,iothread=1,discard=on,import-from={{ image.dest }},format=raw"
+          #scsi0: "{{ storage_target }}:0,import-from=/tmp/debian-12-generic-amd64.qcow2,format=raw"
         net:
           net0: 'virtio,bridge=vmbr0,firewall=1,tag=10'
         ipconfig:
@@ -73,6 +68,10 @@
         timeout: 600
         vmid: 10000
     
+    # - name: Pause for 5 seconds while template imported
+    #   ansible.builtin.pause:
+    #     seconds: 10
+    
     - 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"

frigate.yml

@@ -1,10 +0,0 @@
----
-- hosts: frigate
-  become: yes
-  pre_tasks:
-    - name: Base Install
-      include_tasks: tasks/base.yml
-  roles:
-    - role: docker
-      tags: docker_install
-  tags: frigate_install

group_vars/all.yml

@@ -1,124 +1,100 @@
 $ANSIBLE_VAULT;1.1;AES256
-64666538613930336534626435636161313765343038323937626463636132316363323332383130
+64343839626330386331646462663462663936396466316130313266623633613262616431383731
-3561653634376466666463396533386262646263363131660a653332633232343538336261343162
+3365393436363336313633323031326666363736643632310a393631396465396363323335313230
-39663935303636396635616138363634303965663863393033653162376438336638366635343865
+36393861303062623565353632333262393431373861363239356431353931323630623563373035
-3035336538623866340a313532396237636465613437346562356132313763643139383963393962
+3832383534326139640a373832303461623665303530623138653962613062336665306132346261
-30383030316639633465376638633630393337313438643437643361346363306538636663306263
+63346134666631623338383961353066373264346365343365646565313336626266383135343831
-31613733393332633834613131333936666364323164386432396337636634623731316666326132
+61363132333634313233396364303631343436383630346232343863623163643536363031656565
-63663435346233376638313664383834303065393461616533663536323661626338386462363335
+63383239643335663833383366633237336266663965353964666632393963343432333161393238
-62303230313737663238663833636339373731356231336430653534613633396134616433616135
+62613965623834393866366630303131353830373764313139316263326235363531643661646134
-33623332373839366631346166636234623365643730616139346632623662653136363032636466
+38313431303163333764616230336565643466653632373563343466383630303830343261646639
-66633737316131663264663439363639663234353335663532316461646336353637616435633334
+38666666393831346365356338643366393234343261373763643938366265316232383139323232
-34396232383334626365323261643530663263396431636434616530343930373132363865386165
+65386535633330383831653638343238623066316161623862326130366431333131313033653538
-66666439313337363161393532666264633362326330343933643132383739323361336139643163
+30653964363163393033626439333037646236376135646362363735363438383462336333313161
-65626434393030343064623833633463616633336334616464383531333435646434313761316531
+34356632646562373738333233626635333662373134343232363235386236393039356666656538
-34623832656231616531323230386632393263356366613539373363383261323063383431333836
+39316439373837303133666261663732623730366666313363363330616537373039363661383338
-64623035326134383535353366643630636131326265643365336134333737643933613866343539
+37376535653066613532376333393963353734346536383630393864316334646263376132646434
-30663830356430383732343531613635653266306534363237353563626265303831366162633438
+37633630373734666636613639646631643039396666346161383435653739653737633239623436
-30663338613739666161373035653464356238393465663431313162393636363561386261613665
+39623364616463646665643261653738343635663933323935343162653335656334346338376166
-32303232386531666635626435306664616532363634313461303639613633393038613236653133
+36616334646337383230633361373663666534336261653838346262346630653263303236363465
-61616636363138666336353831383936653566656238626139313032633061623735623463313432
+35366139653766663731393864356465616336353862383636633962323865353431646133323930
-61323631366336623333366665383535313461363634313435393539386430613237396239333739
+65303563646535663530643664373861373938313561633366343466346532626632323136373563
-36306230346664363832393437333935333962356433323333393038613232306433643765323566
+62383963393031353531373664336635303338323137323864376330343830323161623130393932
-65663266653561643335353738383863623634326562633162643934636131373864366635353363
+36316538346637343430323735323338366463396233366238653532623336636562376538313038
-64346632643763383934353462623134356430373866633566656561316665323439356435333432
+34343066623366656335326461316538643466346166643432663766316465386130623139373436
-64636365303661636561363665316333663032633139663761363161623938613938623335656461
+64306230646338336632363134616430653634356262613066363834373339376363333439356234
-36373061653333646263363965306666643261396433383831366634373865353130306239313937
+62663336633830393366336561343366626266613336363639616566376266303431323861323164
-62646532383666376262666539323739366634653135363131626336613733653630336635333233
+63346638376564396161303634343765386661653461666266303566346365356664303038383362
-66643136653564346334386565326637373265656136346134333563373866396437656462313934
+61393938383761313839373634353763613532623135383331393934376135383330303331383834
-35663031396362303630623538643230346235333136336332313763386430343165363034323734
+31323664623338613161316464326432313764346432323236623237623232356139613664633935
-62393466623235376161646264636463376165376465613036633064326565363638303230376362
+34316431323835306331316232656534346439356236353235313231363163633332643030613530
-38616233343761346165623064336563666537343238643133656430613062366464626633343961
+30386435326535663533643237326439616666656261363638343664366633366532333037626139
-32386432343035383730626632396238336462316166633030666162316330303938303038313064
+32393939323833386665663931376337613433646439633163326166613035326639623462306166
-34363931313865626661616362323330303039383537623936346564356361316232613033373362
+65616433373264323663663839356637316466633836343233336666393435366535333732623666
-61366365643661623430613233393934626237613036643464313937383033386666353130636330
+63656433323039666564613734393836353238623433393165616633383231613763346163306239
-38376531333330393837313366356261313162373361316266333430666136303036316365643665
+64373338656431353336633130373635306666646430356266343566663063663036376339366162
-63306139313965363238343831616164353263666333333566343430646639363837636437613766
+39326133386437623663643831633666396231336331326136303761656363326132643338343361
-31313938306330343835306137663232623166356639633161623863333435626565656662353430
+32386365373932336561333366616437663235643832303834663737666564393333316464646136
-32616131336339336461643266373461396538383931393732303564336665646138313166376334
+31306533373133383362393465613238366265653464313730383937636338343938366563393033
-36303438393132353730323530666263653531376436633532373036386439616463356131653565
+34613238343333333663363132386162323033373331626339386636653435353063613634343738
-64316333626635323664646235613661353237616663613866346638616565623131393837666662
+63313235323465383839383165323561646337633862326431646165326236373032323561386266
-30653830346238383966626337313839626530303734386436306336333361343537356339323965
+36373034643862623937336633666637666662303134646137383930663865383832333630303033
-32666539336635383065316136336166396664393333373235386162393162376163616137626638
+32313832353134333439396563366266393832663638383530663438663963663634376666613463
-32626539653864303437323966303064353761396563663764393662326139353936346665306664
+61636531376166313463613365333435623032393634636130366261643961636534323064303066
-62306665363235343166656661663631663531353636336162636338386130616630366339346533
+35373934653163303337316237643230336463353366633432666430316362646534623730376231
-64636231653835626538303638383432633866363166343837616666663132656566313435313834
+33363661396233393662643435373263633836343237316336346138313663626533636231363739
-31373966313737623033333432656462646439366133623361326339326236643966623131643130
+39646238633766303535333662646361396462323539626365346534653762323764313836613136
-62666433366238633239663866666236633965623937393362633333396565306466343537353535
+30363766646365346165353163383335656531383230353536616432616331306661333837366430
-35376236643335323437386363616530373861303665333431313839363533323737636533376639
+65653431376133303531356231663136626562346336373738386266303262646263353862356361
-37666463356539336365363234393065613962623366623663353066313736666132633966363537
+65333337363864326466623361323461363361346262323031393130386435323063616261333237
-36313238343739376238376337373364626239346336383035643964396461346433366331363135
+33303238386533623265386237333432616361366661623333316532386563336632396161323861
-36343938303234633462653737633162666536363834333334366230616136623261643137323462
+37333833316664646539363364323163323264636133643030323631333430333030346561356332
-33336466396665343762313261396466313235663638323830363931616361663061623031306565
+34336362396136656230383837393332316130363438396538323462623033666465383633656233
-62383337383736353838333632363562613262303265663437643332613931326362633032373233
+65306637633764613130376233333130306263656530616430383265626639613566653836373165
-39336432316138393535633163366462646630636130343765633562393731383133613139646130
+66303838633033643137303739336337333936653833353035346263633463353365306333353338
-32636134656239623136653836616165383136353732393265636633623032383136386331393061
+31383162326334393536393664373137646332626536393266323932303038663038343665613437
-33356437373831626431653933643135343164383664326136363238636664613234613839663935
+64353264396561643665303831626361353136316463626334303630306430646161393131313065
-35646639353761383764663363353739326439656265303836633765663161383564633463633339
+38396536373933306330356434333861306434393962313436386464613631303165366535366463
-32353639656162366533633437646661363535326164376134663463623062366631363563336331
+39316636326362326336333130336436613532366334613439373637636465336636323334303833
-33336538623066333061363436623131303464383961393233333664306331326165663362613062
+35353061643865356138303662656633633763303461653137323965376133613236383061356330
-64626432303762326164616234303064346662383566303562353931353463313332353861333164
+62326637666434353135363735346534363666396262383638373763626534343337643037643439
-33323062383334323935656333353938373838613338313230306231343533663066633436613535
+61306266663662646464636432303631373736633033646131656431373531346331356530363139
-33616537383534613930643366623065646666303861636130633938636637336339386461323839
+39366264386438643564346664353762303837613435393766613832376561613261623831653666
-63623531336138396335613839333961333939353038646539616532353162323933616564393964
+35343236666661346361306438633061616534636433353462643337373331306130653134613231
-31636362303731643935353535393632343962363333613863313361326365346164326130303563
+35326562373737623364363561323333353839633637623039653338653134643437393331396637
-62316338623862323931616661626333646562316565653433323234373736653837636134303337
+34663535653439333663343239636335333265643232383637383264393635313532313466633232
-63393736346130323063323862663238323066616636353139643565386332363339353735653832
+36373562646239383638396532653130646263366262373932363930313339396462356530383739
-32393861613731373561623738316432663665336161323064656436396663366436613663363137
+34393235646234386532393630373436353834336637643435346630633961663638333839366132
-35643232346530613436346438313537633664373434356262353933666263653965376438363231
+32666337366566346166343236303736643631386131373762386463633535623433336131353631
-63343931623638316337386335333163353034393465333861666136633865366136656161656330
+62663036633866666162383833353666323763343337656362626166363164326562386436623662
-65343961343561353438373266646239653561313836616232613836373264306537396663656365
+39323538653337626231303336666264663530346564613465613530643230333934613465373465
-31383030663035343462643266343239393866343537396335326530353163363732633138383634
+62366137633532616335623530323961663830616663613938316437646630383434643430386433
-33306536663565373865366237356434326439376437373966393532333262313938633030313838
+39373839636538303239646436366339656333353365343138313364643234346236316162616430
-32353638396164643162636131623639653466363238666562383832613838656137376532353561
+31323238393135636165336636633336633232386661613762326563323638626533303034346131
-34333233306639623139623662613733623363343563366239393038383737343961386461643630
+31323433316261633232383562646566376266633466643637366366346235333934623462636431
-38343032653061326237623166663061313831626461393165613439366363316232646461633162
+37623135316634616334353062373139653865633934393930393364343430626163663064343533
-32373234366631393831666531633062333061353032333965616632336333613531303533363134
+34616430663232356231343831306662666432373937316661346462643231343539643561363862
-39333434333563346164396333383534366430666232343039383032623637653163333735663761
+30353636353362653366353438346531666637663763636138666366306339373633306335323537
-30303634316530633461353632663665353765393733326234623963396264346233313834353539
+38393461303261666437393639363265373531643534373163633161646164616664663139333361
-32653133363832633731633135333863386163393363623664356166633863653334363466616234
+62303062623833333537626332353062366566663138376364373062363664366438323039353735
-33663666623135343066633062303930616463376238353436303730323663623338313736353135
+63303236336235316431343330356138376361643766646535363364363739343563623831336466
-62373664306237303039633366623163623731316566393530626631393430663738366634623961
+62303462393033373631616236656664373431333532383935383663383762353763336663373039
-37663033373962313238386136646565356565343066396237313265313364393062363063616236
+30656162333762363139393961663632316538393638316633633663393361363237366262383235
-37303035616665393031323665613334323234343235303862346539613462326337393363613534
+34383964643933633839303736633633653566353836363230353438336134396566656664646434
-65646331396336333638636239613930323561646438613139326635366433316331363931646538
+64326436636435323137363239656131303162646635373736656663353630303630336164353165
-66313562366261373539663664386636303735313764393163346634653863343461623938393933
+35333066396132393337383431383862623437306430313730363633333138383232633431613262
-32623465306137653634373765333132346263343334306330666137303637363961303839633030
+39353564303035666235303364393664376264323466643135373433656562656132346431396264
-35323565363463366433646661326435653765636665343139373635303163633730363037333264
+63656461383438363736386633343835643063613932613339366132663963666466313132663033
-31326566643965373764366438623462313237353435326161616537363238666363636236653631
+66633265323939653437373764353161623963636437663563613238323561633735643036346634
-32623638356362363533396263336632326164346366373336343963653865636561316431376233
+32656539356135373163353533313733393932333766643730663239363163336666653039393531
-30653939323561336634343337303136316137396539376538303237623134346164393838626266
+36613535663561323037613930306430323864366432633065356665383263636439633333323332
-62313535373737343731313635636232373933316235353930356362656666316331626631346536
+36353364626465323338326634646439633836616534333763626265393732623039306639393838
-31646535633062663132316335356564643132373334333736656165643661306232313031613233
+38363063386462383165316362353234623832306237396131316365343664666232643530363338
-34356535373264336438626636306263333230383761366533323433376335313530643339653062
+66306331633361333762303337363061643664396335303135656235653537396433326230653863
-37306533383664386265316262613831373836303966363961376531313337386137353634333133
+63363466363135333834346264613432653532336534643938616362643064656665393939306437
-38353166353739346463383465656362363537656262363537643262333961353264316639376235
+39326366343239663461643262636564363632636431326134656163343862393731643133343637
-62613737643035303930303065663331333239653531636434353663653164363838633135363836
+63353134656464616531373835323637363861316535663564313735356662313931313833373239
-31356161666631333037626137623738626333656331633261366436336337316230656165633631
+30393463316665616439303064356438383665313832656139323737366234313732353136346364
-33326265633365353831363530333533393731666261343730643633373635393062353132326164
+31353163393535356164386561323838623235383630666633346130353939633564346366373236
-65653431623539333363386336666134633630646436393437663539353561353634303634623136
+34393332373438666461333061323430383663626436663735336636643531366539643439623636
-38343665343532636364316364376662313966316532343135356138643262653363656434363238
+373264356538616535636564643665356562
-62636330353735666131646363316133346464393135313762353863623063346661383063336132
-33626238653061306364313765386666326237383131353664313564343764663666356563643463
-39373261346161353161363539323166623032346364303834663865386462663738303265613132
-62643266356236343962353331303337333535646231656163666433386333303830666362393733
-64346435656632643239343836303134356265643635356465636166396334663536323762613062
-66373964653563646135643763343031353366333936363636346331396462313033393965613564
-32656232613061373035623661386564666566313636663030366662646163376135386539353865
-63326139353135356666373436653832626234366639656337333465336339306339613232613363
-61356237313631636131366632663330373131633832363135326362376237626264306232663338
-38323539613862353464326264373064386430633432356336363337643739653935643130316439
-36653834656237633030623031643763313365346333376635663064363866313831303537303665
-32316336643530373431626539663731316136376331366332623433626538353235346135616162
-36313961343166636463663033373839366636326261323562323762633164656539393165333265
-64396233616132636437396335393066643838373465363931336266346261656461343935393838
-66343366393630666639303533386136633835353631326530373536323866343933636634343930
-33366231623764666137393464656634336530333732613838393539393136363338626337363939
-34356337623965656137643439333265626437373563383337353836356330316333386464393832
-37626536386539353266393762333534393837386533313632616464303866383833613161313564
-31653936653638633035353936333234383935633638633237313638353563373539626634323566
-63656330633938366133643430383237313866613166646334383937633164376330623264666162
-37643837343037393063383263373238363734366338346635373036373033393263333563343931
-31656337343037316563646165623934333038303063323938656339613139353466643834623933
-36656538363961316161613139323038323663323737356433363930326461383763643062323639
-636136323230393862353433343232626464

group_vars/all.yml-templace

@@ -1,82 +0,0 @@
----
-ansible_user: administrator
-data_folder: "/data"
-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
-
-  
-
-MYSQL_ROOT_PASSWORD: MYSQLPASSWORD
-MYSQL_HOST: MYSQLHOSTNAME
-
-MAIL_HOST: SMTPHOST
-MAIL_PORT: 25
-MAIL_FROM: emailfrom@email.com
-MAIL_FROM_NAME: EMAIL NAME
-MAIL_ADMIN: emailadmin@email.com
-
-#Postgres
-POSTGRES_PASSWORD: POSTGRESADMIN
-
-# Proxmox API variables
-api_host: "{{ ansible_host }}" 
-api_user: root@pam 
-api_password: APIPASSWORD 
-api_token_id: APIID
-api_token_secret: xxxxxxx
-
-# Proxmox node target
-node_target: pve
-
-# VM storage target
-storage_target: local-zfs
-
-#Gitea
-gitea_db_root_password: "GITEA_ROOT_PASSWORD"
-gitea_db_user: "GITEA_DBUSER
-gitea_db_password: "GITEA_DBPASS"
-
-OG_GITEA_KEY: xxxxxxx
-OG_GITEA_SECRET: xxxxxxx
-
-# Invoice Ninja Variables
-IN_APP_KEY: base64:xxxxxx
-IN_APP_URL: https://invoice.ninja.com
-IN_DB_DATABASE: invoiceninja
-IN_DB_USERNAME: invoiceninja
-IN_DB_PASSWORD: invoiceninja
-
-#Speedtest-Tracker
-ST_DATABASE: speedtest_tracker
-ST_DB_USERNAME: speedtest_dbuser
-ST_DB_PASSWORD: speedtest_dbpass
-
-GITEA_RUNNER_TOKEN: gitea_runner_token
-
-VAULTWARDEN_BACKUP_ZIP_PASSWORD: vaultwarden_password
-
-TEAMS: webhook_teams_url
-

hosts

@@ -1,15 +1,9 @@
-[proxmox]
-pve2.comprofix.xyz ansible_user=root
-
 [cloud] 
 vps02.comprofix.com
 
 [docker]
 docker.comprofix.xyz
 
-[omada]
-omada-lxc.comprofix.xyz ansible_user=root
 
-[vps]
+
-vps01.comprofix.com
 

main.yml

@@ -1,4 +1,5 @@
 ---
+
 - hosts: all
   name: Configure all servers
   tasks:
@@ -16,15 +17,6 @@
 - 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
    
@@ -34,6 +26,7 @@
       tags: traefik_install
 
   tasks: 
+
     - name: Deploy Vaultwarden
       import_tasks: tasks/vaultwarden.yml
       tags: vaultwarden_install
@@ -41,33 +34,11 @@
     - name: Deploy gitea
       import_tasks: tasks/gitea.yml
       tags: gitea_install
-
-    - name: Uptime-kuma
-      import_tasks: tasks/uptimekuma.yml
-      tags: uptimekuma_install
-
-    - name: Gotify
-      import_tasks: tasks/gotify.yml
-      tags: gotify_install
   tags: cloud_install
 
 - hosts: docker
   become: yes
-  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
@@ -81,6 +52,7 @@
         traefik_host: traefik02.comprofix.xyz
       tags: traefik_install
   tasks:
+
     - name: Deploy comprofix.com website
       import_tasks: tasks/comprofix.com.yml
       tags: comprofix_install
@@ -129,9 +101,9 @@
       import_tasks: tasks/radarr.yml
       tags: radarr_install
 
-    # - name: Deploy readarr
+    - name: Deploy readarr
-    #   import_tasks: tasks/readarr.yml
+      import_tasks: tasks/readarr.yml
-    #   tags: readarr_install
+      tags: readarr_install
     
     - name: Deploy sonarr
       import_tasks: tasks/sonarr.yml
@@ -148,42 +120,15 @@
     - name: Deploy pyKMS
       import_tasks: tasks/pykms.yml
       tags: pykms_install
-
-    - name: Deploy mediawiki
-      import_tasks: tasks/mediawiki.yml
-      tags: mediawiki_install
-
-    - name: Deploy traggo
-      import_tasks: tasks/traggo.yml
-      tags: traggo_install
-
-    - name: Deploy gitea-runner-homelab
-      import_tasks: tasks/gitea-runner-homelab.yml
-      tags: gitea-runner-homelab_install
-
   tags: dockerserver_install
 
-- hosts: omada
-  become: yes
-  pre_tasks:
-    - name: Update packages
-      import_tasks: tasks/base.yml
-      tags: base_install
-  roles:
-    - role: docker
-      tags: docker_install
-    - role: nfs
-      mounts:
-        - name: Data share
-          path: /data
-          src: truenas.comprofix.xyz:/mnt/datapool/docker
-      tags: nfs_install
-  tasks:
-    - name: Deploy Dozzle Agent
-      import_tasks: tasks/dozzle-agent.yml
-      tags: dozzle-agent_install
 
-    - name: Deploy Omada
+
-      import_tasks: tasks/omada.yml
+
-      tags: omada_install
+
-  tags: omada_lxc_install
+
+
+
+
+  
+

renovate.json

@@ -1,25 +1,8 @@
 {
     "$schema": "https://docs.renovatebot.com/renovate-schema.json",
     "extends": [
-    "config:recommended",
+      "config:base",
       "renovatebot/renovate-config",
       ":semanticCommitTypeAll(chore)"
-  ],
-  "ignoreDeps": [
-    "postgres"
-  ],
-  "automerge": true,
-  "automergeType": "branch",
-  "automergeStrategy": "rebase",
-  "commitBodyTable": true,
-  "ignoreTests": true,
-  "major": {
-    "automerge": false,
-    "dependencyDashboardApproval": true,
-    "commitMessagePrefix": "chore(deps-major): ",
-    "labels": [
-      "dependencies",
-      "breaking"
     ]
   }
-}

roles/docker/tasks/main.yml

@@ -43,7 +43,6 @@
 - name: Setup cron job for backup
   cron:
     name: Docker Prune
-    weekday: 0
     minute: 0
     hour: 5
     job: "docker system prune -af && docker image prune -af && docker system prune -af --volumes"

roles/docker/vars/main.yml

@@ -1,51 +1,51 @@
 $ANSIBLE_VAULT;1.1;AES256
-37343136353335343463623731343362353963316537633761656266316261383536373063316637
+39313339373165343238363465353965316536323664633761343236316532386661303662336231
-6438653861376433323561646139626366333065353562320a633166336330633932376336366530
+6338623335393732396162633239333465353534333638360a383761346336623538643564383239
-32656561333432613261643430656531636266323664373331646133656434313834393231313561
+65333966336434306465613138623766666434346439313536363364613837663933316535393134
-6364646637323665310a303036306637636163366237376364373464646334653463383831623137
+3235303335393036300a613735393164396361353263333562396263643064343561353735353563
-33313632613936373836373539383338313738623564633663323738633735383934333534316433
+64646631353136353432396561326335306636383336346430356461366431613037613163363163
-38666635306462396334386436333939313563353831386332373261373363653463623036313438
+36323331666532613866373462373235393239613937613536663061613866376564333031333834
-64313538363238323639656239336163393037383539613536303664363030636564623466323363
+65346564373835646236386230393838386431666539303263656637353663376234613562363136
-31663631353561366161343630366136313130643531616463373331303936663362346135383535
+63306532373461653539303862373036373861383865653137383333383731616131323665333636
-66613664653938383231313461306332303966366534643331333531393431303465316664393031
+63643935633032666164303335386436343566306237636162356630366236656337363633326530
-33643736323031333937383964663864306339613539393638316237636566373761633139663437
+65306137316236646330353736663261623166343539303937346234326135666536373863653066
-33663333343535316538643339646166326137663636373930303237643063313132393039306532
+65623731373135613764393532303065303936323835613139626637353565336335323866376338
-61336563646239643139353437666534313037656661626365623265316338366436623437363836
+66343237383463393132396636656235346566373432643533303066386462323137643866373936
-61356631343039623064666138393735616637633032333739663633383263656264393636303437
+62663666336663383664653065333134643762616530373561663061383932323762636661626434
-34373232333633323136366466346134363937383833636334313530616362303339636565333035
+33383463383139343166613166383336393664356164616433636231383635343163376531313034
-30343332313136653862633066393034653730383031653539333534636565353635393539346437
+30636435653038393332653964656230393936383837653065313831633736633861656163643463
-61383063646436346165613938636262336363326433353563626134663162653335376566313733
+62333430656136333230353363643863303837366637373565663836326634646561346137343731
-33363633666632323363353063613761346333663433396531633165363432346565326136356363
+65653939326366613930383935383564353930376131376139313265376335623534613262643934
-64653830376435313539363832356433623461663830653261313363323631376533333437366265
+34353961343135313933636630616666316136643238363962646563636333633165616239356432
-31373163353839656366393431623463636538373962656164633734326536353165383764343339
+64656330613336636363313833356439363038656265393561343263616366653231393438313533
-61353435383264646531663365626438313534663839323733613939336236333164353732313531
+35636437643764366533393263393231336366353033646266383962396264333639643464306561
-38336135613832626639633463383866346535666136643831326432656638393139333061653436
+35343633613863343431643831646164636264366561316366303338353965646634353036336231
-37633037646166653463306339663334353331623939633930623835393761653336623931616436
+62626430636166643062343865613037626635356439646336396436343539386337363236393562
-32353030666665303833366430373564613161353838613165633537396465623334656538313939
+61323037383331343636343266313762616664343336323163353131326130326134356437313832
-30313834376239356163386638333934343537616532353734666237353863396162643834613939
+36356563316561393366636234396565366465333064303439336136356630386662323030393636
-32643634316232663963336261633830666161613462666230366136663136356137356635366538
+62316334383064613938376335636264323731626634333061623966613663376266383535633964
-34653931303839396365333763363935663163346264336237373234303235343764393965373963
+63383030326461323730383239323137656338623465653735303838383266333633656435653138
-61363964643933623366333465393936303431303133353038386235653633663732646332396539
+37373632616536323466316439613865396239646137323666653533646333316434616466663438
-39323331353633313231633062643539346465643136386638393661616138626563343231663662
+32633864313434316366663035386462653430306534353062656430623730656537366262346366
-39383436656662356663343763323631346463323930633333643531353537376235643231396639
+39633262353665613766333161663263316463653861623130383062303161326133653736393564
-30373434346534633763656439616435303333306164663238623532303164636334636564303161
+36366362363931313430356436633835343737396466386434623933323133626136353431363236
-38393933303866396436333462373137393662386534393766616163373163633431316135383537
+65376230636262643962666466656532326438366138646239643262303536326630396562626336
-38393136656533363865363633313963653434646230633964623362303338646631633532666630
+36666436663037383262366236623730386662386362616431383937623633356531306662643834
-63633831653066363166373837656630363035393831313163326562643837613238663361643030
+35336236336566393561613861666330343937336232306333373733343136623064393861616466
-66626461616262373531396338663464663833306434653035326337373865376636383764363163
+64386239346539386236306434373461313765363031633436393037663461333734373063373564
-31356264373636326261373264363461663362316564633566303034646365303332626663306130
+33646265333538653835363063363031313439666237326433346265373362643364353130343738
-36613438653533663961326538326139636164636632616365393662643534386265333061363136
+36363162303665623731353139313932316361336432376265333836326332313331366330616166
-30646437333736383037343731376563646437343530616238623838383135613836663439303137
+36633764316462613538653265343031313033666534396361313837653339613339633232626666
-38366363356138336461393563633464373165663661323964333764663734633037343134353963
+62323166623666393232633630666164363839616161383465386435316134303734316464356136
-30643735343364656365653236336633323739363039316631313462333838636131363165646238
+64316565353161386162383237643964646432623939393532663962343964313966323032653531
-36666539663665626335386139663762343030336364326361653539343731363536313532643437
+36643461633935306439396364616136333364376234613135306464383531616262666261343235
-31613635336536386233396662646135303731333263343362336337656232333964636139346333
+62353565336535393439333263663434626332613533653165343134393166353036363038353561
-39333065323032393434333462303536396363633335623363623035366235353763356466653266
+31666238363963383831383365656333653036653130333237616466393830326666306636383837
-62323563363766383630313961663566336562363933393930303463356434383665336130323735
+65626138616262373032353865646261393534613165386437383166313939326331333238393638
-65306132343835643662366463363039626638646261666233333861373533366365646334313335
+30343931393933663339623930393262306336656437383338643232393932363731616139323633
-37613537383931636430303635343236636566336163323761326134326465356436616361623631
+39613361396630323961343731373439336464366332633837366333346239633836396130303766
-36393130626637633564356331643931653062363261636562616662623239623134653433393961
+65323361636362303061386430346662373165663635633534383338333762386233623661383731
-38366462633363626261343962653930646530633932343837323230336531386336313132613635
+36383262626533323636653933333961306137356366653131303235346362613231366335373630
-32616261623931313039326430366636363231646530396638663931653664663336656565303338
+62336232373064363565353361656631386565393533343932663465373935313465343035326437
-64336435373133613364613238656332383361363364626633306138326464316262643065303637
+34313563323764326135616462303830663365633630326533376666323632303732343761343935
-3363376131386438376534383636636234363837373037393736
+3636363938336630313736663832633833626530323834336566

roles/docker/vars/main.yml-template

@@ -1,21 +0,0 @@
----
-# vars file for docker
-docker_edition: 'ce'
-docker_packages:
-  - "docker-{{ docker_edition }}"
-  - "docker-{{ docker_edition }}-cli"
-  - "docker-{{ docker_edition }}-rootless-extras"
-  - "containerd.io"
-  - "docker"
-  - "docker-compose-plugin"
-# Docker repo URL.
-docker_url: https://download.docker.com/linux
-docker_apt_repository: "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/docker.asc] {{docker_url}}/{{ ansible_distribution | lower}} {{ansible_distribution_release}} stable"
-docker_apt_ignore_key_error: true
-docker_apt_gpg_key: "{{ docker_url }}/{{ ansible_distribution | lower }}/gpg"
-docker_apt_gpg_key_checksum: "sha256:1500c1f56fa9e26b9b8f42452a553675796ade0807cdce11975eb98170b3a570"
-docker_apt_filename: "docker"
-# A list of users who will be added to the docker group.
-docker_users: [administrator] # CHANGE_ME!!! - Add addition users.
-# Docker daemon options as a dict
-docker_daemon_options: {} 

roles/traefik/tasks/main.yml

@@ -6,8 +6,6 @@
   with_items:
     - "{{ data_folder }}/traefik"
     - "{{ data_folder }}/traefik/data"
-    - "{{ data_folder }}/traefik/data/log"
-
 
 - name: Create a network
   docker_network:
@@ -18,14 +16,7 @@
   template:
     src: templates/traefik.yml.j2
     dest: "{{ data_folder }}/traefik/data/traefik.yml"
-    mode: "0600"
+    mode: '0600'
-
-- name: Copy Traefik config
-  template:
-    src: templates/config.yml.j2
-    dest: "{{ data_folder }}/traefik/data/config.yml"
-    mode: "0600"
-  when: traefik_host == "traefik02.comprofix.xyz"
 
 - name: Check if {{ data_folder }}/traefik/data/acme.json exists
   ansible.builtin.stat:
@@ -38,27 +29,27 @@
     state: touch
     owner: root
     group: root
-    mode: "0600"
+    mode: '0600'
   when: not file_status.stat.exists
 
-- name: Check if traefik.json.log exists
+- name: Check if {{ data_folder }}/traefik/data/traefik.json.log exists
   ansible.builtin.stat:
-    path: "{{ data_folder }}/traefik/data/log/traefik.json.log"
+    path: "{{ data_folder }}/traefik/data/traefik.json.log"
   register: file_status
 
-- name: Creates traefik.json.log if it doesn't exists
+- name: Creates {{ data_folder }}/traefik/data/traefik.json.log if it doesn't exists
   ansible.builtin.file:
-    path: "{{ data_folder }}/traefik/data/log/traefik.json.log"
+    path: "{{ data_folder }}/traefik/data/traefik.json.log"
     state: touch
     owner: root
     group: root
-    mode: "0600"
+    mode: '0600'
   when: not file_status.stat.exists
 
 - name: Create traefik Container
   docker_container:
     name: traefik
-    image: traefik:v3.4
+    image: traefik:v3.2
     restart_policy: unless-stopped
     networks:
       - name: "proxy"
@@ -73,8 +64,8 @@
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - "{{ data_folder }}/traefik/data/traefik.yml:/traefik.yml:ro"
       - "{{ data_folder }}/traefik/data/acme.json:/acme.json"
-      - "{{ data_folder }}/traefik/data/log:/var/log/traefik"
+      - "{{ data_folder }}/traefik/data/traefik.json.log:/traefik.json.log"
-      - "{{ data_folder }}/traefik/data/config.yml:/config.yml:ro"
+      # - ./data/config.yml:/config.yml:ro
     labels:
       traefik.enable: "true"
       traefik.http.routers.traefik.entrypoints: "http"

roles/traefik/templates/config.yml.j2

@@ -1,51 +0,0 @@
----
-http:
-  routers:
-    oc-router:
-      entryPoints:
-        - "https"
-      service: oc-service
-      rule: "Host(`omada.comprofix.xyz`)" # change it to actual address
-      tls: {}
-      middlewares:
-        - default-headers
-        - https-redirect
-
-  services:
-    oc-service:
-      loadBalancer:
-        servers:
-          - url: https://omada-lxc.comprofix.xyz:8043 # change it to actual ip of the controller
-
-  middlewares:
-    https-redirect:
-      redirectScheme:
-        scheme: https
-        permanent: true
-
-    default-headers:
-      headers:
-        frameDeny: true
-        sslRedirect: true
-        browserXssFilter: true
-        contentTypeNosniff: true
-        forceSTSHeader: true
-        stsIncludeSubdomains: true
-        stsPreload: true
-        stsSeconds: 15552000
-        customFrameOptionsValue: SAMEORIGIN
-        customRequestHeaders:
-          X-Forwarded-Proto: https
-
-    default-whitelist:
-      IPAllowList:
-        sourceRange:
-        - "10.0.0.0/8"
-        - "192.168.0.0/16"
-        - "172.16.0.0/12"
-        - "100.64.0.0/10"
-
-    secured:
-      chain:
-        middlewares:
-        - default-headers

roles/traefik/templates/traefik.yml.j2

@@ -18,7 +18,7 @@ serversTransport:
 
 log:
   level: DEBUG
-  filePath: /var/log/traefik/traefik.json.log
+  filePath: /traefik.json.log
   format: json
 
 providers:

roles/traefik/vars/main.yml

@@ -1,14 +1,14 @@
 $ANSIBLE_VAULT;1.1;AES256
-38396437323435636166363366326233663861666162656237663034386263386139373466656632
+37326164353965653363666362343638666536626536646534363962626530383131643035373332
-3631643461306662323430643733333862316466646663310a616439373762623461633437366165
+3834663632333832336232316439666530613061363930350a346235613533396231323530306666
-31653338643738323532313136353937323134646139623138383731626562666135343561353661
+61376536303332353762323930623664373835393266393464333739313461636164653431646438
-6365613431386131370a376330396239373864323662386463346636663231356236323738633061
+3139653830306461320a656233383866333239383432616131373831363564333531313761663666
-36653434333662336231373939363863633630393134383934616165646232373262363338663631
+30633334383230663737376666376331326232343931376333383330363531656239613865386263
-31643464353362383531336237376461616330363433613033656139373166613336323533393132
+66616439646361323838306535333633313233383034383730653166623831336238373566633066
-36663633356236366535373762353838323930353264623332376235333437613238333133633434
+32383836396133383030343361623034633236373765613731616137333039323235363134373735
-63363864616531363562373161663930306533323237373233386432336262333262303233386135
+39653530626661336362313865386134303362316663303834376132313832626533393334393531
-65646234326365343638316231366164663237323766333662306335613432633131643238346335
+66363265386463313830663162633933316365363563306461623664323637366162383636616633
-62383363656538633134313535313230366131626434346439363839393830353635383138623866
+35333433636539643733646333626133663365383061313730323261623538363532393532303335
-39626263653030323662393332353838646232353963623233356533343863666664313833326261
+31626265323366343237393833623963353739356138393866346230373066613938306463363934
-30356335653932626465326630346536656237613066383933336365383335643936346137376439
+32633063336231343063356530663261623532303330613630653636616466643231653463376165
-3731
+3539

roles/traefik/vars/main.yml-template

@@ -1,5 +0,0 @@
----
-CF_API_EMAIL: CF_EMAIL
-CF_DNS_API_TOKEN: "CF_API_TOKEN"
-traefik_api_user: "admin"
-traefik_api_password: "password"

scripts/backupvpsdocker

@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+#
+# Backup vps02 docker data
+
+
+#Stop all containers
+docker stop $(docker ps -a -q)
+
+date=$(date +%F)
+
+cd /data
+for dir in */; do
+    dir=${dir%*/}
+    backupfile="$dir-$date.tar.gz"
+    #echo "backup $dir"
+    tar -zcf /tmp/$backupfile $dir 
+
+    if [ $dir == "vaultwarden" ]; then
+        #echo "rclone vaultwarden"
+        rclone copy /tmp/$backupfile BitwardenBackup:BitwardenBackup
+    else
+        #echo "scp $backupfile"
+       #scp /tmp/$backupfile mmckinnon@truenas.comprofix.xyz:/mnt/datapool/data/backup/docker/
+    fi
+    rm /tmp/$backupfile
+done
+
+#Start all containers
+docker start $(docker ps -a -q)

scripts/notify.sh.j2

@@ -1,2 +0,0 @@
-#!/bin/bash
-curl -H "Content-Type: application/json" -d '{"text": "Cloud-init provisioning has been completed on '"$(hostname)"'!"}' "{{ TEAMS }}"

scripts/rclone.conf

@@ -1,196 +1,176 @@
 $ANSIBLE_VAULT;1.1;AES256
-38316162653730636234393561373131313662363839303735356561653735333535613763383566
+31393237373262646664663739633130643562326538336561353265633064383466363532366332
-3464336262373335636434316262626235316133356332630a643235656334646565636237353033
+3966346334336430633238376438353961393936393037340a666263623538653061646366653831
-39653461323938613737303931663866383031313266336562623136393936303166393830623832
+65363535646434393035626435353630626133643634373961393063343361646561643233633733
-3463633133306465360a663666663564663531636335653461366138393130646463643331393961
+3263323166336638380a626231353030393766376534333438643930313432383266323763633130
-39346564653539366162393732326661333961336166636231653037333462386338383631323862
+33633333616561316465666133626261363361333433343733653266633337663863383137376533
-65356262376662373166636133373061326639616330313462326232656336623337636631313433
+62363038363631626463303563643638623231306363386261646639316332613134383334383737
-36326433373934393333383863626339666136353731616565333161363862353864656639343936
+63356561303735656638306566323432626531393332643634626531336230666338363433363435
-64343935623362613338396432643433343732396632306236656163623434343565373431303337
+32313539326265643637656435613965626232333631343264343038393564663831343063646533
-31383734643235386331323630363265616365643339393330336333316339646336663330346239
+61333835306632666136313637306165316434376234316632626632653133326633363734663033
-38396537336665396137613834656338323163303336316264393463313733356330623334663730
+35396235646335653065313664383861323033306636636336376264326534353635396530313462
-39616439306462396263386665636133376464663037373661313234363633633863646362623463
+30386237636438663363653032623030666438336438346434656637336662633930316536613832
-32633137386339396262346135343230383161346134353435343865336464366130346134643133
+64323966656337666239616636333533366636383833356561643734613664303236333939663262
-39663462663561363863386266636133366235363062393333616636393332343035386466393338
+63643736626163363362343161613532343564323661366261313331303466343639343437386439
-64383133313835653061313232623762353438343462393665613062363533636230303534353735
+32616133316236363339333338336566366236333337623232366139353461353335383466316639
-31346432313363366532333364396166376662353233316436313735363438646632636638373763
+64626661613530626639323233383065353033316238346635393633336431656666336436356638
-35363333343635666536343263653631643132366266323736316363393662626362656465303363
+32336637356336666630323036326562353737316231386636666136616465353764313236643761
-34326633333632303931653236346337663366383165383962346238356163333938323635303334
+65373836313037363065346339333031626230306366353632653936326463366665363664643161
-30656536336336336366366330656364373434383038653239313934393234363764633238646132
+31623962383363663964326439396362643932633130313332633363666537363564333830613730
-30373238303135343734613136633836633834636366623636623664656638633833346634343436
+31633766613639356161386132313863633830363963393663663564343732633366386235393464
-63336466363065323635386230623634346365316336326538303139343239306139643331633661
+66643831643735353066626566356363643131376265346665623666366663343939636638383631
-34316131653139343731346335393665353734643135626137363662636632643266636663626432
+66616562323164646235616137646632373631343834353832333632366636646332393537643439
-65323463306164383235646332306438393031356364396534316362353362333964386337633665
+64326138343462343064303234646362633862383336306237643636623734363165616362313035
-36306632346362303538316530653363376463313732316461393364636532376431663564366238
+37346437353566646133316631363735346561326565623965373833376438646439376630363634
-34643464623766343732373137393162666137643130353034616130383362343635623637643465
+35333133643135333761646261646566626562623962636161616163316433613261386466613937
-30316162393933353136666339333233343864393965353435366366626436376464623338636534
+35613531356265636339366139663865643863383035303365373034633239386261306539343539
-62303861356334323734386336303063613632326631326461663362623666623937353133646530
+31633039363134363731616136343031363264323734623462383233613437656265666165616330
-38306466653638373165356232353762643133393031316537313736393032643832623865333764
+39383661653561366365383462363538386439646436313761666163646334623737326563653034
-31383765643661636232363437303536373334633862336130306536313232636133646631643434
+61636538643263366264343265353436346433643837623838666638343130663466656365663839
-31343661393966333739346237316363336135363637626364386432653438336536356432633665
+33376332626537623865316136363938396161643466356131643736646138383462373961616531
-65306335333163663366393731303765346464623835343032336538633339303439613961343165
+38376665386133373939396261336531333738646135326165363864663463356638633337363232
-66316366336565623863346535316635326234363466353666316235366666363466363038623464
+62303736316263613431646263306436393932353062393531383965353137393163663664396461
-62633237633665316538653563313534386131616466356464383564333663313263373830323966
+33636631623234383835343436313764663538306164386465356265396130343364343665376665
-39343864363635313064393965376631353964616639333466383933343332636434393335323530
+38316533333338613439356465366663616231396234663633623264373366313432396134653663
-39383030313637626464396532326137316636653066343566336432623063313933363166343335
+35353038626337346434326465343230653861323432653438623337653333393266613566326231
-39326166323437316131623661346232353030346461663336393564366135333164643835333733
+35653465333062383863376365353832633731323066646366386262396431656330663666333038
-34373830346532343339656532323731373430363239663963626266336663646331343134386435
+37663035613136393063373765373034376631613363643035666533323230303065333065656565
-36393231313930636436396431363037383062626634386631663432656538306164346162326233
+38613633353862376436393838326664303330306538313363623862316131393064316530383432
-61323538613933303139393139303838313133646564613734396534643565663764313031653539
+36653664613834336165653364643436643333316333306438643638643634363430633466373564
-39323032386537383933383263316130343834363064346566633431326435353065663232336133
+30633032356430383239623466393339616639623661333339313337613734363237643539303862
-34613637323032383063343036373838613161666437336163323934653339613137613736636633
+38323963383361623333336437333066366332643030623162653162303065313761666564366131
-34643431613566303532666136646633373466333631306535363937313837363762653437613364
+32393431383731393233333138363138396139633831306137613534326535656265353736636364
-31396336326132633334356530373363363833356631386466306539633932616637363264623332
+33643834353633343962386361303564393032303432626138626535623132333732623937366230
-37383135323633343230636263376232346335623939666238363038646362663462363332633561
+30666530636130643737363039376463643161373437303235616564363132393836306430396366
-38303931373263393039316663313361623163646564333633386464353031623733333435636166
+30363064316666626532323832343132313264653338653130643439656662633566363237303837
-36323062316530653861623039663231306631663738363762646136313230303036646139326466
+64663661646462303761636130666561333636393962333232666134386439303166396637666265
-63636431373436663430643534303238303036376636303338363439383534633265326161383439
+65313330373862363534373666393536333666643032306466626263646530353534316134363662
-32356561326338393933336435373964336261363963653466636436346137306431353932363063
+63383965393731313138643035633064366130326562663763383963303339383233336331626361
-63376666376434633937626431366339373730393134636437386335623264336535313462656233
+31366431336663356463306639613366396534626235326437383666643165333832333338386533
-38353738313537313834326233633237353666653162643531366334333834653730656661316661
+35643763643938346437353365393333336263623533623936366337333730653632373037636434
-62623466613531616164343862633130643434666632336333636539636336613135643433333639
+38323730336539303664386339356463616531376230383762666361663030653639343135326165
-62346164373465353135316530643463613661383462346634303236373664323237383661346262
+33323234353766303839323736646463313733636133656561373038656431356338626632643534
-34313532653435393034353936643033623062366138653162316239323935316336353463333637
+66616333646233656365346261633034383536393635613161373338343431383931353930343166
-66646335666135396232343666616534643832306333393538303965613935656638633238646236
+61316332663065366365306632353963393766333036663137303462613262396561613664633434
-38306330663963373833323265653636333535616530653439643063336136643261336137333165
+32376265306636323439333335316261626262636161646437316463333833343565663335383436
-36666137303935333436323761373962353066306535313132643465326230343138663533373637
+34366531383361383532343630613965386465316463396535396132356635346635643465613065
-36633265333162366461393237343738373332313765356231323338636464613232343434643564
+32333838303263323839633061373135303136343336323565326334343331333163393766643133
-39336562353561633862363261396466343763636334663335656432646436306630643133373933
+32393439636632356330643662376365333238316230633430653133323965393330643065363866
-38326537623034306637663530303935646538636463643733333461343939306638383934313331
+30643839373936316639373331363739356531333065303937646131663162343430346133633931
-62663562323961613934633032313038613030383137633563313861626165613635396133363131
+36386464376238643461373133646638373439313431643831313064653666613537393264306665
-34643965623333373439636637313663366638616235396234666339633336663230646438613731
+32653662303465303639323639636238633231306665396239376530326437383764386563633562
-65306436396264306138346432373439633130363536663465626630666232393161343636656562
+66616238616336633265656463653036363932323964623135643936663961386164303365363661
-65386461663664643136623136363761636636623235386634656138386463663838303331363965
+62303866643463613365333363613463623336306336306566383639363030343761316330353833
-66653030656264356337666332323464333963316139356639303361393165363137366466306133
+32303066643464616639313666386330663433633831366338326665613538336539373439656532
-32306164323633363662663130303034643964646539626438376462303836336663623161646333
+32356463363662666266663263333562363861626462666461343834383335333731336137303464
-30663630303830383433653464343931386635323436653166653561653362613762643237396436
+38376633643439666538636439326266646239343664666266356665653565656339353261623462
-30316435343931363562373438653461366534636230333665373232353262353538313565663262
+30336261653432376537356162613361636139366265343439353330653836336337646433316361
-65383466626630393935313339633935343933363664373633346661653261353735316237633431
+63363638653435373635633834353161326230626138666439643531333031663335663638653361
-64653333666233626630613432376463326130303737623937366261626137626364373335306338
+61633335396166336465623263343863373961643735623631383762613763656261383966323838
-35653634633262353461316262613936653539323535633066393332333663353835316361326432
+30623264366138343839363636663733613836313166646137656165323662356139363564663837
-36623562323233653738306439646234363335663231363362633339376137383634616338313631
+39656333346435633536383130383730313732653363666266303230363939653331653936356565
-64613463333333373761623436656331333064343166633534663962363036626333306462663066
+31366663653332303630346438646431633161636230326330363862336466383161353732636431
-65333665356530316133356266356163636461363230636265393232306134323533373634666433
+30666339383766626433633435643564323939366435363435636232343935373063316637316434
-65333831656237626636633938666164323331343263653866663338646236336466323533356135
+39383461376466373165613639343362393732316532336535633465616434326464306162303066
-39666261323035633736356538346635643339363231323963376364366531303831393961383732
+34666637356563393930326665616330643262633639663635626635313330336334633361393566
-64306332663934356534356365626239396437386433323261373935336639383732346662643164
+37646263323731353764366563393866373435343361653539376533363332393736326261326338
-35383932363638393661346661383532656338663339323461313136666532633437366362663536
+64303439356633343164633137373433363237663034383365653630393364383038313062316665
-39656334313465303864313264666239643166393261306234313064323933323765623232646161
+38653038316339303035396234626438383863656332316535633231393232633332323331626661
-38373462636438653564323133613838636365333861353365393731653663363236343564666366
+66666435653433623031393332613834613566643338646430393361636131333466356466663465
-61633965306638373137656333306264636465323638376161633732666164613530346666313335
+61376461363238366566373635623464366139356430336162636232343061643634643230343332
-32306562303065636431663963336135663632353539313438376339623364353534363561366136
+62363461393266666563326237326133616431393461353538366233386266303432663531373662
-35613166353337643531656265643731653237616236613632656465643431343733336633633562
+63303866333865656663623565653664643934623566396565326264663237393566643135316130
-66643365343230626564396162323237646238636534613830393261643530336562356235373534
+65386666343262373832663637346531663066363565396437373330373665376635653661616637
-36633036323531623138386638636464646361626564376264616539343532336234653963303132
+39383233623262393361313264316230626565326466306563613930616465623531373636343439
-64386137643761636265346335653037333637343262396461383433363762303463393961343739
+30643030616637313639306234643035326639643533613564303731373731646464323737356166
-32636535396537383738306632656233313536393865366366656539313236323133313433323635
+39393839653431343431373034653536633531643934353432653636393937346230303162646537
-34656566303765313736383338393338653837626339356666306563333839366533626666353436
+61623463343833613636316165633430613134663537333665303632613637326563373266383063
-37613363316264663462393230653865313061363438653835313539613566616164393334316463
+33366439303538613134633130343439373666363566333663346536623464653334323533343939
-39346435613638646566626534323561366261353433353533623730663135396536353637353764
+35316437653537396135326330653834613863356562323765346432343234636263376238356633
-64373463633530356235366264373661383535663431343862356365613531303737303632663631
+36393334303635626535636134333863363333656632373430343264373832636138663338643565
-64393930666633303461356663356439303563316262353365323637343234613931333139313735
+31323434346337653934666537303563306562666532376630643637626532613730643837303634
-65613562623633643231313261626432356232306330363335303034663262346534616335616131
+39393565613034336339386366636661313330396232303832316666353965336563373466613563
-32333232376564353836616161623637363937616537346137366331656131323738326566626232
+61633565653137386633343631653232373162346633366362373632623534616562343637653062
-37373632366162663233636631616330303537356432336665623066663331646636653434623832
+35396265323930323938656663633030623766366239306435633438663136333865643263303261
-66653234323436383033303761346264316238313537613539303964386662646236343732666638
+37313564383935653565633066313862633364323462373638613331386438383830656635316661
-31633463623266653537363733343734383330643863323763666532666135333838656361633139
+35386236356331376565616633356631626661366339393163343739373735633062323930326430
-65356364353364356135393632333539633731363235613439613831613330333834626230326566
+39643137383761623132323931303461366232323132323064386538373133613531393665353832
-62363638326231653237396637633036636530313163373432326637303439666438396530303631
+66303338626639353539323063666235353532333437373433376337363035623639316431616264
-37313137303261616637353130323264313039323062363239613336393863306466363536633761
+64343665306139666661623635396130373464646663393438366163613634336465396535373935
-66366132343164306162646661623464366531623935633831623132656634643461386236306662
+33376530633266386664316532623863366131623766643364663061333964373331363366383631
-37623664626436623539616661366236363636653830653066333333396362396162633265643566
+33313361646134363964366330356437386662323536306164663661346630376238333966346135
-65323634383236353238396530616236356633343834616534333930373163633861646263333963
+33653134643564623263626432356562653833363935613863343834306436323137356239376437
-62316365303330316537653737313963333265336237633236633636613464613832346233653064
+35626134646661633736666330663861396536326137376337346136366433323338373332623566
-66623331636137653136303665356164643266316563666662663035666534626365623336663437
+65373966326232656337653139333762643961313162356461623536366230363034613066336133
-37343835306162653830373232666265346361333364336566323636623861666433313539333636
+31613565383064306431333664396237373537646236636634373932326632346266373065356339
-35616561633633373637333335306662343430336139643632326166636238383233333935633265
+31353466626530623431653366636663353263336332663164636366643134346239653239626434
-66353063613664323230613362323938326262373336383837313664333765356537303431663437
+34373535316133366265333337663334646630383035653637663864663264306131343039663739
-39313535643330333434373561356363343130376262376339316232393731336230353631616332
+32343037383537356331306539313130303961656164373533663839646530356562303964313135
-34653135386565336637376136336266323738376265613866386366313964623833336461303638
+36626164333963313566633033393266363161353065343530303064646465616661313238663839
-33626136333161643062323439623363336333343238333038303466626532346339376539323738
+39346134343735323561396631333838626434376663393661373436363962373564633634346339
-62666163373765373366646130356361323138323861663135663136306566646631393139616463
+64356230623936356632313665633163343233366339626631396162343866636361373437336164
-36633863633636653338393335653635383535373734663531613135343530313931666234323865
+36353666623930666565363932386232643062333836636638633035353061383932613332386636
-37623938633034346532653033633063396331383233633831386334303231366435313738313535
+61396135623430323438633537346132363063326337653032353737356261616338363634663134
-34346566316562643139336430343062626534396437376235356465616161643162373865396432
+32306638643835333331613432353766313530643034396632353762316436623336363662386137
-61363133333736396334633332656138373564323561393866386335666361346633353939316239
+34353061666238613065323739656332313330323165373231383638306436383166393961633337
-34363166656635633831636235353731636632356131333137303833666563306566656133343762
+36643235376532306137653237386563653337356331326435346431316564353462623038383838
-37393062633930653934356632323764343831353838386637653231323562323863653036316534
+63636361383634313530666463653962303938356238393134326332623164663239316433313161
-37306532383031666436303861656461313638396263653434333730633135383936303966656336
+62383866383466343936373137306331666261303636316136346264303563653966356136383065
-30643831316563616364363931343964333631363365393634636463333336663439313933653236
+61636337353336326662643634323732646233613136643034336232333064306162346333666166
-33383864613934373639316432383035313934363963653535633662303961376365613832613431
+36633766313733653435386432353937393137306665633766306236633162326534303061323963
-61393339333331333332326563663963663666646236316534353532643139376530333261326561
+64386566626136336261363864663662373635346239366230616437633031633830633336313634
-31313237326236336565333662336437346437666566303664396161383439303839366634643433
+61613636663738623338656165646561353638626265623739373630393336616366613636396330
-30376637623263343863333132316166653864373339633431393038623363363261336137653865
+30643666326135343037303830613732643561313237393766353863666164656432666261626466
-65626135326265653130373065306162656233346561316666303638303532376236313162356334
+36663934653432386662383134636631643466323132356266383065316265303164353330623633
-35636664616261643766353035376635343962303266623339366136663539623937643633613861
+66623536383563323431613038613037306130343738393965616635613930636638306138393839
-65636161353664313939643361343334623562383933613566333337656138653132313563343162
+65653030656264323837383238303231346434646363363134633730663562313366623038393133
-65393838373034613664373962653963306530376131356461343634643630333764653862323832
+31303736376263656462643961666537303163666637613465626534623730323764353536306339
-34366439383963363534396264393733323065633633383063393731663638316564343466323832
+63316132613634316133386636373836636237383830616236326663323365323834376365383066
-61353362373032326261326638383938613437656664613961376434643333353230656563363861
+39356661366334393233303164666666656463373166393739636332616137393439656432663433
-61353962306331333163386664656436326235653638386231396131626639386337653539366436
+36356136653231363763336364303339613038653438386233383364623630656236333661643362
-65646638306139356538303932643037353236643962313965306339303963303030346537343737
+66333464306462353262373636323935653931663334643662303066383737323464376332326566
-37303731643433636361646361633734363032663266353839353765376235323831633630393938
+37336336623765356536326239316561343666316562376635623734633832626632323563346235
-63323839366136393362306130366536613439333733356366333637303561623062326639393631
+61393961343766663964326436663037613134643130666239303832313161326136326265643434
-36613936366639663133616331333736663162383632383166333564313761343966666135326461
+38326631623836663464663734656538653636333061383633386261386236633832303830663233
-32366334323161393037613137623461363431393262663239393365623933636633323131663431
+33623862663230666265316339633464626534363465643336646462326431393863656536613234
-33363537343839663263343534366136393739336637336531363162356264396632366137656463
+39626135623637343865303965303035356635336439353463323937623465303934393631363238
-35373632643264373736336334393865373563373066333365376335653965303661396461306162
+39333534306539303831393039623433336331636135356537353233333062666664623238326233
-34613866643036346433353062346531623964373965633663336138396264323934353564313437
+64386534666562306561376432343032313966343532646533386137623664333336346131626361
-39613332653064653332373262623135636663653465656237356139343034383137323034346564
+37363834643635343831646630346263653438623262333666316131636666366261303665636634
-65656463393936616530633162333063626339316538396364316564393064613232656237386132
+30343634346137323830333637613434343639623338383432303063316639636462626366643535
-32396463343037373064393536353138323864316465346536373835613565613438623636653465
+61643739386663643132313137633139373536313132356465373738613462363264663739356632
-39336434316136386163656236653062393839396462656634613030666166366132356530366163
+34663131353034626361633863613933336465633131386530336663666361393335633437666333
-63396564376363343437333337656163623964373733313030326664666464376563323765313035
+30303130623961376637326664393561363462303564633463333734336635653335336538303431
-31363339626565636665613431373139366337303836666134336532313534303465616434373935
+37373331353039613436616130316633393261346331396337343565323565356238303431653237
-66323437366639653330323539363161313666356136326266623432346336613539626563303534
+64366165383831376632366364616536326236626166633465616534613036633463663439303039
-61373864336561636131653636386632663930353862313964373862643437356130356139353732
+66313138346338353765633964346137333639613862613638626136306233343536643737343662
-65313734643663356430333161316265363137303134633961376133643430613733343639343164
+64323165333262623434643261646531396436333965383064313131303136663865316631316565
-35616535646666336638616331663766393564663766326331656462393134336235326166313166
+66626466616661383564653435356261646337366435353335383234623034653633623364373062
-62303330613630363835623233653261376139643236613565396466633264326433383238303439
+64313966323339663563373566363132656334636631623630623437326265393365656639386136
-65376164376261393538306565356533633530353538343735616663376437346265656263343930
+35383539623565346263393966323232633030366439646639613763313932313038616362643562
-61616530316439306461663461346365363639376333363732333861346230613536366563366232
+33663331336637383238313766336562613330363264666633376263383337333865363665326331
-62333234623930383761343937306635393837326635343664623865636232386332313535313463
+35363866636431313235373535396230393831383738353232346265316432653666383236303161
-61343734643330373064643462626636623233653462343262646262333935656138643264376133
+30643038616538343534323061353736653537346534643963313630636365333835356430643434
-63363962646138313436373963386236613035633464313663343364396536363833396166306238
+33633031623137326530663835356462316161656364326633383761323337353934306536643333
-63646434653261653235303063653462376533343232363634373861646632323061336661393466
+66346361363962366336613138633561636665653337373230613032383264306532373937383637
-30363266326364626465656463326435333032373836626134653362386264623533383266663263
+66306331306639613065353332336234616136616461663631346532363835353065666463333864
-36316233633062303337386234643738323061643231656639633330646433313135353335656330
+63366231323165623863633361386162373432303338366162356338306361326361393530646465
-31353535633833376336313339363835303835633039636165663433383837383464656563343163
+34356364323365376462346661313530306434343837373064323431663130343838396363333538
-61363431353533336130633266616337326462386363656134613834333865346362643764633038
+62373462396264363565616466633663373465626635613464626265386464396530303262306236
-34383238643339373234366239303235303566356561343730343365383339646663393039666561
+64373736656361376266383432376432333632663736376134393466636539383264373462643961
-32646234303033616263333466633765636633633666353862333833376164306566663037323338
+34343433633865656164636434363139316466376361306433663838613036653366613730396537
-66623064646163343633333732666461313736363965303566313061313163363462386230363038
+30323631366664623834633761643662626438303132633063646536666162383162643737323538
-37353365323933656234663761356530633261636665613233383137356563363732353435373536
+38623432366264626439383830646438336133656432613733656466333065616338303466386538
-66316537363730316461623066383934666164333739656161383531313865396161313338656236
+37333135346633383736373932383263356638393966356537326632323631393462356366653938
-65633031356532633465383933333534396635373131613330643062383230633439613337313863
+65363666353032626336666137653963653137643230313838653037393739356363326535373762
-33316465636438363264666630666361663538356538316332323334616361633061633332346237
+35316461633763663263626133383162396164393436363665313633663531393164663061313236
-35343235336235383131656438623064623432663831353035346133303862336564616562396232
+32306535383731326139343566356665376238356532313063303962393639366164373530396535
-36656265623737376363313930376539663136396561626566633466326637383232666262303936
+33316336363562316266353534393466653739373266313533323133313464626236336137636264
-35653661623664343431393461353437363361383030393764366637636464346464353932623262
+34393730373662316137633564663864626137303438333262366466396539356137383835346361
-65663063636234323961643039636566376437303562306139663264366538653166356463633263
+30616533626338333532383434633463653062326437353831376166383365393330646432636266
-35336138383131366234323765623337653033663730353635313635396334333061383663626332
+62656238663761316532313366346661376237666436346335656439396564363464323063353664
-30313234373366663636343037316438393837333631393531653036346232393566643034363136
+39303261346631356536643961666638353334303932303938383830616263633738653837643861
-32383539663335613236663364363962663435366537333565326637306636376461363038656534
+65336437326638353365323232666332333162663935306665636463623538346166653764626139
-61616234366336396232323166326132343039383361393833346537313938616137326265653763
+63653736363736623139366164623437623734343766666239316338663136623232383832623632
-66366132326439343234653664323965386333396338646562383536653739376639376563383638
+66306536363836663939386261383266303664616363346662643835356239666338386665613066
-31333231653630313732366334623330653065373232663432626438386666363731333731316262
+323839643933313039656433313432396532
-30653966666665313765616237356431343763363437616162343035633531633336386138626261
-35636335393534343964623334616663663935623964326362313362663530303865303037633532
-63623666643437356635346439656531653335346137303331343931643532326532626133303166
-30633632373262616333613366393938393366366666396536303932393865353238386562623339
-35313935313136383734636339393063653066613032383636326236386562306139663061663232
-30343365666438653639346636646534656461393636393730373237316636313335383536663166
-30646336643339653565353364626532656630356130623561363264333137353861386235393735
-39363830386464366666666363356365626239396365336138326539613030353964303839623631
-30356130343939663234616135323936643838613834326534343137303461616666646434393238
-36393163643166303366383663613332663638643361323934393236393764643634373232366563
-30373335336563666461626531613730386561643236333064666165373838313562363836393932
-35346530393835303961636661373264303030636166313061313437333832393937623063313462
-38663735343234363561306539383563353033616435353831323835366166653361316665383334
-33336138373836353464333038346664343730636364363238616234383739373365373835343438
-34623438323031343436653762346166653865333437613232383062636137333534633461353737
-32323863353831313763633433616633393864303739303832376438336365313462353738386165
-35633836616230376362313933393336626130393937346236663538343732653836333938386430
-37353162613738396331633837303331346138346635643063366164313536623134383939396633
-61366238666136326335376565396638333461303630653839326261633362623530366438363062
-663833633630353966643938363039393539

tasks/dozzle-agent.yml

@@ -1,12 +0,0 @@
----
-- name: Create the dozzle container
-  docker_container:
-    name: dozzle_agent
-    image: amir20/dozzle:v8.13.4
-    restart_policy: unless-stopped
-    command: agent
-    recreate: true
-    ports:
-      - 7007:7007
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock

tasks/dozzle.yml

@@ -10,7 +10,7 @@
 - name: Create the dozzle container
   docker_container:
     name: dozzle
-    image: amir20/dozzle:v8.13.4
+    image: amir20/dozzle:v8.5.5
     restart_policy: unless-stopped
     recreate: true
     networks:
@@ -19,7 +19,7 @@
       - /var/run/docker.sock:/var/run/docker.sock
     env:
       DOZZLE_LEVEL: "trace"
-      DOZZLE_REMOTE_AGENT: "omada-lxc.comprofix.xyz:7007"
+      DOZZLE_REMOTE_HOST: "tcp://omada.comprofix.xyz:2375,tcp://vps02.comprofix.com:2375"
     labels:
       traefik.enable: "true"
       traefik.http.routers.dozzle.rule: "Host(`dozzle.comprofix.xyz`)"

tasks/gitea-runner-homelab.yml

@@ -1,42 +0,0 @@
-- name: Create directories
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_folder }}/gitea-runner"
-    - "{{ data_folder }}/gitea-runner/config"
-
-- name: Check that config.yaml exists
-  stat:
-    path: "{{ data_folder }}/gitea-runner/config/config.yaml"
-  register: configyaml
-
-- name: Create config.yaml file
-  file:
-    path: "{{ data_folder }}/gitea-runner/config/config.yaml"
-    state: touch
-    mode: '0600'
-    access_time: preserve
-    modification_time: preserve
-  when: configyaml.stat.exists == False
-
-- name: Create the gitea-runner container
-  docker_container:
-    name: gitea-runner
-    image: gitea/act_runner:0.2.12
-    restart_policy: unless-stopped
-    recreate: true
-    # dns_servers:
-    #   - 10.10.10.1
-    #   - 127.0.0.11
-    volumes:
-      - "/etc/resolv.conf:/etc/resolv.conf:ro"
-      - /var/run/docker.sock:/var/run/docker.sock
-      - "{{ data_folder }}/gitea-runner/config/config.yaml:/config.yaml"
-      - "/etc/hosts:/etc/hosts:ro"
-    env:
-      CONFIG_FILE: "/config.yaml"
-      GITEA_INSTANCE_URL: "https://git.comprofix.com"
-      GITEA_RUNNER_REGISTRATION_TOKEN: "{{ GITEA_RUNNER_TOKEN }}"
-      GITEA_RUNNER_NAME: "homelab-runner"
-      GITEA_RUNNER_LABELS: "homelab:docker://alpine:latest,alpine-latest:docker://alpine:latest,ubuntu-latest:docker://node:22-bookworm"

tasks/gitea.yml

@@ -26,7 +26,7 @@
 - name: Create the Gitea container
   docker_container:
     name: gitea
-    image: gitea/gitea:1.24
+    image: gitea/gitea:1.22
     restart_policy: unless-stopped
     recreate: true
     # dns_servers:
@@ -78,7 +78,7 @@
 - name: Create the gitea-runner container
   docker_container:
     name: gitea-runner
-    image: gitea/act_runner:0.2.12
+    image: gitea/act_runner:0.2.11
     restart_policy: unless-stopped
     recreate: true
     # dns_servers:
@@ -92,9 +92,9 @@
     env:
       CONFIG_FILE: "/config.yaml"
       GITEA_INSTANCE_URL: "https://git.comprofix.com"
-      GITEA_RUNNER_REGISTRATION_TOKEN: "{{ GITEA_RUNNER_TOKEN }}"
+      GITEA_RUNNER_REGISTRATION_TOKEN: "A01dvleL55F0o5OMJpa4UsE0gJ38ANKrAw5vKei3" #"{{ GITEA_RUNNER_TOKEN }}"
       GITEA_RUNNER_NAME: "gitea-runner"
-      GITEA_RUNNER_LABELS: "alpine-latest:docker://alpine:latest,ubuntu-latest:docker://node:22-bookworm"
+      GITEA_RUNNER_LABELS: "alpine-latest:docker://alpine:latest,ubuntu-latest:docker://node:16-bullseye,ubuntu-22.04:docker://node:16-bullseye,ubuntu-20.04:docker://node:16-bullseye,ubuntu-18.04:docker://node:16-buster"
 
 - 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.7
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/gotify.yml

@@ -1,26 +0,0 @@
----
-- name: Create directories
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_folder }}/gotify"
-    - "{{ data_folder }}/gotify/data"
-
-- name: Create the gotify container
-  docker_container:
-    name: gotify
-    image: gotify/server:2.6.3
-    restart_policy: unless-stopped
-    recreate: true
-    networks:
-      - name: proxy
-    volumes:
-      - /data/gotify/data:/app/data
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.gotify.rule: "Host(`gotify.comprofix.com`)"
-      traefik.http.routers.gotify.entrypoints: "https"
-      traefik.http.routers.gotify.tls: "true"
-      traefik.http.routers.gotify.service: "gotify"
-      traefik.http.services.gotify.loadbalancer.server.port: "80"

tasks/homepage.yml

@@ -16,7 +16,7 @@
 - name: Create the homepage container
   docker_container:
     name: homepage
-    image: ghcr.io/gethomepage/homepage:v1.3.2
+    image: ghcr.io/gethomepage/homepage:v0.9.10
     restart_policy: unless-stopped
     recreate: true
     networks:
@@ -25,7 +25,6 @@
       - 10.10.10.1
     env:
       LOG_LEVEL: debug
-      HOMEPAGE_ALLOWED_HOSTS: homepage.comprofix.xyz
     volumes:
       - "{{ data_folder }}/homepage/config:/app/config"
       - "{{ data_folder }}/dashboard-icons:/app/public/icons"
@@ -38,3 +37,4 @@
       traefik.http.routers.homepage.service: "homepage"
       traefik.http.services.homepage.loadbalancer.server.port: "3000"
   register: container_homepage
+

tasks/idrac.yml

@@ -2,14 +2,14 @@
 - name: Create the Dell_R730xd Fan Contoller container
   docker_container:
     name: Dell_R730xd
-    image: ghcr.io/tigerblue77/dell_idrac_fan_controller:latest@sha256:eda09016a4acbee8883996f3b8cd4832a723200999bd037934675e75e2f00908
+    image: ghcr.io/tigerblue77/dell_idrac_fan_controller:latest@sha256:1e44a090af5332842332fd58ce22a1034c045764f0104e9cf38be2386b1e1753
     restart_policy: unless-stopped
     recreate: true
     env:
       IDRAC_HOST: "10.10.10.138"
       IDRAC_USERNAME: "root"
       IDRAC_PASSWORD: "calvin"
-      FAN_SPEED: "50"
+      FAN_SPEED: "35"
       CPU_TEMPERATURE_THRESHOLD: "80"
       CHECK_INTERVAL: "60"
       DISABLE_THIRD_PARTY_PCIE_CARD_DELL_DEFAULT_COOLING_RESPONSE: "true"

tasks/invoiceninja.yml

@@ -73,7 +73,7 @@
 - name: Create the invoiceninja-nginx container
   docker_container:
     name: invoiceninja-nginx
-    image: nginx:1.29.0
+    image: nginx:1.27.2
     env_file: "{{ data_folder }}/invoiceninja/stack.env"
     restart_policy: unless-stopped
     recreate: true

tasks/iscsi.yml

@@ -1,88 +0,0 @@
----
-- name: Ensure open-iscsi is installed
-  package:
-    name: open-iscsi
-    state: present
-
-- name: Ensure parted is installed
-  package:
-    name: parted
-    state: present
-
-- name: Discover iSCSI targets
-  command: sudo iscsiadm -m discovery -t sendtargets -p "10.10.10.2"
-  register: iscsi_discovery
-
-- name: Set target_iqn variable based on discovery
-  set_fact:
-    target_iqn: "{{ item.split(' ')[1] }}"
-  loop: "{{ iscsi_discovery.stdout_lines }}"
-  when: item.startswith("10.10.10.2")
-
-- name: Check if iSCSI target is already connected
-  command: iscsiadm -m session
-  register: iscsi_sessions
-  changed_when: false
-  failed_when: iscsi_sessions.rc not in [0, 21]  # Allow success if the return code is 0 or 21
-
-- name: Connect to iSCSI target
-  command: sudo iscsiadm -m node -T "{{ target_iqn }}" -p "10.10.10.2" --login
-  when: target_iqn is defined and target_iqn not in iscsi_sessions.stdout
-
-- name: Set iSCSI target for automatic login
-  command: sudo iscsiadm -m node -T "{{ target_iqn }}" -p "10.10.10.2" --op update --name node.startup --value automatic
-  when: target_iqn is defined
-
-- name: Fail if no target_iqn found
-  fail:
-    msg: "No target IQN found for iSCSI server IP 10.10.10.2"
-  when: target_iqn is not defined
-
-- name: List all block devices
-  command: lsblk -o NAME,SIZE,TYPE,MODEL
-  register: lsblk_output
-
-- name: Set iSCSI device variable
-  set_fact:
-    iscsi_device: "/dev/{{ item.split()[0] }}"
-  loop: "{{ lsblk_output.stdout_lines }}"
-  when: item.split()[2] == 'disk' and 'iSCSI' in item  # Adjust based on the MODEL you observe
-
-- name: Fail if no iSCSI device found
-  fail:
-    msg: "No iSCSI device found!"
-  when: iscsi_device is not defined
-
-- name: Create a partition on iSCSI device using parted
-  parted:
-    device: "{{ iscsi_device }}"
-    number: 1
-    state: present
-    part_type: primary
-    fs_type: ext4
-    part_start: 0%   # Start at the beginning of the device
-    part_end: 100%    # Use the entire available space
-
-- name: Create filesystem on new partition
-  filesystem:
-    fstype: ext4
-    dev: "{{ iscsi_device }}1"  # Format the partition
-
-- name: Create mount point
-  file:
-    path: /data
-    state: directory
-
-- name: Mount iSCSI target
-  mount:
-    path: /data
-    src: "{{ iscsi_device }}1"  # Mount the new partition
-    fstype: ext4
-    opts: defaults,_netdev
-    state: mounted
-
-# - name: Ensure iSCSI target is mounted at boot
-#   lineinfile:
-#     path: /etc/fstab
-#     line: "{{ iscsi_device }}1 /data ext4 _netdev 0 0"
-#     state: present

tasks/jellyseerr.yml

@@ -10,7 +10,7 @@
 - name: Create the jellyseerr container
   docker_container:
     name: jellyseerr
-    image: fallenbagel/jellyseerr:2.7.0 
+    image: fallenbagel/jellyseerr:1.9.2 
     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:71fe6d5702691c6ac8961b9b1042fdea1ff833a49c82c5e165346fa88999a48a
+    image: ghcr.io/linuxserver/lidarr:latest@sha256:c3d8c0970b0e5a7dce0b29930efc83ab33a0fff8d1afbfca88a2104affb80c45
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/mariadb.yml

@@ -14,7 +14,7 @@
 - name: Create the mariadb container
   docker_container:
     name: "mariadb"
-    image: ghcr.io/linuxserver/mariadb:11.4.5
+    image: ghcr.io/linuxserver/mariadb:10.11.8
     restart_policy: unless-stopped
     recreate: true
     ports:

tasks/mealie.yml

@@ -10,7 +10,7 @@
 - name: Create the mealie container
   docker_container:
     name: mealie
-    image: ghcr.io/mealie-recipes/mealie:v2.8.0
+    image: ghcr.io/mealie-recipes/mealie:v1.12.0
     restart_policy: unless-stopped
     networks:
       - name: proxy

tasks/mediawiki.yml

@@ -1,29 +0,0 @@
----
-- name: Create directories
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_folder }}/mediawiki"
-
-- name: Create the wiki container
-  docker_container:
-    name: mediawiki
-    image: mediawiki:1.43.1
-    restart_policy: unless-stopped
-    recreate: true
-    networks:
-      - name: proxy
-    env:
-      PUID: "1000"
-      PGID: "1000"
-      TZ: "Australia/Brisbane"
-    volumes:
-      - "{{ data_folder }}/mediawiki/images:/var/www/html/images"
-      - "{{ data_folder }}/mediawiki/LocalSettings.php:/var/www/html/LocalSettings.php"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.wiki.rule: "Host(`wiki.comprofix.xyz`)"
-      traefik.http.routers.wiki.entrypoints: "https"
-      traefik.http.routers.wiki.tls: "true"
-      traefik.http.services.wiki.loadbalancer.server.port: "80"

tasks/omada.yml

@@ -1,24 +0,0 @@
----
-- name: Create directories
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_folder }}/omada"
-    - "{{ data_folder }}/omada/data"
-    - "{{ data_folder }}/omada/logs"
-
-- name: Create the omada container
-  docker_container:
-    name: omada
-    image: mbentley/omada-controller:5.15
-    restart_policy: unless-stopped
-    recreate: true
-    network_mode: host
-    volumes:
-      - "{{ data_folder }}/omada/data:/opt/tplink/EAPController/data"
-      - "{{ data_folder }}/omada/logs:/opt/tplink/EAPController/logs"
-    env:
-      PUID: "1000"
-      PGID: "1000"
-      TZ: "Australia/Brisbane"

tasks/postgres.yml

@@ -10,7 +10,7 @@
 - name: Create the postgres container
   docker_container:
     name: postgres
-    image: postgres:16-alpine
+    image: postgres:17-alpine
     restart_policy: unless-stopped
     recreate: true
     ports:

tasks/prowlarr.yml

@@ -10,7 +10,7 @@
 - name: Create the prowlarr container
   docker_container:
     name: prowlarr
-    image: linuxserver/prowlarr:1.37.0
+    image: linuxserver/prowlarr:1.24.3
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/pykms.yml

@@ -13,6 +13,8 @@
     image: ghcr.io/py-kms-organization/py-kms:latest
     restart_policy: unless-stopped
     recreate: true
+    networks:
+      - name: proxy_network
     ports:
       - "1688:1688"
     env:

tasks/radarr.yml

@@ -10,7 +10,7 @@
 - name: Create the radarr container
   docker_container:
     name: radarr
-    image: linuxserver/radarr:5.26.2
+    image: linuxserver/radarr:5.11.0
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/readarr.yml

@@ -1,33 +1,31 @@
-# Readarr has been archived/retired.
+---
-# Keeping this for history
+- name: Create directories
-# ---
+  file:
-# - name: Create directories
+    path: "{{ item }}"
-#   file:
+    state: directory
-#     path: "{{ item }}"
+  with_items:
-#     state: directory
+    - "{{ data_folder }}/readarr"
-#   with_items:
+    - "{{ data_folder }}/readarr/config"
-#     - "{{ data_folder }}/readarr"
-#     - "{{ data_folder }}/readarr/config"
   
-# - name: Create the readarr container
+- name: Create the readarr container
-#   docker_container:
+  docker_container:
-#     name: readarr
+    name: readarr
-#     image: linuxserver/readarr:develop@sha256:eb37f58646a901dc7727cf448cae36daaefaba79de33b5058dab79aa4c04aefb
+    image: ghcr.io/linuxserver/readarr:develop@sha256:2502c4fb7824e61932bde9db79b903e083ded22d1ed0ebbb0b7ce5508347877b
-#     restart_policy: unless-stopped
+    restart_policy: unless-stopped
-#     recreate: true
+    recreate: true
-#     networks:
+    networks:
-#       - name: proxy
+      - name: proxy
-#     env:
+    env:
-#       PUID: "1000"
+      PUID: "1000"
-#       PGID: "1000"
+      PGID: "1000"
-#       TZ: "Australia/Brisbane"
+      TZ: "Australia/Brisbane"
-#       DOCKER_MODS: "ghcr.io/themepark-dev/theme.park:readarr"
+      DOCKER_MODS: "ghcr.io/themepark-dev/theme.park:readarr"
-#     volumes:
+    volumes:
-#       - "{{ data_folder }}/readarr/config/:/config"
+      - "{{ data_folder }}/readarr/config/:/config"
-#       - /mnt/nfs/data/:/data
+      - /mnt/nfs/data/:/data
-#     labels:
+    labels:
-#       traefik.enable: "true"
+      traefik.enable: "true"
-#       traefik.http.routers.readarr.rule: "Host(`readarr.comprofix.xyz`)"
+      traefik.http.routers.readarr.rule: "Host(`readarr.comprofix.xyz`)"
-#       traefik.http.routers.readarr.entrypoints: "https"
+      traefik.http.routers.readarr.entrypoints: "https"
-#       traefik.http.routers.readarr.tls: "true"
+      traefik.http.routers.readarr.tls: "true"
-#       traefik.http.services.readarr.loadbalancer.server.port: "8787"
+      traefik.http.services.readarr.loadbalancer.server.port: "8787"

tasks/sabnzbd.yml

@@ -10,7 +10,7 @@
 - name: Create the sabnzbd container
   docker_container:
     name: sabnzbd
-    image: linuxserver/sabnzbd:4.5.1
+    image: linuxserver/sabnzbd:4.3.3
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/sonarr.yml

@@ -10,7 +10,7 @@
 - name: Create the sonarr container
   docker_container:
     name: sonarr
-    image: linuxserver/sonarr:4.0.15
+    image: linuxserver/sonarr:4.0.9
     restart_policy: unless-stopped
     recreate: true
     networks:

tasks/speedtest.yml

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

tasks/traggo.yml

@@ -1,26 +0,0 @@
----
-- name: Create directories
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_folder }}/traggo"
-    - "{{ data_folder }}/traggo/data"
-
-- name: Create the traggo container
-  docker_container:
-    name: traggo
-    image: traggo/server:0.7.1
-    restart_policy: unless-stopped
-    recreate: true
-    networks:
-      - name: proxy
-    volumes:
-      - /data/traggo/data:/opt/traggo/data
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.traggo.rule: "Host(`traggo.comprofix.xyz`)"
-      traefik.http.routers.traggo.entrypoints: "https"
-      traefik.http.routers.traggo.tls: "true"
-      traefik.http.services.traggo.loadbalancer.server.port: "3030"
-      traefik.http.services.traggo.loadbalancer.server.scheme: "http"

tasks/uptimekuma.yml

@@ -1,28 +0,0 @@
----
-- name: Create directories
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_folder }}/uptime-kuma"
-    - "{{ data_folder }}/uptime-kuma/data"
-
-- name: Create the uptimekuma container
-  docker_container:
-    name: uptime-kuma
-    image: louislam/uptime-kuma:1.23.16
-    restart_policy: unless-stopped
-    recreate: true
-    networks:
-      - name: proxy
-    volumes:
-      - /data/uptime-kuma/data:/app/data
-      - /etc/resolv.conf:/etc/resolv.conf:ro
-      - /var/run/docker.sock:/var/run/docker.sock
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.uptime.rule: "Host(`uptime.comprofix.com`)"
-      traefik.http.routers.uptime.entrypoints: "https"
-      traefik.http.routers.uptime.tls: "true"
-      traefik.http.services.uptime.loadbalancer.server.port: "3001"
-      traefik.http.services.uptime.loadbalancer.server.scheme: "http"

tasks/vaultwarden.yml

@@ -6,14 +6,11 @@
   with_items:
     - "{{ data_folder }}/vaultwarden"
     - "{{ data_folder }}/vaultwarden/config"
-    - "{{ data_folder }}/vaultwardenbackup"
-    - "{{ data_folder }}/vaultwardenbackup/config"
-    - "{{ data_folder }}/vaultwardenbackup/config/rclone"
   
 - name: Create the vaultwarden container
   docker_container:
     name: vaultwarden
-    image: vaultwarden/server:1.34.1
+    image: vaultwarden/server:1.32.1
     restart_policy: unless-stopped
     recreate: true
     networks:
@@ -33,30 +30,33 @@
       traefik.http.services.vaultwarden.loadbalancer.server.port: "80"
   register: container
 
+- name: Create rclone config folder
+  file:
+    path: "/root/.config/rclone"
+    state: directory
+
 - name: Copy rclone config
   copy:
     src: scripts/rclone.conf
-    dest: "{{ data_folder }}/vaultwardenbackup/config/rclone/rclone.conf"
+    dest: /root/.config/rclone/rclone.conf
     decrypt: yes
     mode: "0600"
 
-- name: Create the vaultwarden container
+- name: copy backup script
-  docker_container:
+  copy:
-    name: vaultwardenbackup
+    src: scripts/backupvpsdocker
-    image: ttionya/vaultwarden-backup:1.24.3
+    dest: /usr/local/sbin/backupvpsdocker
-    restart_policy: unless-stopped
+    mode: 0755
-    recreate: true
+
-    env:
+- name: Setup cron job for backup
-      PUID: "1000"
+  cron:
-      PGID: "1000"
+    name: backup backupvpsdocker
-      TZ: "Australia/Brisbane"
+    minute: 0
-      CRON: "0 4 * * *"
+    hour: 4
-      BACKUP_KEEP_DAYS: "14"
+    job: "/usr/local/sbin/backupvpsdocker >/dev/null 2>&1"
-      ZIP_PASSWORD: "{{ VAULTWARDEN_BACKUP_ZIP_PASSWORD }}"
+    
-    volumes:
+
-      - "{{ data_folder }}/vaultwarden/data:/bitwarden/data"
+
-      - "{{ data_folder }}/vaultwardenbackup/config:/config"
-  register: container
 
 
 

vault.sh

@@ -10,13 +10,7 @@ if [ $# -eq 0 ]
     exit 1
 fi
 
-#files=`find . \( -type d -name 'group_vars' -o -name 'vars' \) -exec find {} -type f \;`
+files=`find . \( -type d -name 'group_vars' -o -name 'vars' \) -exec find {} -type f \;`
-files=(
-  "./group_vars/all.yml"
-  "./roles/docker/vars/main.yml"
-  "./roles/traefik/vars/main.yml"
-  "./scripts/rclone.conf"
-)
 
 # password_type=--ask-vault-password
 # if [ -f "~/.vault_password.txt" ]
@@ -31,17 +25,16 @@ files=(
 
 if [ $1 == "encrypt" ]
   then
-  for file in "${files[@]}"; do
+    ansible-vault encrypt --vault-password-file=~/.vault_password.txt $files
-    echo "$file encrypted" 
+    for value in $files; do
-    ansible-vault encrypt --vault-password-file=~/.vault_password "$file"
         echo $value;
     done
 
 elif [ $1 == "decrypt" ]
   then
-  for file in "${files[@]}"; do
+    ansible-vault decrypt --vault-password-file=~/.vault_password.txt $files
-    echo "$file decrypted" 
+    for value in $files; do
-    ansible-vault decrypt --vault-password-file=~/.vault_password "$file"
+        echo $value;
     done
 else
     echo "Wrong argument supplied.  Run without arguments to see allowed ones."