chore(deps): rebuild

2024-09-10 22:09:43 +10:00 · 2024-09-10 22:09:43 +10:00 · ebc5d881bd
commit ebc5d881bd
parent ee8b2c0ebe
21 changed files with 325 additions and 328 deletions
--- a/build-debian-promox-template.yml
+++ b/build-debian-promox-template.yml
@ -3,39 +3,39 @@
  become: yes

  tasks:
-    # - name: Delete existing template
-    #   community.general.proxmox_kvm:
-    #     api_host: "{{ api_host }}"
-    #     api_user: "{{ api_user }}"
-    #     api_password: "{{ api_password }}"
-    #     node: "{{ node_target }}"
-    #     name: "debian-12-generic-amd64"
-    #     state: absent
+    - name: Delete existing template
+      community.general.proxmox_kvm:
+        api_host: "{{ api_host }}"
+        api_user: "{{ api_user }}"
+        api_password: "{{ api_password }}"
+        node: "{{ node_target }}"
+        name: "debian-12-generic-amd64"
+        state: absent

-    # - name: Download cloud-init image
-    #   register: image
-    #   ansible.builtin.get_url:
-    #     url: "https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.qcow2"
-    #     dest: /tmp
-    #     mode: '0644'
-    #     force: true
+    - name: Download cloud-init image
+      register: image
+      ansible.builtin.get_url:
+        url: "https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.qcow2"
+        dest: /tmp
+        mode: '0644'
+        force: true

-    # - name: Install Tools
-    #   ansible.builtin.apt:
-    #     name:
-    #       - libguestfs-tools
-    #       - python3
-    #       - python3-pip
-    #       - python3-proxmoxer
-    #     update_cache: true
-    #     install_recommends: false
-    #     state: present
+    - name: Install Tools
+      ansible.builtin.apt:
+        name:
+          - libguestfs-tools
+          - python3
+          - python3-pip
+          - python3-proxmoxer
+        update_cache: true
+        install_recommends: false
+        state: present
    
-    # - name: Install Tools to cloud-init image
-    #   ansible.builtin.shell: |
-    #     virt-customize -a {{ image.dest }} --install qemu-guest-agent
-    #     virt-customize -a {{ image.dest }} --install vim
-    #     virt-customize -a {{ image.dest }} --install git
+    - name: Install Tools to cloud-init image
+      ansible.builtin.shell: |
+        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:
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@ -1,100 +1,100 @@
 $ANSIBLE_VAULT;1.1;AES256
-32656263363465383531613338653130323635653238383232646265326433616462363464656539
-3162306463653134666135376366643861353862663765630a343165613030633661353463316463
-30633162376563663166616366643836316363663065333366643338383939636531323538616536
-3136383363636131360a326661366265653364323966386634656465376433633035343033653034
-38613637613431616637323038363933383037396236386633303366313835333865316563373966
-35623038613166356132633264366361313030313765333335343136326165326333656361363462
-61383538356434643333653534346264396335653535343362386234316666626431643130346436
-34363265613632666431343735376166383466633338353339646337613135613461363366346562
-39333135633061376139333030666365366438366434326139313265643034363934306134643630
-65356338373564346362633830383337373131366263323166386435313931633139646233623033
-36666334613766356463333963653034316636376364303063666237383732396335636231303764
-63343963633664393632613263333563643737393466326665633766663764363236333834313737
-66353833636661643536633066366666306231643038623632306230656534336666303930303461
-62323137353530396135376364316331353138616161303265376334303666633032646631323664
-31323336386339326530646237666239333963343732376235306537323336303030613164623765
-33383534326532383230616561376136646632643634393563346565336139656339383631333539
-66613830313134313239366232323965343063633433653434373564663861323330323663363965
-36363132626535663734653739333331616532666635333936306334656264646336366233356562
-34383135343335653130636132633631623634333961376262316536633339313033326239356663
-38666361636239356665626139643735333461633436373362373034383536326664336663623038
-31383237643733613533633535383939313835313363633362343965633336626263623932663862
-32376265666438333663373364613861656564326139363731313731343234373934656633613532
-35396535306164323237376232633830613432633735663636396137356361303730376239373130
-61313630313235373363333862363961313938303332366233656364616536316366326466316439
-39376632663062666135623639343136643065363734366430386563613530343061326661653733
-63323036633363386636333636633864333334306164306431663662383562396434306336303337
-32383137363834633731393564353238636237313361643438306536386432666663383563653834
-38613031353265316230363464353638373564636234303266396264306231383634623664626535
-64363033373535666135316364303862343732393036396334326136323437646239363361373762
-61633761343362653261316434636664353564363330303131333236336230643161623863376634
-34613466396330313837643139333565366263363430343536386266323937336466623931383062
-62626363383163663637353235343035323233393033623132336664396464343638303839376561
-65376537666430666330323430393337666233636165356665323032343563333833383830616165
-33636662633961346561373231646664643932386465343537626237663338613836356430393961
-39363963633237306561353161643133396366633762336437633138393139653261373539303539
-36316464643362336135363631666130653131326435306463366236323830663965363662646361
-35643430666365613465666436386332346561326439643863333138363263306331653733343432
-63363932303735396234323963363336353133376362306539333131323262336535333733393639
-63613064636333303532623935393262373363636161653566373830636131633835366463363533
-61333163326262343037313462303930363234316462623963323563303864383163643936643761
-61623461326334396539633364643031366231316535643135313935633439643361656136616532
-34653635303631623639656165666231363563383336666337323361636137643564373565323238
-35353965633230663166353161643033383666373530623739396139366137316438396333666231
-34613136363939633565393336336633636665363838323230346262386335386365376262326462
-34393539393365346364393432313665356465653866666538323134636630613137333261383364
-39313362333832623837313235353331346434303166633137303234303062646337373664373861
-32343037613362346134636531356463303739396364646339333138363064376632356534323834
-64313864323065303531366435393864303035303331313737316137376361656438353739333830
-64333234353837383938393861643236373338323436323863393933643332366363653935646264
-37376336616162346161623136393662306137616638383134363964313835333332366430353364
-64363730626564393134383534313130313633623137336630386364326365336262373963396239
-32393061663964643036323233633232326232656363613339376663633761316639323737383365
-33356562643530313434383639393766633733383263366162316332306532366362653737356539
-63656366356333396165383330626535626232336137646464323665316464626139373964623163
-31626230393661333164303834396331623934356538326166313635656437316236313630313463
-65303633616637383436383737366361313736383262663130343932323830383763643235353264
-36643966303937336636653037633739303364626638636438396332373862306665623037306336
-61626330313364333639353366363131343434663139643361323836353065656137333162333130
-65326364396665613763373565323165383638386135366235646437383130333434346635393566
-61303263343132663531663237666337326365653737653731626364383665663334643139346338
-66613266633263613037646334346661393063373330616431346161376137656139366166616264
-64343737643662663134363265653063636665656366656135633932653165343361633835336665
-35336139653939656162323366386435623134623062313461613261343264323731613732313435
-65313436396464366662366533313162343233323836323336393665646361343438383063623964
-63303761316666643237323364336139323536643664363331643565336166316163663731393065
-30643638356231303563343433616335306435316161333937363937633131373536346464356539
-36663865633336666539363734613131303931363732643665363866643533643763343433616561
-66656238653734383131376330616535636138663933393032613166396436623436393563643336
-38656164313566356566613331396539656531666462336163373034613232666439346633616166
-35316636323064346531656631363265366335336265316362623438336230626332333838626265
-61313834393664353133623132303332353633636464343764643334323866303664346563353839
-34366534383963383366633765366337363835326133366264323239323266313433636538303537
-65306230666335386332613638333738363965623934366338653133623434373831656361386437
-37323232346236616236346539613739313237326433363961666535343634643937343331653366
-32313864633562346132343538633035303432383033363939306663613939376261653662666161
-39383639646338656233376130633966343637353238346435383637376636363631343037336236
-36393361646161613736363135343964383364316265343939393333323937376661356331376465
-62616333306137643366386561343234663836653833666239383835393031303163393365356661
-31356537313530333934653564353039623766326236663635396539616533303831613135653738
-31373234346439373230613139636661656636393238363132383732376436646638643131376435
-36376435336232353333353563616164643632363565633639623161386436643663656132373135
-35646365336365333931653665343461663263333432306131633335333766396165363631663930
-66633039383564613739653436666330363661666631353461613333313632333032373939626263
-38326164303131386461613962326166666434393031633365306332383663303638666330363632
-31343135613065623464646661623865643765613838376434393765663366343961646432306135
-62356234323436653166613462373931616236333265616465346564653563323233383962306162
-33393030663330336332316332343731666561346539633531653431303934316663363964616236
-37336236346563346533643338366433343035653766383663306333633031343462383931343465
-38663432383865616432326236376633353935323434333431313739353232343762626439366263
-39333762343761613861396431643561653665303831613964363733396663356333373437383766
-66343831373463623233646438393537313966613238366334356331356234356232663066316635
-66636666333465643132383536643234343135396632393265663465393930346138383761363139
-62623966613964373963623362343164623837626638623330383932396638363766383166653462
-65346634646264313132623332633536383236376336313339356561663339656430623866306336
-66393263656461316433663735353733646638633430663635643064386633666334326437613839
-36316333326663663664363436613933636532393630346430313931633533623035346366343934
-61303437666334323231343336366330656261646566653938653733633933653562373938633962
-30386438343166316366646565333766393930303435663362303432646337323465316261623565
-363632346536336638383065656231373538
+64343839626330386331646462663462663936396466316130313266623633613262616431383731
+3365393436363336313633323031326666363736643632310a393631396465396363323335313230
+36393861303062623565353632333262393431373861363239356431353931323630623563373035
+3832383534326139640a373832303461623665303530623138653962613062336665306132346261
+63346134666631623338383961353066373264346365343365646565313336626266383135343831
+61363132333634313233396364303631343436383630346232343863623163643536363031656565
+63383239643335663833383366633237336266663965353964666632393963343432333161393238
+62613965623834393866366630303131353830373764313139316263326235363531643661646134
+38313431303163333764616230336565643466653632373563343466383630303830343261646639
+38666666393831346365356338643366393234343261373763643938366265316232383139323232
+65386535633330383831653638343238623066316161623862326130366431333131313033653538
+30653964363163393033626439333037646236376135646362363735363438383462336333313161
+34356632646562373738333233626635333662373134343232363235386236393039356666656538
+39316439373837303133666261663732623730366666313363363330616537373039363661383338
+37376535653066613532376333393963353734346536383630393864316334646263376132646434
+37633630373734666636613639646631643039396666346161383435653739653737633239623436
+39623364616463646665643261653738343635663933323935343162653335656334346338376166
+36616334646337383230633361373663666534336261653838346262346630653263303236363465
+35366139653766663731393864356465616336353862383636633962323865353431646133323930
+65303563646535663530643664373861373938313561633366343466346532626632323136373563
+62383963393031353531373664336635303338323137323864376330343830323161623130393932
+36316538346637343430323735323338366463396233366238653532623336636562376538313038
+34343066623366656335326461316538643466346166643432663766316465386130623139373436
+64306230646338336632363134616430653634356262613066363834373339376363333439356234
+62663336633830393366336561343366626266613336363639616566376266303431323861323164
+63346638376564396161303634343765386661653461666266303566346365356664303038383362
+61393938383761313839373634353763613532623135383331393934376135383330303331383834
+31323664623338613161316464326432313764346432323236623237623232356139613664633935
+34316431323835306331316232656534346439356236353235313231363163633332643030613530
+30386435326535663533643237326439616666656261363638343664366633366532333037626139
+32393939323833386665663931376337613433646439633163326166613035326639623462306166
+65616433373264323663663839356637316466633836343233336666393435366535333732623666
+63656433323039666564613734393836353238623433393165616633383231613763346163306239
+64373338656431353336633130373635306666646430356266343566663063663036376339366162
+39326133386437623663643831633666396231336331326136303761656363326132643338343361
+32386365373932336561333366616437663235643832303834663737666564393333316464646136
+31306533373133383362393465613238366265653464313730383937636338343938366563393033
+34613238343333333663363132386162323033373331626339386636653435353063613634343738
+63313235323465383839383165323561646337633862326431646165326236373032323561386266
+36373034643862623937336633666637666662303134646137383930663865383832333630303033
+32313832353134333439396563366266393832663638383530663438663963663634376666613463
+61636531376166313463613365333435623032393634636130366261643961636534323064303066
+35373934653163303337316237643230336463353366633432666430316362646534623730376231
+33363661396233393662643435373263633836343237316336346138313663626533636231363739
+39646238633766303535333662646361396462323539626365346534653762323764313836613136
+30363766646365346165353163383335656531383230353536616432616331306661333837366430
+65653431376133303531356231663136626562346336373738386266303262646263353862356361
+65333337363864326466623361323461363361346262323031393130386435323063616261333237
+33303238386533623265386237333432616361366661623333316532386563336632396161323861
+37333833316664646539363364323163323264636133643030323631333430333030346561356332
+34336362396136656230383837393332316130363438396538323462623033666465383633656233
+65306637633764613130376233333130306263656530616430383265626639613566653836373165
+66303838633033643137303739336337333936653833353035346263633463353365306333353338
+31383162326334393536393664373137646332626536393266323932303038663038343665613437
+64353264396561643665303831626361353136316463626334303630306430646161393131313065
+38396536373933306330356434333861306434393962313436386464613631303165366535366463
+39316636326362326336333130336436613532366334613439373637636465336636323334303833
+35353061643865356138303662656633633763303461653137323965376133613236383061356330
+62326637666434353135363735346534363666396262383638373763626534343337643037643439
+61306266663662646464636432303631373736633033646131656431373531346331356530363139
+39366264386438643564346664353762303837613435393766613832376561613261623831653666
+35343236666661346361306438633061616534636433353462643337373331306130653134613231
+35326562373737623364363561323333353839633637623039653338653134643437393331396637
+34663535653439333663343239636335333265643232383637383264393635313532313466633232
+36373562646239383638396532653130646263366262373932363930313339396462356530383739
+34393235646234386532393630373436353834336637643435346630633961663638333839366132
+32666337366566346166343236303736643631386131373762386463633535623433336131353631
+62663036633866666162383833353666323763343337656362626166363164326562386436623662
+39323538653337626231303336666264663530346564613465613530643230333934613465373465
+62366137633532616335623530323961663830616663613938316437646630383434643430386433
+39373839636538303239646436366339656333353365343138313364643234346236316162616430
+31323238393135636165336636633336633232386661613762326563323638626533303034346131
+31323433316261633232383562646566376266633466643637366366346235333934623462636431
+37623135316634616334353062373139653865633934393930393364343430626163663064343533
+34616430663232356231343831306662666432373937316661346462643231343539643561363862
+30353636353362653366353438346531666637663763636138666366306339373633306335323537
+38393461303261666437393639363265373531643534373163633161646164616664663139333361
+62303062623833333537626332353062366566663138376364373062363664366438323039353735
+63303236336235316431343330356138376361643766646535363364363739343563623831336466
+62303462393033373631616236656664373431333532383935383663383762353763336663373039
+30656162333762363139393961663632316538393638316633633663393361363237366262383235
+34383964643933633839303736633633653566353836363230353438336134396566656664646434
+64326436636435323137363239656131303162646635373736656663353630303630336164353165
+35333066396132393337383431383862623437306430313730363633333138383232633431613262
+39353564303035666235303364393664376264323466643135373433656562656132346431396264
+63656461383438363736386633343835643063613932613339366132663963666466313132663033
+66633265323939653437373764353161623963636437663563613238323561633735643036346634
+32656539356135373163353533313733393932333766643730663239363163336666653039393531
+36613535663561323037613930306430323864366432633065356665383263636439633333323332
+36353364626465323338326634646439633836616534333763626265393732623039306639393838
+38363063386462383165316362353234623832306237396131316365343664666232643530363338
+66306331633361333762303337363061643664396335303135656235653537396433326230653863
+63363466363135333834346264613432653532336534643938616362643064656665393939306437
+39326366343239663461643262636564363632636431326134656163343862393731643133343637
+63353134656464616531373835323637363861316535663564313735356662313931313833373239
+30393463316665616439303064356438383665313832656139323737366234313732353136346364
+31353163393535356164386561323838623235383630666633346130353939633564346366373236
+34393332373438666461333061323430383663626436663735336636643531366539643439623636
+373264356538616535636564643665356562
--- a/4
+++ b/4
@ -1,8 +1,8 @@
 [cloud] 
 vps02.comprofix.com

-# [docker]
-# docker.comprofix.xyz
+[docker]
+docker.comprofix.xyz



--- a/main.yml
+++ b/main.yml
@ -26,9 +26,6 @@
      tags: traefik_install

  tasks: 
-    # - name: Deploy Homepage
-    #   import_tasks: tasks/homepage.yml
-    #   tags: homepage_install

    - name: Deploy Vaultwarden
      import_tasks: tasks/vaultwarden.yml
@ -39,86 +36,86 @@
      tags: gitea_install
  tags: cloud_install

-# - hosts: docker
-#   become: yes
-#   roles:
-#     - role: docker
-#       tags: docker_install
-#     - role: nfs
-#       mounts:
-#       - name: Docker share
-#         path: /mnt/nfs/docker
-#         src: truenas.comprofix.xyz:/mnt/datapool/docker
-#       - name: Data share
-#         path: /mnt/nfs/data
-#         src: truenas.comprofix.xyz:/mnt/datapool/data
-#       tags: nfs_install
-#     - role: traefik
-#       vars:
-#         traefik_host: traefik02.comprofix.xyz
-#         data_folder: "/mnt/nfs/docker"
-#       tags: traefik_install
-#   tasks: 
-#     - name: Deploy iDrac Fan Controller
-#       import_tasks: tasks/idrac.yml
-#       tags: idrac_install
+- hosts: docker
+  become: yes
+  roles:
+    - role: docker
+      tags: docker_install
+    - role: nfs
+      mounts:
+      - name: Data share
+        path: /mnt/nfs/data
+        src: truenas.comprofix.xyz:/mnt/datapool/data
+      tags: nfs_install
+    - role: traefik
+      vars:
+        traefik_host: traefik02.comprofix.xyz
+      tags: traefik_install
+  tasks: 
+    - name: Deploy iDrac Fan Controller
+      import_tasks: tasks/idrac.yml
+      tags: idrac_install
   
-#     - name: Deploy MariaDB
-#       import_tasks: tasks/mariadb.yml
-#       tags: mariadb_install
+    - name: Deploy MariaDB
+      import_tasks: tasks/mariadb.yml
+      tags: mariadb_install
     
-#     - name: Deploy InvoiceNinja
-#       import_tasks: tasks/invoiceninja.yml
-#       tags: invoiceninja_install
+    - name: Deploy InvoiceNinja
+      import_tasks: tasks/invoiceninja.yml
+      tags: invoiceninja_install
+    
+    - name: Deploy Homepage
+      import_tasks: tasks/homepage.yml
+      tags: homepage_install
    
    # - name: Deploy osTicket
    #   import_tasks: tasks/osticket.yml
    #   tags: osticket_install

-#     - name: Deploy speedtest-tracker
-#       import_tasks: tasks/speedtest.yml
-#       tags: speedtest_install
+    - name: Deploy speedtest-tracker
+      import_tasks: tasks/speedtest.yml
+      tags: speedtest_install

-#     - name: Deploy dozzle
-#       import_tasks: tasks/dozzle.yml
-#       tags: dozzle_install
+    - name: Deploy dozzle
+      import_tasks: tasks/dozzle.yml
+      tags: dozzle_install
    
-#     - name: Deploy jellyseerr
-#       import_tasks: tasks/jellyseerr.yml
-#       tags: jellyseerr_install
+    - name: Deploy jellyseerr
+      import_tasks: tasks/jellyseerr.yml
+      tags: jellyseerr_install
    
-#     - name: Deploy lidarr
-#       import_tasks: tasks/lidarr.yml
-#       tags: lidarr_install
+    - name: Deploy lidarr
+      import_tasks: tasks/lidarr.yml
+      tags: lidarr_install
    
-#     - name: Deploy prowlarr
-#       import_tasks: tasks/prowlarr.yml
-#       tags: prowlarr_install
+    - name: Deploy prowlarr
+      import_tasks: tasks/prowlarr.yml
+      tags: prowlarr_install
    
-#     - name: Deploy radarr
-#       import_tasks: tasks/radarr.yml
-#       tags: radarr_install
+    - name: Deploy radarr
+      import_tasks: tasks/radarr.yml
+      tags: radarr_install

-#     - name: Deploy readarr
-#       import_tasks: tasks/readarr.yml
-#       tags: readarr_install
+    - name: Deploy readarr
+      import_tasks: tasks/readarr.yml
+      tags: readarr_install
    
-#     - name: Deploy sonarr
-#       import_tasks: tasks/sonarr.yml
-#       tags: sonarr_install
+    - name: Deploy sonarr
+      import_tasks: tasks/sonarr.yml
+      tags: sonarr_install

-#     - name: Deploy sabnzbd
-#       import_tasks: tasks/sabnzbd.yml
-#       tags: sabnzbd_install
+    - name: Deploy sabnzbd
+      import_tasks: tasks/sabnzbd.yml
+      tags: sabnzbd_install

-#     - name: Deploy mealie
-#       import_tasks: tasks/mealie.yml
-#       tags: mealie_install
+    - name: Deploy mealie
+      import_tasks: tasks/mealie.yml
+      tags: mealie_install
    
-#     - name: Deploy pyKMS
-#       import_tasks: tasks/pykms.yml
-#       tags: pykms_install
-#   tags: dockerserver_install
+    - name: Deploy pyKMS
+      import_tasks: tasks/pykms.yml
+      tags: pykms_install
+  tags: dockerserver_install



--- a/roles/docker/vars/main.yml
+++ b/roles/docker/vars/main.yml
@ -1,51 +1,51 @@
 $ANSIBLE_VAULT;1.1;AES256
-36326633353666613166393030633363373435666230663138303735323132663930663663383138
-3131616265626633663430353835663866356436373533390a623564333539306162613532393661
-61326437363033383862343034356639316162363364356135616132396136383962333062653566
-3966323033663162640a323461656637633062373134656237323339346638663338353266386164
-30653839343165663937653534313335316336356262303331643839643733663264643265633337
-62633265656330353536663762643130636466353165336535393033663937396364373064363133
-66323931663164313235316638393838326532643233636663333635656162343333643233646131
-33336239393035613839646434643633313239393764613836343039383361613437626334643534
-33373461336363636162646631323266353235326361393338366563653663343537633765653261
-30393863323134376466346663376432623938376638393135356439326562656534376233646364
-31353336396362323363323964383635303264646661626662333161303961383333636437393264
-61623638303066343832303034633736343031333732633437356134393837663637653738303837
-65643264663564643432363830373861323062393561386261323638353339663835663830653633
-35373865383832656665333263323463303631343239346632336565393032333865353364386431
-34633064356233626337646439623665613039666632366162346534656438393965623836366230
-38323765633333663266656161376233343131646165343538653335653061363435316536313339
-65366539313338623030663233633766373865653938616437323664633537306162353438373564
-30383831353563663834373731356330393535613162313461303265353461643434613833376330
-39653063363666353261373161636434366464306539306538623533373764666466383766646166
-63313263626539316163656431393534393266666632366430323439373931636235663137393363
-66323338643835356338646565653235333762343162636434653561626630333233343232633365
-64353139376236363039343432636563316562383263336434376236613734396564393137366531
-35613232646638313435326234366335356538393331363862353232353961373734646332646635
-37323930623932326164323831393462653331373562336264613635396339653161303863623739
-34303532376335623533373466366464666662653533363963326536633938333833376432616330
-62326261366463323934663939316338306535323935623935323337333866353539336132326564
-64623739623064333932386363353235356431656339663039643631353264376234316430356235
-33326233356638646163633333613736343732626263333631336333343434353164333436653331
-64376539336562393538613134633933373339363737363364623066383130653033633966316665
-36323361656131623435346565323638313030343762313765646264396461616165393762366436
-65363563313439376437626533386262323036346436663030303736363061396639633338386337
-65623534393561643662653538633630363663326430383030393062323934326465313533303662
-30323861613333353465396536653632373934363162393465373466636132383064663063383834
-66653938346463663335333737386339666430643034386335353938633232323333633238643035
-37643239383936393233353735333164663566663833383763306635646666666365336161316437
-64343032376139373036366433376263376565656435336662656661336530323130356266353265
-32316361623238386530303533343763646533653631613965386639386237303965636634353366
-31363137376633376532383361376631663734653262616237373933363330323337386434623261
-63656364653162323463626361633533353132666563393538383332306263316639396530323131
-63646566623064393930343137623564323234383430363365313834336464333432623466646139
-33343833353339633236613439623735316538373962663365623963663639663264396238363465
-61313338343435313035643163316631303433383738393162633032613830663264386538343763
-30363434653461396239306334333366333232373732353362666538323063313934346433666334
-35363236333038333363653737656362653362376338653364636566346637376566306632326438
-32663930613066343361616665396334393863643963316239313735363539333263656133356665
-62663236366665373637373436656630336630393333393164343265306533666366333964333338
-36376337376366333835326565323735613961323264663466356635653763343331373561666632
-61343466643661636335373663386466333232393064623538666636653439363639386462373238
-38613862656363373434353037613135363464313864386361323136613762306632653838616463
-3438636539363664613934313333336535623165306438353130
+39313339373165343238363465353965316536323664633761343236316532386661303662336231
+6338623335393732396162633239333465353534333638360a383761346336623538643564383239
+65333966336434306465613138623766666434346439313536363364613837663933316535393134
+3235303335393036300a613735393164396361353263333562396263643064343561353735353563
+64646631353136353432396561326335306636383336346430356461366431613037613163363163
+36323331666532613866373462373235393239613937613536663061613866376564333031333834
+65346564373835646236386230393838386431666539303263656637353663376234613562363136
+63306532373461653539303862373036373861383865653137383333383731616131323665333636
+63643935633032666164303335386436343566306237636162356630366236656337363633326530
+65306137316236646330353736663261623166343539303937346234326135666536373863653066
+65623731373135613764393532303065303936323835613139626637353565336335323866376338
+66343237383463393132396636656235346566373432643533303066386462323137643866373936
+62663666336663383664653065333134643762616530373561663061383932323762636661626434
+33383463383139343166613166383336393664356164616433636231383635343163376531313034
+30636435653038393332653964656230393936383837653065313831633736633861656163643463
+62333430656136333230353363643863303837366637373565663836326634646561346137343731
+65653939326366613930383935383564353930376131376139313265376335623534613262643934
+34353961343135313933636630616666316136643238363962646563636333633165616239356432
+64656330613336636363313833356439363038656265393561343263616366653231393438313533
+35636437643764366533393263393231336366353033646266383962396264333639643464306561
+35343633613863343431643831646164636264366561316366303338353965646634353036336231
+62626430636166643062343865613037626635356439646336396436343539386337363236393562
+61323037383331343636343266313762616664343336323163353131326130326134356437313832
+36356563316561393366636234396565366465333064303439336136356630386662323030393636
+62316334383064613938376335636264323731626634333061623966613663376266383535633964
+63383030326461323730383239323137656338623465653735303838383266333633656435653138
+37373632616536323466316439613865396239646137323666653533646333316434616466663438
+32633864313434316366663035386462653430306534353062656430623730656537366262346366
+39633262353665613766333161663263316463653861623130383062303161326133653736393564
+36366362363931313430356436633835343737396466386434623933323133626136353431363236
+65376230636262643962666466656532326438366138646239643262303536326630396562626336
+36666436663037383262366236623730386662386362616431383937623633356531306662643834
+35336236336566393561613861666330343937336232306333373733343136623064393861616466
+64386239346539386236306434373461313765363031633436393037663461333734373063373564
+33646265333538653835363063363031313439666237326433346265373362643364353130343738
+36363162303665623731353139313932316361336432376265333836326332313331366330616166
+36633764316462613538653265343031313033666534396361313837653339613339633232626666
+62323166623666393232633630666164363839616161383465386435316134303734316464356136
+64316565353161386162383237643964646432623939393532663962343964313966323032653531
+36643461633935306439396364616136333364376234613135306464383531616262666261343235
+62353565336535393439333263663434626332613533653165343134393166353036363038353561
+31666238363963383831383365656333653036653130333237616466393830326666306636383837
+65626138616262373032353865646261393534613165386437383166313939326331333238393638
+30343931393933663339623930393262306336656437383338643232393932363731616139323633
+39613361396630323961343731373439336464366332633837366333346239633836396130303766
+65323361636362303061386430346662373165663635633534383338333762386233623661383731
+36383262626533323636653933333961306137356366653131303235346362613231366335373630
+62336232373064363565353361656631386565393533343932663465373935313465343035326437
+34313563323764326135616462303830663365633630326533376666323632303732343761343935
+3636363938336630313736663832633833626530323834336566
--- a/roles/portainer/vars/main.yml
+++ b/roles/portainer/vars/main.yml
@ -1,14 +1,14 @@
 $ANSIBLE_VAULT;1.1;AES256
-66663364383263343838636561393437373730633165306539633566356166313664656166633537
-6333663336336463613565666465663430303665323766300a393063366230643139363061633636
-65303631383230396461303836386335306261613664393762393266636437333634663464353137
-6563366664663331380a346534323264633738663063356565643137323964663964656137633363
-33333264383830666637376337633432353732353630333134353638653234333730636166356164
-33363433343432623762393834336637626562613633393963323963623661643862636362313930
-37346233373231663762346633323634666436323364653136656630636462333638316632626435
-30336433353961333334386134383032356633643261656639623237386439653739363133633836
-65333065336464386164363037363766353066396163386561323338326439376138316131306636
-65376230383666393762393938313535386131313134613033393936633139363366373065623033
-33353733613439383366393864623130396231323433393732653966653132313262346538646334
-63303831333465613962653661656237326364396465366234383663333431366233363133623936
-62663632356361323930326230326565366366663733633137633938643564373766
+65353733316135366638323133373232303864363638313664666166386331393438333861323035
+6362333138333732316561326538313233653132376562610a306234363161396433383663333263
+61643839636136636230353633383235313030643466303363653731666234353464616631303437
+6461393366653439350a346261643564303730613636636133353365393230373235313734343135
+33303064626163653831363139336563366336333730653836346338663765663437366266636634
+33643162366539363466333662346533313931663832353134333361323336363964343232663166
+61393831643531306330326239346630396438343461636361386663396132643436623862343030
+61636238336662633463383261653239633038343162316132353030373566633961393735383136
+32643933393938646237353731353136613337313465353864336633316437336533343632333766
+61366134356564343230363733383563313064306464653366386161633030353965303132306331
+32643266353965653837653066623734353166386230336338396139333134393833626461326338
+64646639623063623261623861316162333165356132306166303639653361393335373431626464
+31306536323830613732623939636232353739636336363264393761396636343833
--- a/roles/traefik/vars/main.yml
+++ b/roles/traefik/vars/main.yml
@ -1,14 +1,14 @@
 $ANSIBLE_VAULT;1.1;AES256
-65353236643865303034613264613133353338613962646164333936353761336231643332303164
-3834613038663965376661373336646433353437373132300a353663633034643265653937396238
-66326632323432646239663762626230326338666138653330323566633864623734396639323062
-3735326666306239370a383439646335343965316464386265613437646163636335393139316232
-61396631356263333933626334313438633132663764326539393663636631303538636131303830
-31633037376231326436306463376134633031666431303133383237316530646261383733313132
-62343261303266613764633861393939343937343038383231353137333337383936623338313561
-64633330356639643863336437653137393364653833653934633762333461393035393963313432
-39633563636164363461326231306237343265626533366562626136643561636464663866303434
-64363663396334623738316238316135616162393566613631396163666134663765343230656135
-35646364666531303361623833643136663832363737623161386562393234393533306636363265
-37343438386439303931633434303939393062363138353732373163663761366337326437316537
-6137
+37326164353965653363666362343638666536626536646534363962626530383131643035373332
+3834663632333832336232316439666530613061363930350a346235613533396231323530306666
+61376536303332353762323930623664373835393266393464333739313461636164653431646438
+3139653830306461320a656233383866333239383432616131373831363564333531313761663666
+30633334383230663737376666376331326232343931376333383330363531656239613865386263
+66616439646361323838306535333633313233383034383730653166623831336238373566633066
+32383836396133383030343361623034633236373765613731616137333039323235363134373735
+39653530626661336362313865386134303362316663303834376132313832626533393334393531
+66363265386463313830663162633933316365363563306461623664323637366162383636616633
+35333433636539643733646333626133663365383061313730323261623538363532393532303335
+31626265323366343237393833623963353739356138393866346230373066613938306463363934
+32633063336231343063356530663261623532303330613630653636616466643231653463376165
+3539
--- a/tasks/dozzle.yml
+++ b/tasks/dozzle.yml
@ -4,8 +4,8 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/dozzle"
-    - "/mnt/nfs/docker/dozzle/config"
+    - "{{ data_folder }}/dozzle"
+    - "{{ data_folder }}/dozzle/config"

 - name: Create the dozzle container
  docker_container:
--- a/tasks/invoiceninja.yml
+++ b/tasks/invoiceninja.yml
@ -4,13 +4,13 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/invoiceninja/"
-    - "/mnt/nfs/docker/invoiceninja/config"
-    - "/mnt/nfs/docker/invoiceninja/db"
+    - "{{ data_folder }}/invoiceninja/"
+    - "{{ data_folder }}/invoiceninja/config"
+    - "{{ data_folder }}/invoiceninja/db"

 - name: "create stack.env"
  copy:
-    dest: "/mnt/nfs/docker/invoiceninja/stack.env"
+    dest: "{{ data_folder }}/invoiceninja/stack.env"
    content: |
      APP_NAME="Invoice Ninja"
      APP_ENV=production
@ -60,29 +60,29 @@
  docker_container:
    name: invoiceninja-app
    image: invoiceninja/invoiceninja:5
-    env_file: /mnt/nfs/docker/invoiceninja/stack.env
+    env_file: "{{ data_folder }}/invoiceninja/stack.env"
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: proxy
    volumes:
-      - /mnt/nfs/docker/invoiceninja/config/hosts:/etc/hosts
-      - /mnt/nfs/docker/invoiceninja/docker/app/public:/var/www/app/public
-      - /mnt/nfs/docker/invoiceninja/docker/app/storage:/var/www/app/storage
+      - "{{ data_folder }}/invoiceninja/config/hosts:/etc/hosts"
+      - "{{ data_folder }}/invoiceninja/docker/app/public:/var/www/app/public"
+      - "{{ data_folder }}/invoiceninja/docker/app/storage:/var/www/app/storage"

 - name: Create the invoiceninja-nginx container
  docker_container:
    name: invoiceninja-nginx
    image: nginx:1.27.1
-    env_file: /mnt/nfs/docker/invoiceninja/stack.env
+    env_file: "{{ data_folder }}/invoiceninja/stack.env"
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: proxy
    volumes:
-      - /mnt/nfs/docker/invoiceninja/config/nginx/in-vhost.conf:/etc/nginx/conf.d/in-vhost.conf
-      - /mnt/nfs/docker/invoiceninja/docker/app/public:/var/www/app/public
-      - /mnt/nfs/docker/invoiceninja/docker/app/storage:/var/www/app/storage
+      - "{{ data_folder }}/invoiceninja/config/nginx/in-vhost.conf:/etc/nginx/conf.d/in-vhost.conf"
+      - "{{ data_folder }}/invoiceninja/docker/app/public:/var/www/app/public"
+      - "{{ data_folder }}/invoiceninja/docker/app/storage:/var/www/app/storage"
    labels:
      traefik.enable: "true"
      traefik.http.routers.invoiceninja.rule: "Host(`invoice.comprofix.com`)"
--- a/tasks/jellyseerr.yml
+++ b/tasks/jellyseerr.yml
@ -4,8 +4,8 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/jellyseerr"
-    - "/mnt/nfs/docker/jellyseerr/config"
+    - "{{ data_folder }}/jellyseerr"
+    - "{{ data_folder }}/jellyseerr/config"
  
 - name: Create the jellyseerr container
  docker_container:
@ -20,7 +20,7 @@
      PGID: "1000"
      TZ: "Australia/Brisbane"
    volumes:
-      - /mnt/nfs/docker/jellyseerr/config:/app/config 
+      - "{{ data_folder }}/jellyseerr/config:/app/config"
    labels:
      traefik.enable: "true"
      traefik.http.routers.jellyseerr.rule: "Host(`jellyseerr.comprofix.xyz`)"
--- a/tasks/lidarr.yml
+++ b/tasks/lidarr.yml
@ -8,8 +8,8 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/lidarr"
-    - "/mnt/nfs/docker/lidarr/config"
+    - "{{ data_folder }}/lidarr"
+    - "{{ data_folder }}/lidarr/config"
  
 - name: Create the lidarr container
  docker_container:
@ -26,7 +26,7 @@
      AUTO_UPDATE: "true" #optional
      DOCKER_MODS: "ghcr.io/themepark-dev/theme.park:lidarr"
    volumes:
-      - /mnt/nfs/docker/lidarr/config:/config
+      - "{{ data_folder }}/lidarr/config:/config"
      - /mnt/nfs/data:/data
    labels:
      traefik.enable: "true"
--- a/tasks/mariadb.yml
+++ b/tasks/mariadb.yml
@ -8,8 +8,8 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/mariadb"
-    - "/mnt/nfs/docker/mariadb/config"
+    - "{{ data_folder }}/mariadb"
+    - "{{ data_folder }}/mariadb/config"
  
 - name: Create the mariadb container
  docker_container:
@ -25,5 +25,5 @@
      MYSQL_ROOT_PASSWORD: "{{MYSQL_ROOT_PASSWORD}}"
      TZ: "Australia/Brisbane"
    volumes:
-      - "/mnt/nfs/docker/mariadb/config:/config"
+      - "{{ data_folder }}/mariadb/config:/config"
    
--- a/tasks/mealie.yml
+++ b/tasks/mealie.yml
@ -4,8 +4,8 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/mealie"
-    - "/mnt/nfs/docker/mealie/config"
+    - "{{ data_folder }}/mealie"
+    - "{{ data_folder }}/mealie/config"

 - name: Create the mealie container
  docker_container:
@ -27,7 +27,7 @@
      BASE_URL: "mealie.comprofix.xyz"
      SMTP_HOST: "{{MAIL_HOST}}"
    volumes:
-      - /mnt/nfs/docker/mealie/data/:/app/data
+      - "{{ data_folder }}/mealie/data/:/app/data"
    labels:
      traefik.enable: "true"
      traefik.http.routers.mealie.rule: "Host(`mealie.comprofix.xyz`)"
--- a/tasks/osticket.yml
+++ b/tasks/osticket.yml
@ -4,8 +4,8 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/osticket"
-    - "/mnt/nfs/docker/osticket/config"
+    - "{{ data_folder }}/osticket"
+    - "{{ data_folder }}/osticket/config"

 - name: Create the osticket container
  docker_container:
--- a/tasks/prowlarr.yml
+++ b/tasks/prowlarr.yml
@ -4,8 +4,8 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/prowlarr"
-    - "/mnt/nfs/docker/prowlarr/config"
+    - "{{ data_folder }}/prowlarr"
+    - "{{ data_folder }}/prowlarr/config"
  
 - name: Create the prowlarr container
  docker_container:
@ -22,7 +22,7 @@
      AUTO_UPDATE: "true" #optional
      DOCKER_MODS: "ghcr.io/themepark-dev/theme.park:prowlarr"
    volumes:
-      - /mnt/nfs/docker/prowlarr/config:/config
+      - "{{ data_folder }}/prowlarr/config:/config"
    labels:
      traefik.enable: "true"
      traefik.http.routers.prowlarr.rule: "Host(`prowlarr.comprofix.xyz`)"
--- a/tasks/pykms.yml
+++ b/tasks/pykms.yml
@ -4,8 +4,8 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/pykms"
-    - "/mnt/nfs/docker/pykms/config"
+    - "{{ data_folder }}/pykms"
+    - "{{ data_folder }}/pykms/db"
  
 - name: Create the pykms container
  docker_container:
@ -23,6 +23,6 @@
      HWID: "RANDOM"
      LOGLEVEL: "INFO"
    volumes:
-      - /mnt/nfs/docker/pykms/db:/home/py-kms/db
+      - "{{ data_folder }}/pykms/db:/home/py-kms/db"
      - /etc/localtime:/etc/localtime:ro

--- a/tasks/radarr.yml
+++ b/tasks/radarr.yml
@ -4,8 +4,8 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/radarr"
-    - "/mnt/nfs/docker/radarr/config"
+    - "{{ data_folder }}/radarr"
+    - "{{ data_folder }}/radarr/config"
  
 - name: Create the radarr container
  docker_container:
@ -21,7 +21,7 @@
      TZ: "Australia/Brisbane"
      DOCKER_MODS: "ghcr.io/themepark-dev/theme.park:radarr"
    volumes:
-      - /mnt/nfs/docker/radarr/config:/config
+      - "{{ data_folder }}/radarr/config:/config"
      - /mnt/nfs/data:/data
    labels:
      traefik.enable: "true"
--- a/tasks/readarr.yml
+++ b/tasks/readarr.yml
@ -4,8 +4,8 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/readarr"
-    - "/mnt/nfs/docker/readarr/config"
+    - "{{ data_folder }}/readarr"
+    - "{{ data_folder }}/readarr/config"
  
 - name: Create the readarr container
  docker_container:
@ -21,7 +21,7 @@
      TZ: "Australia/Brisbane"
      DOCKER_MODS: "ghcr.io/themepark-dev/theme.park:readarr"
    volumes:
-      - /mnt/nfs/docker/readarr/config/:/config
+      - "{{ data_folder }}/readarr/config/:/config"
      - /mnt/nfs/data/:/data
    labels:
      traefik.enable: "true"
--- a/tasks/sabnzbd.yml
+++ b/tasks/sabnzbd.yml
@ -4,8 +4,8 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/sabnzbd"
-    - "/mnt/nfs/docker/sabnzbd/config"
+    - "{{ data_folder }}/sabnzbd"
+    - "{{ data_folder }}/sabnzbd/config"
  
 - name: Create the sabnzbd container
  docker_container:
@ -22,7 +22,7 @@
      HOSTNAME: "sabnzbd.comprofix.xyz"
      DOCKER_MODS: "ghcr.io/themepark-dev/theme.park:sabnzbd"
    volumes:
-      - /mnt/nfs/docker/sabnzbd/config:/config
+      - "{{ data_folder }}/sabnzbd/config:/config"
      - /mnt/nfs/data:/data
    labels:
      traefik.enable: "true"
--- a/tasks/sonarr.yml
+++ b/tasks/sonarr.yml
@ -4,8 +4,8 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/sonarr"
-    - "/mnt/nfs/docker/sonarr/config"
+    - "{{ data_folder }}/sonarr"
+    - "{{ data_folder }}/sonarr/config"
  
 - name: Create the sonarr container
  docker_container:
@ -21,7 +21,7 @@
      TZ: "Australia/Brisbane"
      DOCKER_MODS: "ghcr.io/themepark-dev/theme.park:sonarr"
    volumes:
-      - /mnt/nfs/docker/sonarr/config/:/config
+      - "{{ data_folder }}/sonarr/config/:/config"
      - /mnt/nfs/data:/data
    labels:
      traefik.enable: "true"
--- a/tasks/speedtest.yml
+++ b/tasks/speedtest.yml
@ -4,8 +4,9 @@
    path: "{{ item }}"
    state: directory
  with_items:
-    - "/mnt/nfs/docker/speedtest"
-    - "/mnt/nfs/docker/speedtest/config"
+    - "{{ data_folder }}/speedtest"
+    - "{{ data_folder }}/speedtest/config"
+    - "{{ data_folder }}/speedtest/web"

 - name: Create the speedtest container
  docker_container:
@ -28,10 +29,9 @@
      TZ: "Australia/Brisbane"
      SPEEDTEST_SCHEDULE: "0 * * * *"
      DISPLAY_TIMEZONE: "Australia/Brisbane"
-
    volumes:
-      - /mnt/nfs/docker/speedtest/config:/config
-      - /mnt/nfs/docker/speedtest/web:/etc/ssl/web
+      - "{{ data_folder }}/speedtest/config:/config"
+      - "{{ data_folder }}/speedtest/web:/etc/ssl/web"
    labels:
      traefik.enable: "true"
      traefik.http.routers.speedtest.rule: "Host(`speedtest.comprofix.xyz`)"