use jade wings

Reviewed-on: #13

.gitea/workflows/update.yml

@@ -0,0 +1,17 @@
+name: Update Images
+
+on:
+  workflow_dispatch:
+
+jobs:
+  run-update:
+    name: Run update script
+    runs-on: runner
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Run update script
+        run: |
+          echo "${{ secrets.VAULT_PASS }}" > ~/.vault_pass.txt
+          python3 scripts/run_updates.py

.gitea/workflows/write-new-template.yml

@@ -1,13 +1,6 @@
 name: Create New Secrets Template
 
 on:
-  push:
-    branches:
-      - main
-    paths:
-      - "host_vars/jackson.yml"
-      - "host_vars/jade.yml"
-      - "host_vars/nas.yml"
   workflow_dispatch:
 
 jobs:

host_vars/all.template.yml

@@ -1,22 +1,12 @@
 ansible_user:
 data_dir:
+docker_network_name:
+TZ:
 PUID:
 PGID:
-TZ:
-docker_network_name:
+ansible_become_pass:
 media_path:
 
-# frigate
-FRIGATE_RECORDINGS_PATH:
-
-# traefik
-TRAEFIK_CF_API_EMAIL:
-TRAEFIK_CF_API_KEY:
-TRAEFIK_DASH_URL:
-
-# plex
-PLEX_CLAIM_TOKEN:
-
 # api
 API_CONTACT_WEBHOOK:
 API_JWT_KEY:
@@ -38,6 +28,11 @@ OWNCLOUD_DB_DATABASE:
 OWNCLOUD_DB_HOST:
 OWNCLOUD_ADMIN_USERNAME:
 OWNCLOUD_ADMIN_PASSWORD:
+
+# traefik
+TRAEFIK_DASH_URL:
+TRAEFIK_CF_API_EMAIL:
+TRAEFIK_CF_API_KEY:
 TRAEFIK_HOST_IP:
 TRAEFIK_VIDEO_MACHINE:
 TRAEFIK_ENABLE_DASH:
@@ -55,7 +50,10 @@ MASTODON_VAPID_PUBLIC_KEY:
 MASTODON_ARE_DETERMINISTIC:
 MASTODON_ARE_KEY_DERIVATION:
 MASTODON_ARE_PRIMARY:
-ansible_become_pass:
+
+# wings
+WINGS_URL:
+WINGS_CONTAINER_DIR:
 
 # glance
 GLANCE_PIHOLE_TOKEN:
@@ -170,3 +168,9 @@ HELIUM_EXT_HMAC_SECRET:
 PTERODACTYL_APP_URL:
 PTERODACTYL_MYSQL_PASSWORD:
 PTERODACTYL_MYSQL_ROOT_PASSWORD:
+
+# frigate
+FRIGATE_RECORDINGS_PATH:
+
+# plex
+PLEX_CLAIM_TOKEN:

host_vars/ash-1.yml

@@ -0,0 +1,20 @@
+$ANSIBLE_VAULT;1.1;AES256
+63396333353166316666616661613532383538393239303966633336363361613332343437376566
+3265326538643839326262386165623639353130656164320a323536333037353664646163386335
+33336631303336616636343538353865383531316561623166323762396262643930376231616638
+6638613961313364390a366564343030633665646666626165383334356364623761383032633963
+39393264353635626539393831323530366630343665623561653836303065633965316163386166
+63353836333639363765616164383133623330653762333762623632653535623438313831653365
+32393732306135323062666539663839656563306133393031643766626666323534626638653236
+63613832333833626439653034366336633534323131356262396138373938383039336263356531
+36323432653634366365663039336231343239626539393961636562366263653934613333633535
+61613937336336323135376663336364386533366537626133316130353862633862336530633339
+33663439663332653461643839353564333765646537363864653765303933393562383134316434
+38333134646362663837653461646661633539623734316635383163313363653730653763326262
+65326365383661306466663930646162343033383932633866383862626339366631633862346334
+36366161636663653136383439333461366264383533346461613631623730326437376537373638
+64323863333364613039613533393232373162346436613864336237336439353134313361653634
+64366663303265386663623139636131383432343238306631333436373939393832616262393232
+33376466613639396436396166363032653434653730643734356432653063303762333230323431
+34313338303838346466666463376636323433663038363935633362656164383762343531633563
+386432323237313039376531653362326337

host_vars/jackson.yml

@@ -1,109 +1,150 @@
 $ANSIBLE_VAULT;1.1;AES256
-65383533373138633437386332666563393764366230636566366431653133666237366334373639
-6634306238306337613364396361373663303639666439350a333035633439666164393236663232
-35373531653039313134356165303534383139653837333561333336333935626533343438306231
-3062393330653339640a646533363532633632643563343162316561383335633662666230633837
-64376532333436336531303432303131356363373830646533323061623662393762623766666236
-65373062613034306361373665353039366533316266396363393933333434313739613335623864
-34383761306432346535623137613930333634373239663338346433313564373865313566373162
-36373531383534643236623235613432343434393263643939643931376135646365633738663261
-38656132616661376133656464626631316639356663353632343132666333383136666666313039
-37633834646363366162386365643363666535623735336138376361336636393364333732653164
-34396134303735653463306434643461636463343330363663333731383333386239346632663935
-33373536333566366138643635363235313963373837646336373965636637326532663966373635
-32363038666464343632313933626663336634386335303737323766616133343561366131633934
-38303163336362343839353739366631333761386631376134656634643362333738373932663637
-31336338363464653139343037666366643936316262363035333031356431623435383634346134
-30636430386265663237316239613666313539313761623236326235663164366131613838626463
-63623562383139613830333461663765373639633366366234353132656463333464313163383433
-31613438643239666464376161636534656464383637363635363739663862333537346639383761
-63376232383866623738393063366162376233646164346464316636346136323661376137303437
-66343738346137643836653339316161636134653630393435316537313333353465643361303935
-64343937643966623363656531366133343462663934623130613234633032393937343861356230
-36656538656431303464333965303266373761356135366666653136323164623335303762386439
-33653866663262666230613638373937323039306636326535383563323862333039616266633730
-35323534393764363438353836353461313465663164623035313637663364636336623964396132
-35323062383937363235383764313239313866396665396639386264356233363265616563646530
-39623431393430353961323731323764633265653739386539663736626263363965376134316630
-65663639613261356232653038343233313530303262393866303162633266633130373666303964
-61633966623164313034336463383133656430363830353462663436343331376535316137356261
-62396136303062393039643332613732613238396236346431326234666665666434666261376363
-38636439626136323561616365656264383236376363356538306235353838393137343566656632
-64353936373461336134663933643935613435643633323633373065616238356362323865363963
-38353833396165346135386437376539313734373538313333616433343539346133393738346164
-63373366626635646465326137393039333937323635393139663666336237316131653263363432
-34356265633335633164366333326638333664663161303565626137616630333362383832386166
-61623631313639353635623132313235656362626230326532396339616535356534343433633161
-36366336373035373563383862353366376535653631643732373134653466613039333163393036
-62653430353062323765376264326130333661356531306439346238663834633031356538613664
-35353863316236653965616337303638626335326236363866346264613736613765653438376665
-34633032616165643935643933333737326662333233333734343964623631653564396535386166
-31616364366466623263393064316538346235643636643366386166346335366665333966396336
-38376463613635333433366462376233333061343436316138383861623965616131323536326634
-32626239303865373433636337666366353733646465623634656466333731303034653466373931
-35363335336561393765666435343131383733346165366236326665396661363066626338343833
-32396134613836616630366364643961336139656234656366636438313166663264313561306566
-38363763396239666639316431323536356163623863666363653735623364343730376262396631
-64393839383530643330373162386364613366343532383631323037656638646134333330643539
-66393961626162323666363132363831616534393562636331373336336162346536383063626439
-65636532313063363834613230363131623332343962616331613763323535373066333363356336
-32313262303063616366373733333435306565656366383663616263653839323566653765336636
-62646432366439313762376537616363353233393362643439646234636631373135616465373033
-31363564316665346235383835386466316234383230343561326439303563653534336164666331
-34646339313562623337613865636538336464626164656235633463353864636338653631383738
-61343666653536346234633331393837613734613965376138366532626662363764346365626463
-31633432303933646638366430333137656533353139356438623937333335386531616239353031
-37643932366161623265323663326461636364663038633166396536366334376563653734623364
-36623231363661363430383461386566663864623666363837303931383531363064306266666131
-65656361653539646162656562376130643037353233376434313038316364636639643966656233
-38353066616663346563633132363233656132333339633238303738643463653865633137633131
-61383862633335383739393039633664383663396363616530323334393139656530623634323765
-34633039623363613339333162376138313636363638336564343431346563343538396434386239
-38313936616261333538336230666564383633356530363133666336306561323363306166623761
-62613131356662393039653862633239356631346262326436656261356539356161333633666566
-62666239386433373438363131366166363337643437323561316138306130623839353964376231
-64323534613439626239373565363961626136666335383636653332393166393562366630633333
-63663964366433663563653631393731333066353063646563663030653639313530633265666438
-35616432616264353962373738366262646432326561643534323135396532653732376234613938
-64313533353631326633343231313265613635373332633662323332346332613066343062313438
-34373437383761656436643264653830326338326434613234616163303431333664646537666262
-62653663333939303963336663343432626636303834646339383335343063646634613965626135
-32326334326662336539373631393239373737363662366563663666393165373866323931366332
-62623137346464656637383533393961356239663432636262373563396636613666323534323861
-31333865303335306161636634316262326533623838616333653435333232356630303130373738
-65663937323063363035356233636131346232366535656534393765343534663135333736383361
-65323332353831633837303766346136333765343436613061303439356361393833373037616464
-36613963396437323130336439326665643264346432356465326539306138623565626237383433
-34643633653263336632636534343030383038383366356536376265653738623330336131613265
-38363238633936346137356433316230653032323033386362636663363238333463643634656538
-34366363646531386234393234383735623734363639326565656633343039303834393935313333
-36396332336134303936623730373334613166393664353863613862313633353034316532653631
-64623563656631396134633261643936633631616338303062626539666635303262663065313435
-30636432356332313331333838636562313532343636666432666564663965386239356231666566
-32383266663139663833613930363137373562343463316230303338303435323363383233656238
-33353264366164623637383462356137313562353562376131343030636332346230373532376537
-38303032376135613963373733616338333463633964303163356632636666623565346366393731
-33346137666463646666323933323863666331643633366664646565396635356332366536376362
-62373838363337383266396333323935633866663361356438643534616665666232626537313234
-66323137383437376465656232616130336661336434343362393931376335633231376632656539
-31363137666538323261653263393736613662316232373336653065336462346164323437366331
-33386234346438363365313530346233366361336462393263313765663564353966373737626539
-64343131396637643461316539313834613738633761353364313534373061323361313633623730
-61663835663066646164633731633532616366633063616230616265633137383930336231393230
-35623264326462623736666565366532306664396432626233303337383263383730346361306664
-32353432366264343035366439363863396264663639383364396665323732626666653037663365
-31333735393334663765656330303939613566343232306137303265663063633065343161346533
-62326235666636636639366265383361343733386232343930623139643937326537306366366639
-31396631393561343535616637663530623838336339303761363939313430303365626230376566
-32356563663936623731303130333961656334396633313865373465353362616364636338356236
-66386131303766303931646635623636636136383064613964316561333763373030396532616235
-39313862396539336364366561303835346138323238393432343030313164323566613463353564
-35353763336132633463306633383730666436353834316332383261363433653635363864633863
-35343039616131626465656365663266346266626330323166323965386366366633396534323130
-31643330386432616331643539313563623363653232643331363162323536316364363333643832
-62333335653035326330346264646538313232643337386433353935636532386536333636353237
-64346464616166386663613635386637346563356630663535633431356431616332323834353366
-32386266656464353664353636623965393232363464353765396563333364386638633231616261
-31323763373932663164636631343633666663323631346234383139313336663665306130663032
-64356461303366393030363038326333613663333734633664623266386463633464656237633235
-62393338373765383433
+37643962356232333837626335333837656531656363366365306436653930373333393939653239
+6464373031336361323535383731396538323539646335610a396166353437663437633034323663
+38633966666230653963613661623333373430346135613039656531643664363531383266653463
+3431613963653938640a363637613966323132303039313037653962623438656139386631363233
+34346561653037326566636138626664666461346433323230663235626265363235626364373532
+61366533623135653134383064396366356164393666333763333532386163343532333032353334
+30626635323565313735353964316139653835303631623738653033396561663839653237656635
+31616663323164383365333837623537313332363065383430653138373062633335633834373161
+32653230313839326165623563363161353934326264313461303966393833663465386265333233
+33363038336562386238303366353261366233646438353439323064386264373832663534336331
+32396264346662653661356665396539633633336631653738313131663639303662383463356339
+61343131666536316636626432633266643139393639306239626662333335646164633738616363
+31393964666438613161366665643036346562376139376362356636626462626431643331656634
+35646237663931646264306433323737316434646331646363303165633938646437656137323337
+63613131396364623234333433626336386630333461306232623632343630616163616161643734
+38353036373134623934633337323335653438333163303539643239666164666435343134643035
+38653166646632376161323065393463656566613434353962333265636135653939366135393263
+64663737313166326238646138663330653334623930373035633262383334656631663236316363
+31363134316462373637643833343030393536313335316261323332656363363032316631613236
+62653034356539646165633335393665616237633030376462313234623035633662383739613662
+34366364366636393264353737333832343035356664386239326332333138626662613962666462
+37323463653435373864303934633336396566633066313239663364656638646234623236646436
+65613632623566646330396130373639306161653264663161336531663939633739313663356231
+36343765343862323864356166303630333538383433326436356136666164393861646661623139
+34343731623562303135613035303730656565316532663030616463396330663839313961633035
+32326635356232383638653834386632316235613332323861613739383335313066383739613263
+31373537643630623866303333313735356633633162343365316337376366353734326363623063
+65346365613936356332373063336338323438613366643634326136376238383830316635626231
+66353966393539666434376436616162633462623636326139653461386432366464303334376237
+30393331633431353532373463663933646262646433666565313663643964333765396633336134
+33636166623337323061336563363131663461643633393930333339613865303466356465353231
+31356630376664616232333633306636326130633638303539643633656266343634353733373633
+36366266646632653964333537643865303535643265326537373366356361373765636136386439
+66383734346566333931646363353633323765633461326633626333393439633166313635316436
+31616436633231396164663233653961613630616463313261616533666437643232373562316634
+34366164383639313134383134383962633964356162646631353064353264363932376661623534
+65313363353363623831623265393463623066303234663733333432343231383937323136376339
+35656539343531313936313137646133356666316630376534366534663335656164363737383963
+33353530373935353230366166343364646335633236333766613665383930366437353763613339
+61653161653165373965373434333138383638613734616166323133346466656636643163303566
+35653331376464323331323337656630323639656434333364366230653432333537636566643261
+30623632656338366266383962663864373863623438363830376361376134303436373465636632
+38643263663437316333383431366365303437633264383239353438326631373133376539383638
+32643666633965396666343239636361323635336338386438313065383263653063393436326434
+31366636633436303835326639663830356466356432656134376161646632323134356230323364
+65393663323138633638343638626434656466623563653939663665303161616631306337616537
+64613365363966653964626138303935643835383763316634663561656432383436336135656131
+38653962306530343933663038353738306261336463623635323861623937386463306363666338
+30353462656135396135633037376561636133643834633966306365623938366238383439656531
+63323534626364393761313835386636353335616166666131646136643839636439633161616331
+38643264313433366335326563613339356161383663623864656434376532363966646434326633
+31393163353163343139333039336631363839343631376463623866656132306161666537666364
+62663033663838383134643339616631396637383565633930376262333263396463356133323831
+66663866646536653064343663343938346332323863356430323430623538386136636237366436
+39663237383364326164373263386435646434303736303931366134373964653566623135363532
+61366464393032653031386636316661306565313036366562616233393064396432653636363434
+32396335353233313435643032313065373465373635333134373635316664656162666262396430
+34383933323731326238626234653266636563623661343437643263346365626465643833656564
+66363130353931393861363731646430373937316265646633613531306563396431373737633562
+33653137393761656339333034366436346534663338616562616636643762613462346232626161
+64616436343663646233653138613230353432316435616333313236326162633239653964393562
+66306230663038366230633262393936343435383864623238353935393061326661363132386561
+35666163323332333637323363333534626330343831303132326231393630633539366635396630
+32636162616330326237386332636339336237326266663761643933636365613030643539323635
+64653664313337623438383131343430373038303333663330666333616533626437333433656530
+33346461366231343763346165663432376233623963613265393033373832623736356635623238
+30323230326331316537346133386630326135383534303636396639383437373764623835306635
+63643836333334666231653164646566663063333361396431346665336236613164633566623732
+37626561366636356538626533663134316362616464356438313333633134343433613033323035
+64396538383833313461383136666163663262666261386664323533633938323439643036383737
+33313330663833376463653439376639336534313833336161333336633965616366386433373237
+61343661353166653362363830643935366662653330646431323665306239303435653864313664
+31333332363335323563353835373938313031663037343861613232363436616138633336623730
+33343630326461616635333265333430613433323362373134626538366139333530306235303736
+32346537316163313766366663373438653233303031333136393835636631313932393631323138
+37663534353032626262393965393232616431323661663030303062383066613564313335643631
+34633365383564623034663537643832623836393936303765363065373734333031383162323330
+65336239386664633936616433653833386336386131393962666537653235363638323465626431
+34366138323835343830303832386539323362653761616366336435643832366438333331613331
+65366264613262366438316266353763326434353565653861343234396638616464346466373531
+33323961633461363135653537306461373532636166376333363737353038653236643462346362
+62366631613966373636666665383165313763626430346266306163323137316531306532613232
+32393564353531316464656162356139613237323139613337666532346537646365613464353739
+33393962346465623863646333663037663361326236353063663962643461663838316566653434
+37303064396230353664396539643231653664353230643733336439616537633339313535363662
+37356137336139326161386532383230653931303230366534383439343232383337313065383964
+36623563643530396364336435646338656538663432396462306538396565356664383330623238
+38383930353762623637313139656439393662636237383633623236626438663132366562353261
+63643736376262333336393165373534393835383836386461376563396133623231343434363237
+66383036303233366365386266333366316236353533303331633663623161656532323535386137
+62333039646462323638346632373137393035343064303562643033346462363938363265363063
+64306238633563613535313464663238343861333166353730303831313836633662306432663131
+31626534333364643832333539643663353763323639633565373639353131613463613737656434
+62386134326438393565646562636333386639353430316637386361386161386165306665343932
+66396363383830336266643130656665653330323334666363346539343462353963373264656530
+66623166633439356638343837353764366364313764303937663134373434343066373537633266
+31353865343465636561336538346137303130356132316232353533373837616563626633643138
+32303136383765303637343561336265623634643334333930653639633964383564386338373037
+32303930623839343064353432306566303533646239633335343464333434323664636435306431
+65653837353036303735333830383438653530386331343961623339616664653530616236393562
+35353764323334306265393331303837656536613636663166393336356637383165393365383665
+33346337346566393066636464366333366538376161353336366232353063376562356239616362
+37653630396636303933613161316561353532663965363465633636666364333234376638373734
+63303635353365303536393534303861383761616638633635633732383137373537333933656238
+30613564363832323164376231333131353132626439663866373432343563343632613163353237
+30333332663935396137613633626634363063333364613336343166376236373939303032616662
+39346366333261383636303438336237356563316333636234356639663731653334363935316337
+62643736666365623063616636613266346630363365386161346339373164356165653461636232
+63313162616366316331353532383338373430623832613935303430346164613936303335633936
+31303136643735613635303735633835626262363637326231323161363031373564396266633465
+30343464363439653162623737643363376234663162636262653534316638343361303664653239
+35663763323761353035633334343038363066373365316463303766353266356165313265366663
+66346433316534373938653261623930303633633630366664643761363237643831373238626133
+62306661616439346438663532363232356638313134663737343066373736333164646432303631
+35393837383665343336653766616263643563666165616631353836333565323165656264316332
+36353961626637353939633539326137323461376632653435353665613832366530646265313130
+62316366316566386666363964303538613935323936633461383231376161373632306434623962
+32316332363364363366373739353838353236643334366236336565303633306266396432353961
+64343863376337396134656132653431653764646466636165613936333838613132396636643932
+33383236333034393165376532346566646238323661323561623030303238353439626333343663
+38323733663538643666386537643533303031346264633138306439636236323336656336613766
+35653433343932386237636633373635633265366163346439373733663338313662313038343063
+38316164363433373964376463636162616464646462393534343734353861306630393330303531
+36353263346432323666353463376430333166613466303435363666346164656232643430303363
+35656237666564656264366632666464326530666637613764323762303964643138346433326233
+38346230656164653530386436653461396563373938626537303563623136313033316135326161
+62346139633462666661396639346464623532376535623239366333333038393330373838386532
+36666265653331313130323662383933333034386538616133306634376565653936653664636131
+30623839336238333537666662336431396633396362376630376361636565343732313262623065
+65616138333538616635326639303863613462623163663664653263303139373138376134643165
+34663933666166343135366562623861343037303364393562313635633465623463633164653031
+62386332336633326339656663633630663762643430376262323531626137353838353764643939
+36626565653339653365383337633865386165313538666635613738343139383338613239393866
+39363634303533386633353234373736353633313636323231636331646363636164396530653566
+35656462336532656666363333393335396663653064613761363565386561646463353363656463
+38663161353433353936376336326132336533623837343230613737393439346632353766383939
+35346135626632306233616332346230323663366634396165666362626130656531646462363865
+63666266633937376237373837633237636638363333346437663037373339613062366435653062
+36613836373962623930333733326463636666376132633463343366653365393963383564373564
+63316431303165383263343330656361346165313938356431636563396161653533666339653762
+37316331303764663366613738363862336236353763613661656666376139333635306331376263
+64306565373438343134613531653938373338326161363634653339653864373861623939336439
+63386535623230326237653064313038316163626166373135623533306562346665326137346637
+38316566376463323663336665306538656430363638653362616530643639616266633362636539
+38313132643538326132323566323361363138316664616431626435353435613937353134383061
+38393663323164393737663133353732316461366634663564383239393436363965343237636537
+62313833333464636662643838366434373464626165343934333236363232313037653661366631
+39313438663565613233323937336130343861383034376664333631623432643834373138386230
+37313235373239353630623262386564356433363730623831643066303831666266

host_vars/jade.yml

@@ -1,221 +1,221 @@
 $ANSIBLE_VAULT;1.1;AES256
-35346139646661333531663264666639343165303434653366313263633735313830663430613731
-3165363032633834396364626436646537386336376135390a636532653061383133663263633864
-37663632616364636363666563616636383533656130636266373335623862613464343834383737
-3032373633613161630a613434656331373135396632323738363062306265613730613463633637
-36313933316335653033306263646638313835393738323333663864303730343931373232383361
-30373036623130653236363533643539316330383734343638643030393866386262623937623437
-37616163613031323937633935633062303335353131663037623939373933393066653833303163
-65646137333331346465356438323739333764343465313265366463653132646535663035623736
-36653861303438353837663064366466323262356361306466656337643333336665343563313337
-31383739623635323366646261376363643033363834313662663438323633313738376331323533
-62353937363864363164663863383138343138396236393363396534336333363131363739646334
-64313665636561616539376631363362383134313137653561366261646335396531643861373264
-38376539346664613533373834343761303265616332313133386662646465323730633730613337
-39343034396566656233386630376437303466653630393331343136366562333364396133633536
-35326162336334363565363261316661303138373562353435363566626533613338336161656534
-32646435643937363734626536623431356635363861323633373634376161346233653162346236
-66306365393464373061396666306530616538626661633664363962363435393839373835633234
-66353464613665393835616432666334363337616362353666623136393134666363303861613438
-31353930366163343664663537613235633761316439646133333136313336656566646436336666
-64623565393539663533346639393334656331643233346461656266656264373861636236363139
-36346230306331356237636139356136613861343835396264313866613861306261623965303536
-66303136643438356137306239356362333736353233313830616134363430646136306638323439
-34366365323539393339386435643535376161656132343161343564396130383563633632613463
-38666664643039346165323161303433343735633837336537343636666662346638333165323334
-34333966613939333463346535636361616637326664303364313034303839643464633365623563
-36643165376161636562323330646332373232323663623138326633343832363038313533626165
-38663263396564303836643930313863343463626364323663343262356265323232613738383036
-34323136646261613038653639613234376432303835613833646633663266633836336234343931
-33633338626138356563373632393062653230373835306530323232353239306461363235323535
-64386132386561383133396239383065623461633232626631373162633039613231303935353737
-35643232623336323562306562656664363531326261383230663962373336356165643031323735
-63623663656462643532643130306635313133313137333831623962376537303761663337303432
-61643631353762613861653865333465656265323234326561613738393661666363333435326439
-35656564333938313037633133386563656437306637303661643333363932323330313332623337
-32396436303534613463373733343961336262306166323163333231363964363139356338653430
-61316364656566316638643236353661653864326430616562613539396431623762396637636361
-38646633306436356530663231353830313239343861333330326462343562636131613932313834
-31613532383866316234323037666232636565643264633638343236323837386165656463323130
-35333539643133316639336533656365613537306130613363633066656130356466623236633330
-35346539356165336563333365383662376664616134303938356462306565633630343539656333
-30663064633139323063316335343131356262626532323933373132336432613036333261383632
-36636465356233643637663037346164393365393461326535656366376662303238373939363335
-33333062626639333534346434646630663162653336373833356363376161373137633438333064
-61636363333136306165303039636632363432636539356634646163633334306531326631626139
-34313539343364616462643039326439643263313133646465356435356465643131303263303332
-64653739393232393731386662373635343735326265636565303561616262313534376333656531
-30623261393330373666373865653337353966616466633835646339636635653030633430633134
-63616439393232653032626333323063623863376266633634323430346536646465393431373765
-66333736643432303262643336306662623265396439656239336634343731646464376531396539
-66376633326563623864386361393437373764643361376665373433643532323239323035663364
-33653535313662383637646633383132316532666364376363323533623962376163616638656663
-35383264343532613332613561646137306339386566343462663263656633366562343034353939
-39353435373939633836363264646366313562333762613863316534333532626561653762653638
-32633731303762636132306336386232326531666537306664376431376433613436613034633835
-39303765613638663166303131633033633932663232616330366331616464306333373039663166
-64356332343361343334666538303265346138383632613238396539386137646433333233313266
-37623965623662306537353962303433313366616535613030323232316237343063363830386664
-61343165393536316466313166653433393264356466376665376131346531336464343365303865
-33653738353063313036313963653161623565333533613961623561613066386432366536356332
-61373038393866656466313538663830326432393034333466393631623239313935636136653036
-61343265376334646266393064626462663137336132616665323032666133313939666234386339
-62316435396334383062613035323263363737306432653535366463383162336362313031656466
-37336635646435363965373631316238303362613266343264303638333434353331313365633633
-63356231346430343136316338326637373831323336386134323132353461376664353138636565
-35636266353830343736643437316662303361326564636461396364343231383135333763363237
-31643865386331373561666237616633656161613030663937653164643531373665333539343636
-38326239363839383136333530383436326232373831623639663037343261383039343839343364
-37356566363533306531306463336266666139623264653432366463313838623436613939373337
-66313962626666343231633039366435616163656131653938613064316135656633333266323635
-34646631616133316461653964306361393730663066333964643435613863633436613165663134
-32616134383335633135653831356538356432636638643536323135363034353832343466336338
-34313934373837373765343831346539326136656235323164613563623264336564303332326666
-37363365396665366335366636343063333762343636636639653332633564373462313839663135
-32636339383534386361626539326533366562343261396338353039373337623737663633353630
-65333232346263623661393565373431656332616664393834616435386464366461636261643161
-38623861306166663635343430366537656132663439363136303833333266633332653266376234
-30623431613261303738643839663439666336323033636334633165313134396132376564386263
-32336134366639323639623663353539666636353533333766396464376563623134396663386134
-64383036633161356231333564383765363961653335373132653066663561343031623163343731
-37326636383437393465353566613766613339343961646335363864643937313862306564373264
-38313336306537623334613431643837663462636363663865663063646365373534653563313062
-38623332663138643433633634633164643761623936396536303961343034393235353764626464
-64633234363737653131313265643833653731336165663837373362386361353166356365663065
-39653336353065346136356432613036323636336464646662356237663536313132663435666661
-32336338326235363566656136653830363130646661623637643336303634306339386261363835
-35393339633132306432306535313637656332343335643061633561323631313234313133306636
-37376331386339353339326530373535393662383034303262656236656265616261323536633430
-33663539393362356365323932636334343938363330643465373264653138303833306634353361
-32643965356361653336353263643636643461653639343366663735346238393335633737353065
-61346663303734313639363435626539623231613861373530346233303032333663306438366664
-63613133396139333433636265373333363462373038306464346530393464343234656131643466
-34373565333030393862333535306265306434326466326637383364306238323461353234353436
-63313634353632303865623664356432373466626633336630363066333662393862646335633638
-37303461303065373838386430306562373561626161353666343139666266376631366334306437
-39373235356164666139626431663337393437646662353633623063336634633934333539343436
-39393362326234323539653864666139303734336366613462313030316338646437623662386264
-30383834323061646664663366366433393933376362316565323539393330643632383632663761
-32303165653037363836356338643232353766323032323935316464666633343565356638613162
-63663062646435316631636364313466373465373634383462613739313634653235343435653233
-63653033626466623738663032643766333033393965363266366165613936653433626164373732
-61663639646238363236346536616231333738663039333862306136643130396339366666656266
-30383536653537663637336632346436663363663336376665366264333538613462366133303930
-63336335663537613439363131616334623466303462363466633763333333303437303064626464
-66663136313139626331353635333438393938363264623466653438633534613064373337616139
-61643932636136363338643361616662653834353830393938623538656339626566396538306562
-62636663343336636330636431623936613965333238333066306366376533623361623363343262
-62623166393639623038653864633932386363373134326536326135373465643735616633303733
-65373862356262386665633336326435623235323839666262303863363965313138363435376637
-66613463303938373438333835343637346166613465363165383266383235313231623132353866
-37346461313462323166353031366332373862643537373633373064306336323034396162653165
-64633065643365643234346566373336633731356462383462623665333430623137353336393934
-62323739666637653532363561336439306135303363393138336333396336396336313264633861
-66633665333338613662323531653566663334623136656465313063623832653566306538616166
-33373131656232366562393762666561353363363963363364303636313061303936316131373337
-30356165393535633932336135353031303864383962643437363031663430346561353164303730
-33373635613666656530343539623461343330383564653036616661303566393233316136316137
-31613762666135356233303866363834656330386365633638303632353434356434643231393436
-61383534613632346235323135633065626431393465343139623935333536376162353735616537
-33326430623139613463666265323031316237353534376439333662333136636163643637643766
-30613532323332636664666439363461303761353136353438336234316339643363323330396663
-32333562653564633431633838623434363233383938616336663636633163383034323433663864
-31633536646264623934376534333763396238646637656437643663663761363939306366363932
-37363936353463666364333834346538396633386461386365376338613261356566663635653130
-62396132666630366235353663646130373931616530323066356437393638336432663364616562
-31333562383530383363363934386133343331346136363935313238653336623463376137386437
-36316530353732626236316430643933306632333738336565386364636534303236643565346638
-36643762646238666365383936373632643339656134633966343034306530656438643033336239
-66653833396262396437656461656334646261653431373666313036366432653530316465353839
-37636432343732373166376630383232346233333465636634663836653563313062383961633232
-66623236396630613037376365323266626562396265383165383231396165303261666631323939
-65666165376264383730383431386161343066626235656136633930656663356636333638623765
-35353831666462303162346639366363616130643465383661323837616533356363353063366536
-36343363393031383739313032353433366234323534633461653536373330653265396239313035
-37393331336530306535326537343935653964343037326130396664653836653134643561613462
-38363239633837636264356330386131316334636132303466616337666236653964643461323939
-63306630343637336661626264353966316536343666623662633361313162323930303863613065
-39646334633337326261383337376132623936393434373138383762313833333564613631636334
-32313537353562353831366538366561326133323339306239303339343662666335396466383339
-37636237636661336165336530646437346364333032346166656465313464336231613763636137
-37396461383566643663396665353466326162336139393832386631343336373132396636383163
-36393265313339333938333266323865343165363661356663336238643738626230653863616364
-38643464666364623461353835336330366431643332363265376433303530653837643064373230
-65613561386435666164356366656462383931346438636232633435373461323439313965303065
-31633935386438333032653133353237363533376132373762366339383035356133353738383665
-66306262653739333537326537633531393165353032396632346365303635303063653234656362
-62613331646438323966623436343635323132653361623339393031653739333062623836386637
-36346631363531333362313837643830393435316436363432666561313739643265353432363065
-30613230333965366530373463383031363932623337313135333461356235386432643233393664
-31646163663731353239323966396131363532373637396332393234656537633139313834323136
-63363262396431386636653663393330313132386366653033636661313763336139336637353530
-37376632326263663062656438633731303834643463376539636637613034336338666661656434
-65663331633265336635343337643933343065613837353261313833376133356266663239626235
-31323637656538366330303138663731666536303065633639623332373036363437343763613534
-38326335306465353033386266623134636164316236363634366437396436303532636233326464
-39666539393739653832373839313234366131376635393135363162656632376539346665643163
-34663135346465653338653466643839623033383863643337663236653165346532636432346165
-35653364333465353134346261376135613963646130343039313564313363376362613966343464
-30366339633062356235656139396633663665356664333832386362336635623438326263633030
-61313833613335643538356661316164316238386663333735303731636632623934353661363263
-38666432353866646137663138326534623132323936316365336538313664396237646435626135
-33346236323133336365646362643632656165623731666338313637653334373938386331353739
-62333030643261353138626362353836623063646134333531653936666135663065323963663162
-32643931663231313366316130346138323563393338643263346665616664376531623039306237
-65616166373138663633333438326630353962646631613465333435383732303162363532373635
-30653862333236343462633131386435366630373532326461383732396134313137393766313238
-30323263643335326335346438303264323862663434356463363565323638653664323766386335
-63623535643530633232666162616433393264303138663431303631623131616465393062343431
-31346566343435643463393731666561656233396166373230316230336266313936353635333965
-37623663393566393261383663666230326231336334643661613431656631626630626237626133
-34326234366363623231626561353165316566636531366236303030353434636361306232663764
-66356130376564333161316535373834666239306261663361396161633131633661306333306632
-63636265373361643935373463333236373632646361656264323264373935303437626434643839
-65313337356461336235613139323362643238633239643037316263336361376364626561383737
-39396630646364373531353735326439326161393538653666613836343661386561393839663532
-37323036393536633734363434326130323866336531383130656562353530343831616332373735
-65343766643931356462656361656134323461303363613231366534366265313231333166306130
-30663034343365376434633734613533306637363734376461613130616462666361393735333038
-65646564343033363031363739613633616337623235623737633835323535633439613035326362
-61623263653337303133636533636631336563396637616538363636323764376431353761656630
-37353039666531613639386533313165646463623264383433636465343836356238633839393665
-36623765353630373533333066363036663331663666333262313438303365393864303564373133
-66396138623864333464663763613266323161303164336138333736376465336236363439353964
-35633165646434396539343134616136343630313337336230623630653134326264393963363036
-33376134656439636536393864646433343966633230316362626266366536396565333465363131
-37386338303362643161643764383135653561376639323935666433353337623937663531666530
-65353131383766643033363364663730333838363934363662336634313336383832663836366238
-32663334326263316333646562336336323862636232353938653338616365393532613663343734
-62623530383030336665326630356133653230346237313962333238313363343038316537383537
-39613261313464633263643866646165326638623863663265633830303332306132383338656230
-37653764623038313039313139323732393238653239393639626432323730623463616238393230
-32386634323034346435373039636435363461363239376339353039363361343933373963383761
-64356337363631336165636662663435323266306131373030313966366564646238396662363737
-63386561363835333066303531323335373133643334336638346633396363636130633330326439
-31363564353136356133353734386663633334383562626236333262633030376462306631346639
-66333665356534393061633663346363306537303533653065666161623861306339633237613034
-36393639663161653830336465303738373630393064636236393130343666653637356137383133
-65623765653066333238383537616538323131646532336233623634323836363763313466303431
-64383732343538313133633564373562383061343134663632363864643263623264626162396462
-36613432313930636231316165646366396262353535393835626431653636303063373038626332
-64323931326666643033393135376664346465373064386464666437333537643061656236316439
-37383265396138353161346434353762633130623039316332633733353939373261353233343435
-61316131323163303037616232303830376562626332623832393731333036656334343835333235
-32326237623034386132313632363064613866653333386665336365626566336239393034656565
-39343766666365663866353236336161333034353461636336633663343338326532643233313633
-35336332313561643431333135373835343037636366343136623734613736653164333462316162
-66393539656231386135383635393532623437646365383961373866613935366131306364363438
-36316437326539303964393263343263356565616663373333303539616433313766323966373239
-64636531306235336666363034353733343532313262663330346166306430653739383437336134
-37393163333938636431613263303565356638633132633135346261346436373435303065386234
-32633831316462613464636233343034613838613864383261626465306138323965373436373136
-39663138656131326137646661386231316232343835313164313332306533376366626336363838
-32633364366639373630626438396636383539623239366464336561643633396535636364363261
-32633730633764316637353238623865323362346534306661333366323861336439356232616666
-64616164663235646631323466323262363337323766653632343233303138383036353934396566
-64356561363339333132343431303763326461393632626462306634666334633934353134373036
-37633233623863353566656233366133326239613135333934386462613332653961393333323164
-38313630306538343131326662393238656437633439343861623466346137383333663135626138
-65363463346330663163303763386138393433623731643635306130613863626133373633666465
-39316266326533326530633165363366653861396533383839646639383633613334643938616361
-63393830656132336564
+62383466373737653035333232303338326366323539316363336337393862373265666333356433
+3261393563633166343066346436363532336261376134350a353937653561346237666134343561
+32623332613731343631666563663731663739323633636239353035366335386366626366343934
+3333313835326639340a333463326635643561393464643063613530396430333838666234353538
+32643366326165383435366266303463626330343533346561646232383337323332623663353131
+66306538353864356466663233353237356132616161373166393736336438353066303963663764
+65643465626461393232396461356132383939353035643736633437316132386461313131623961
+35366464356133373333663530613066613233303161623534653331393864376333303937333037
+61663239633030626339653062663939633662316633376135626466623637656239616234373461
+64353633386638363132643530366237396335333263306136373939343565323765313565643666
+30366162373337366331313232373333393939653561626238373236393430363464633333313562
+63626463313336363961663431366364303065623933303261303963326266386131346566323638
+36316161343738386436383731383961656336363137303566366335653538663432323765663062
+34626232383533643363383039643762626337316636626438633438383037353432323132663464
+38616532316534356632643630326534643962353634383162313338396538643862313061613838
+35636165366337623532623737393738343230626530623330303465383263393763623664343466
+63666135353663363961306366626162373836653461316537373961333364373236373361383238
+66656636646665623739326638623061663765363030316263613666666364663261343830393330
+65366366306333323837343666633935613635396663623962386430613937626366313232363962
+65613064303731613865366432353866326135386464386637363335653135343665623632663066
+66663165633163396264303236613734383464633966663663333731616665333037663538636530
+32323830303864616565363862316132303131636635326431303261313131646234346164653862
+62396666303961633165333931653061613132396433393436623665383033396130336231323337
+39333563313137623035376139396261343432666130306566326662376636663938326439663235
+66636561663464336637323663363363333338393665616339643864633839656463626665666664
+30373463363135326134613730366430326666623766613131326562366265663662323438333563
+62363037356231656664623332626562346266363035393562336262373363333366383739616636
+63333763303038353234643564303132353834353439656239396463313862363464366634646439
+32643638623035366632396234626134393461633163616664303934623861383462623438323831
+33316361363830353062353832336366363161653630323735356239663037616364636665636330
+65313531396530323064353862353939393565376662356138653736386637623265326632306561
+61343764393034633461353432343830326661353663373965373961663330313035396437663738
+66333539626565313635663531323366323636336237306561346234323962613636653864383532
+36326138383566666434393932343439653263393332663766626261653336333432623337343439
+30316336346466383333313332303238383761303033336164613462366532353761383333666665
+36306661303832646432626461616236333730353538663765653539303561343534643862356463
+61646361653464653462346334313232316633376539643836326462336236366330323061373538
+63363638643862343539643639383935326439356534653339393835383139626539373834653238
+62396464373766316132376136343631316132396661336233623637396166376466353936666263
+31613261356366356130306437613364333866333830643665333866646263333034326336373563
+66343764633164666666353161636236376163626262373536353464363032333561363963376266
+37646539316163336637313863373064393466613863653834636639626566383535363663393866
+31633737376532316165333531656166646533386439323130396430323431376662626661383564
+63323265383933626631326133636163363630666538316331623733663535326261323438383263
+66623035343132646466613063396561323164323336636639636535393832383234623062626630
+66383739336565643563653438376430353961383062386539353965323462356462353266306163
+35383964616562653563666262366264343735333461646564646264306365373933656565363136
+64313530356536336665393333323464336238333637306562396635383835306135326165373763
+63336665366461663137383834643136383034646238643463656539386330363761363064613434
+65623836323732633262643062396366633264396334353938633463623462383563343631303239
+37363263383935333665336334366334323166306165333466326232656637646132613339323239
+66303830356330396432613163616166323261643861646264336436313733363362343835646464
+66383762613665306465643938363631343630633733376137383133346465653662313938623237
+63313333383933393131373039323065333635353030396163623130303462343764656533643936
+65333239333236393537373863386435623231376163323261326331306263326662653132623032
+61663532383865636566623761356533656363343863633161343230633433306533633130323131
+37366234376565666633353962353939343634653662336139353662356337393438363261353636
+35643563316165376233383134653363343262633035326261666633383437626237373637663932
+66326636643662636539346138663530623365376330343833363263616666623938623736303030
+62393135626565303464666138613365623632666638653265666139333930333737663965323631
+39613330363561363366333765313837343462316633613835313865656363333132326336626539
+39623364343131306263363863323730323939353261646335366133393962623137653864373131
+62383935313265363937313664336432393965653463643466646137373630373631363736636431
+35323432636633663138376339383131383461656465643766636636306565663639623163636234
+33626237353334396432656530663833633235666239326336316139323439633337663433643331
+35643766323361393064336137666664396465373765393034303462653737663063373065316465
+61336363353831316338663536653063613061333034613237306531663037653835663538666337
+37613834343164396133343736393165663263653161663537313234613366653532646630373766
+37636331326338383039663030346666323234393632363233323037383863313564363563346338
+63656261653464663663643231653833346130386433373562623662633963346630336533316435
+66333439396638343563633138326431346131373439396566633232356535393565656231663737
+36376163393133643337613639303039623832666438666661383436636661393233366663333838
+64653564623562363339656162353836306437303738373439303933313637393464306265323336
+63326436393364373931653563356363313139343734633663316362323738653738343732363138
+61393761326138653036643332383235626236356564633232323462333135326264353937336463
+31313965366132623737353232373134323433306564333862326634663362356238353465653364
+31623933316465666331653831393461316538393537386636376461653236336434626134616662
+62623634366336333739373332376239386336336631396263303535373564303862663666663562
+61313830386438616262633533336334353735333331346436373230613363356166353430386430
+62343735373231656139343035396562386661356538376661643435353237353962333930363939
+61613733653064343833396530343432663238363537373631306132666235613330343866353031
+64396531363337373236656235633261623239663439303834356139623833623339353862663230
+31363039663033323663353766616465393063356263323239353461616239346332396532633066
+64346563613934633937333433383764363731366132626365323661313962636464396539386236
+63316563353661376330346139663737306162366661656461353862326666373030336136366632
+63616439616630366435623065386430646537363333393965663534383531323462373833363965
+64323931383534643730303466373366393435313663306631666364376665626434623430326164
+64366437626634643362396565306665313231326336366630326163356630373663653633376434
+64393033336463326631303862653337656163343932363661303862346133373562663537663930
+34373761373537633130366661653539343931383663653234333663323738356535306664656664
+61383337323238636634373830626138393466336666386262393039393963633835366531643831
+35313531613832663637386566313436363566346432346536313263633038393438666431663737
+62633631656534353961306663613634616336393833616166613836373539333131633066666365
+63656264353831353630343834356239653331376539376331386663386334366463363935656431
+64386439656135383139626136653066613166353738613262623231323132626330366561643030
+36613765336339383863666535303930626534643934383731336461383432376461636230343030
+36383330376231336661653735373961643936303064373365616333663836323663333361376462
+34616538343235366332633430613130633237303363353932346366636631366466306533373063
+66363832623237636266643861363238396534666164393735303165393933623766313262323333
+37623830613733333162303061383166363838303965666664633861376238343165633234633232
+63636633353937376131306435383061343030666361323061616262353935643030333966626433
+35356562316336343932313539623239363036336361326234666339366335343033643435346536
+65346261663338326465316237353934633334353033646433353035653530396232666638636262
+37393532656561643839373333363331316235636566316531393865633131373936316236663839
+63663835633437346336626432326235356432616364316465376239363864323561383636623338
+39646266396162313938613062623430663237633465633261626562626636396637373137366465
+65643134666236386538643062663135643266303861396337353638306532306236636136623039
+34336130666633313661653761393536346661343063653562326462363434366531656430353232
+32643164303364613362616631356364643835346561383962316265336637353837383462653037
+34633031346261633835373131656166386439306361356636663338613731393434323039353665
+35636365303365353833623463626463326632383737373235353464323939616539636531383665
+32333761313439626339613834316464363835636331373331363730373861313739363164313330
+33326136326566336633316437316132613430393166333130623335393232653065376131666465
+31303132353465313761633265313266373132633231353766346633386639336464613134353832
+34613035396165633864616664636563353265316432336636326632386234633263393261323136
+66356338613666303863393937626365376631643666363830613836333236383466353835306535
+63313939386335313936376233626231343062323662313565653439306534386133396336623265
+30326334373433386639626362396138346234346630383930373636616239353734356432356237
+33636135353736313961303730386433346433663332363465343732353132356162383936343238
+35633866303031663238666662366137316366333564336134393465383438616465656666653664
+37383231623136363163663562343938653631316131613864663936363336343465343931613830
+61633166663534643765306337316635633163326238353561376631353661386437363935353636
+35623831366532393061343764633735396363623161373661316238303639396166643430323432
+36363137303834643233616331623764343161623264653531373431646364376662376238353233
+62626464393336653530383434353066353865333139323363396635393530616332383463373032
+36363665653234313263333334393535333961393063303366393034333734626235313835313665
+39376330346132343035653531396430656231646631653131633064643530363561393665663661
+64636133623231396663393662333738653631356436646166356531303066636139376166353830
+36626461646635323730326463323065393061356633653931663334633532663834323332363534
+34306539386532386365313766343462656264653332346363366231663764633436343334343235
+61653465303635353062333232396261336139633561373034396533383933373933356462666134
+32323631353536663761663439353162633539346561396166303738376432383533643766366465
+61373536663836613237366666646133343532376461323139643565396135366533356439306438
+62643235316231663564326238386238353536356330363236313064333862366336636363323834
+33336236313939316162393964346363363236383263363638336531623463643338323461326338
+33626430343834623466666461396534326466393934643631306637633562623531643636343031
+35626637363265306563643463666337316633613263353363306330613064306664343735353265
+38623033623364626437353434653732636161303732326239633837346336343666386138383935
+63626238663630366630366635356531303564663866616563393164346564643338666561396432
+37396439393866666661353463623865333863613765353264306633636239656530303230373537
+61336634383861633165366265313136343464396464663136393864623436626537313935663831
+64386162356665616331383839373533363161623630663431663136643732353065376161336564
+36663931383033313130643831306364663365313265313831373636643861303261626130326234
+36613038356132343936346463636463356332303261663830373333346435316364383161643065
+35323262373736626636343562313731646234373464633664663562366364656466323737356435
+63653266356265633163386337333731316266663032656131346134353264306436366466393464
+66653662333464646437636439313565333465366339383365666538376464653563313835343561
+35373661353832643363363266343561613066343138636339633033343932643633633035616232
+39336635636135666461643134636435326433613331353035656232313662343735663833353234
+39653337386430353364373237313533373933383333346536356337356535653531303532663235
+36323531643735666538323838323932623438646236613330383863393836393365363636626232
+34393239383236626537303666393532626335396434363763356466326633363464646565323431
+35383934613964663839343332353539653136306566653763396564343538643663366636306331
+63386531326635373134353564316532353333383834376332306237336366616532363034383866
+32326133333932323861373433376662343537343935663864346537633063316561316538666431
+32623863373432363264373637373864396363353933303762373662626364653434363738393234
+64616464633433376336356236376635623232306264316464616465636139363861666435316563
+66396630346437616433613665303462653662376563623763633466653166643536376466323133
+64626630376338666164353839323062303132663633343937643761356535633238356634626165
+62363237336264623932613835303236623333316564393338633861313333666466346435323766
+35626432373737653138653931616562396161363037613339323961633534623537666637626133
+61653637306531646239383639333366643937393932623131383335616436663863393064323833
+35306635386336613037383761653638643930303334386139623135313434346232316233373632
+38393737636132333138636534383565666230323831303964333132656663383838386538656537
+36316166653239323162326333383035346636366163636233393936613563333032653339623264
+35303766623730653939383439643265343365363064336430356431666163656661666330323563
+33383761326562333937396535303366373136653163643138393931323838313531383264386463
+63316230333735396538613561313132613861336166663238613730323438383830643963356230
+66343933656536356136633065663037663233623662393133353739343065333438333235333836
+39613962376238643933653131363261313164333333383032613235653136326262623461663032
+36326164323036386562313638623331663166633039373264323333386635363437373839393432
+31363564643536613530383066383530643537353263366565346533343761353530313739346137
+38616335386539363861306232326330386563663433663132383938323866646564383864333864
+64663733333961373730366137656563376562366366646135383662333831636462623762356563
+65313433363633343662316337306638383132613131393765653135366631633561356138353730
+61313135326366373837303130663466353563313465613932633863383664306262653833346462
+32393566666566656339326531343265316631623230383130343633333535643939343733343161
+64336639666233383865386533326437613630613536303063656631346463353564613030366662
+35313331303564663835393439623730633031363435366363376230346432333834663933313834
+37653561626430363962646136633865353138323835633062666631626436653461303966386164
+31616235623932356136663763623263626331343131323933356439316430336564653630653836
+38326538666265306230396461376635386464656637363461623639356531313939613363373461
+34366136616238373731333962613437383563653161323337336135356462346431343064386463
+36613235353263623430333035376133353966373130316134303639303865323534386239386632
+31313935343336303535653861363036363461373537336561363532626137623066663932343037
+37333164356232343763613464326234343230616362326333643665643261656266336638303330
+36626133333166386661393833356661383337336136336537656233326666383133623637396264
+64316264616439313565306666616238336661363365633833623263333363623132383830346130
+35366234323837646531366330333632616133333364343766393233333237373836323837666161
+63643138376538363639353330373136376564643261623731313931333666353239333561663432
+65396663373436666236376434666632376335353566353530393533633132366130663038643264
+37313832613732353230306135363466616162313137343436653064343231356433366563303738
+35623531636631613061653963656664313038633434316336333633316661306563643262646334
+33613563386330376333663133653138336234386366316538383362383665643361386366386538
+65396534643064303332366532663834366537626261316139326236356136343136383638333339
+36346530356565666332613037373364353366386130313464626565323730316132336262323264
+36633532326534343362656465306535653539613265323634393865646235653363626637383339
+32346264306561383332366462613236316364393931316132323937623763393935313830346430
+64383236333664353431363934303132313434326534646239363366626530643536646230663139
+65316466313562316266653665636361363734393461396630643637623462343866646265633838
+39633137643937656438643433663765363430313337343166366161323434663439353562666132
+38623464623962343534393064376237373231333939323666306465306134336234383932353635
+62656337636465326532613139626462323162303730663837313935633437313265353930663463
+38626231323462363461373131306261326463313763623737303466353835643931653334653132
+65626639396365646333653064396662626566646666306362366334363934646237663830393962
+31343561613162396632396336653834616663643130363131383463613265393337613866353365
+62653737373132616335643731646236363263366433653965393736333766393262613836333365
+34306635666366636430393365626364633061356165353661326563636366346562643733353334
+63316437376330656661633661393362323133666434366565633436363034363039373761633032
+37393163613131383537616434373730303664663562656333653232313937633164363236303663
+32363065366634363731313534343566623830663361663430333061383765363137366662623139
+66346334333061303437396532343330346366396362366362323535306639333962636232363730
+33343236636163666136373264666236386361306337653564623637626135613562303636613535
+38633130396532313362616666636238343035313233323661373032646432626262643662616262
+61353166363330323665616561643736326236363438353636373063373738383361653539303131
+30366364653464373662653066363865626338613433316362393564653739636635333562333036
+30376530323462626264373235313231313163393838633437326265646638373439336638636166
+64323762373835316138636137363166616161616633613632333063323632626637653630346562
+33376334616439376161643038666438373833343632643934303164353866613231346262346261
+61663265366461613634

host_vars/nas.yml

@@ -1,26 +1,31 @@
 $ANSIBLE_VAULT;1.1;AES256
-34633334666530383466643739336536363136366631613464383161656535656466616261663232
-6237633664336364643136643738643563653637613136360a363431663336626432616538623435
-35373839383830393334663037353262653763353935623332383534376436613161313934316338
-3930623638356537630a616339653631666163376134343535313235363234356664366234663038
-30376239633164643335336166663737346262313864626234663839333132386232346139666131
-33633463353330343037306365666463653039643235333566663164313730663738663036623539
-64636663613566656338636638383066353562306137376432346639316533303665613463333832
-37313361623639653533343536616566613865353733656338633833666263323433306431633635
-35393333346134333466323239666335613862663935353662373833343635393532633461653932
-38303034613166336632376264313961336665303332306165636663306237653336316330376236
-31313362616434663861333264306661653532316365306138333131643731346636646365353733
-62366335643566636631633630336231353666363965623664376231363164313362366164333431
-33323632366335646137666466316530613862373162376461623633333238616637373336333064
-39303761353139656333663362303365316131646633303238623031386137656263646364373163
-36336633323266393663336462626236353466353266656264343639303739313362313537396238
-36303637386266386665663163633438633763386232313861653438303965393938656166656562
-63373064396135346361633739663534666230356566366333636266643932316264343339303833
-38313233643536356232363636306363333463323133656536366662323963643637343365643035
-30393061343630633263303864336438653339323264396434623038363464366235626235326464
-62623861333264616331396230383831346163303433653236663738396164643937643663363834
-30316530623433313633653639363065343264353630613436393237363930326632343230343538
-64356230316530353663663534343739376138653266323037336163386130623361613632393037
-33376232666337316536613763623066653431303366656333646361613839323831623562613266
-36323263616364653666343264303338373232343063313266653661323933656662386237323637
-66666337356337343864613034633934656461653834306338313031366432353263
+62303937306432656235663330303934363930356632333966343535366438343261323139386135
+6238653639363962373032656433623835313834366431380a653866666266313861643035653638
+62343639336336353130363537356635653661333463386637333331353162636438393462353161
+3531386264373537340a653431633436353030303733343738616431663831316238613930633038
+62353466313762366561396366376363633132383438646362386239616362306563316461626438
+37316232373664656165396237306333336433656464306664653566383761393636396537653331
+30666631383234353064313061306164613364326638356636633636343133666638653261366339
+37376632336133333736626130336165313735313033373138343662396265636563663234376138
+32303137646437626435376463323539636264666663636533363733616637653934333936633139
+36363162306237303931343133363238346231633732656535343963636262316363613434336363
+36373339336332633332626534643762643264653365353062646663623837626463376363363161
+31383865383166396663366230333334373037376333383938363738383862313736313261336234
+65326434383165363861343131363139666238646562383837653233656365313932653163626564
+38633761343338666662393333393165316563346636636135663133613062333836313561333963
+39663733393738336336626438323365366566333331373433326539653565616230643936383737
+38356434323433326432316265396661323964653039393164663533653731626162376134616261
+39613666393764636331353764306531396339373032636531353165316437616464653237356536
+66396661306235333732326136306439316362363063313837383663316361313731303634383331
+30626239633235623164396666396533613734613962653030343334343832323664353431393636
+38623838306239326537383765643036643830303066616232313935376635346237366434396162
+66303932656265316463363432623037383462333638376430616562313238393762616263663138
+63326239623666326636396361353764386363613364643935666339336565393830613435373231
+64383265666661633664383031646530653539323037613837356638643335653235323135323361
+37333731316234646135303566393439363338323264386635336432623862353661313962663965
+35333631336233366364633537396234656430373832326334653030363635626439646532643032
+30636666383865313737353962326665383936613434353830636561323439373537613538393836
+31353164613631386665353762343938383766323739363363633634363433623039376564346333
+64323939356238323462346562616335383437326233363838383930396238343261633863393232
+39346165656662626631376362623663343164376634363532376363623737613962323434313339
+3133306237396463313938383035643034616133336662636234

hosts

@@ -1,4 +1,5 @@
 [ungrouped]
-jade ansible_host=fntz.net ansible_user=alex
+jade ansible_host=172.16.0.25 ansible_user=alex
 jackson ansible_host=direct.jackson.alexav.gg ansible_user=root
+ash-1 ansible_host=ash-1.landite.games ansible_user=root
 nas ansible_host=172.16.0.29 ansible_user=alex

main.yml

@@ -28,9 +28,6 @@
     - name: Deploy PocketID
       import_tasks: tasks/pocketid.yml
       tags: pocketid_deploy
-    - name: Deploy Ntfy
-      import_tasks: tasks/ntfy.yml
-      tags: ntfy_deploy
     - name: Deploy NZBGet
       import_tasks: tasks/nzbget.yml
       tags: nzbget_deploy
@@ -64,30 +61,21 @@
     - name: Deploy Drop
       import_tasks: tasks/drop.yml
       tags: drop_deploy
-    - name: Deploy Gluetun
-      import_tasks: tasks/gluetun.yml
-      tags: gluetun_deploy
-    - name: Deploy QBittorrent
-      import_tasks: tasks/qbittorrent.yml
-      tags: qbittorrent_deploy
     - name: Deploy Jackett
       import_tasks: tasks/jackett.yml
       tags: jackett_deploy
-    - name: Deploy NFL Proxy
-      import_tasks: tasks/nfl-proxy.yml
-      tags: nfl-proxy_deploy
     - name: Deploy Uptime Kuma
       import_tasks: tasks/uptime-kuma.yml
       tags: uptime-kuma_deploy
     - name: Deploy CouchDB for obsidian
       import_tasks: tasks/obsidian.yml
       tags: obsidian_deploy
-    - name: Deploy Helium services
-      import_tasks: tasks/helium.yml
-      tags: helium_deploy
     - name: Deploy Pterodactyl
       import_tasks: tasks/pterodactyl.yml
       tags: pterodactyl_deploy
+    - name: Deploy Termix
+      import_tasks: tasks/termix.yml
+      tags: termix_deploy
 
 - hosts: jackson
 
@@ -115,9 +103,12 @@
     - name: Deploy Owncloud
       import_tasks: tasks/owncloud.yml
       tags: owncloud_deploy
-    - name: Deploy Mastodon
-      import_tasks: tasks/mastodon.yml
-      tags: mastodon_deploy
+    - name: Deploy Pelican
+      import_tasks: tasks/pelican.yml
+      tags: pelican_deploy
+    - name: Deploy Database
+      import_tasks: tasks/mariadb.yml
+      tags: mariadb_deploy
 
 - hosts: nas
 
@@ -140,3 +131,11 @@
     - name: Deploy Wings
       import_tasks: tasks/wings.yml
       tags: wings_deploy
+
+- hosts: ash-1
+
+  roles:
+    - role: traefik
+      tags: traefik_deploy
+      vars:
+        server: "ash-1"

roles/docker/tasks/main.yml

@@ -0,0 +1,51 @@
+---
+- name: Create folder structure
+  file:
+    path: "{{ item }}"
+    state: directory
+  with_items: "{{ directories }}"
+  when: directories is defined
+
+- name: Clone repository
+  git:
+    repo: "{{ build.git.repo }}"
+    dest: "{{ build.git.dest }}"
+  when: build is defined
+
+- name: Build Docker Image
+  docker_image:
+    name: "{{ image.name }}"
+    tag: "{{ image.tag }}"
+    build:
+      nocache: true
+      path: "{{ build.git.dest }}"
+      dockerfile: Dockerfile
+    source: build
+    force_source: true
+    state: present
+  when: build is defined
+
+- name: Create Docker Network
+  docker_network:
+    name: "{{ network_name }}"
+  when: network_name is defined
+
+- name: Create Docker Container
+  docker_container:
+    name: "{{ name }}"
+    recreate: true
+    restart_policy: unless-stopped
+    pull: "{{ build is not defined }}"
+    published_ports: "{{ published_ports | default(omit) }}"
+    network_mode: "{{ network_mode | default(omit) }}"
+    image: "{{ image.name }}:{{ image.tag }}"
+    etc_hosts: "{{ extra_hosts | default(omit) }}"
+    command: "{{ command | default(omit) }}"
+    networks: "{{ networks | default(omit) }}"
+    volumes: "{{ volumes | default(omit) }}"
+    env: "{{ env | default(omit) }}"
+    labels: "{{ labels | default(omit) }}"
+    healthcheck: "{{ healthcheck | default(omit) }}"
+    devices: "{{ devices | default(omit) }}"
+    mounts: "{{ mounts | default(omit) }}"
+    privileged: "{{ privileged | default(omit) }}"

roles/traefik/tasks/main.yml

@@ -31,6 +31,11 @@
     src: remote-dynamic.yml.j2
     dest: "{{ data_dir }}/traefik/dynamic.yml"
   when: server == "jackson"
+- name: Create Traefik Dynamic File (Remote 2)
+  template:
+    src: remote-ash-1.yml.j2
+    dest: "{{ data_dir }}/traefik/dynamic.yml"
+  when: server == "ash-1"
 
 - name: Deploy Traefik Docker Container
   docker_container:

roles/traefik/templates/local-dynamic.yml.j2

@@ -1,4 +1,9 @@
 http:
+  middlewares:
+    tinyauth:
+      forwardauth:
+        address: http://tinyauth:3000/api/auth/traefik
+
   routers:
     plex:
       rule: "Host(`tv.fntz.net`)"
@@ -31,6 +36,7 @@ http:
     nvr:
       rule: "Host(`nvr.fntz.net`)"
       service: nvr
+      middlewares: tinyauth
       entryPoints:
         - webSecure
       tls:
@@ -42,8 +48,14 @@ http:
         - webSecure
       tls:
         certResolver: letsencrypt
+    wings:
+      rule: "Host(`wings.fntz.net`)"
+      service: wings
+      entryPoints:
+        - webSecure
+      tls:
+        certResolver: letsencrypt
     
-  
   services:
     plex:
       loadBalancer:
@@ -64,8 +76,12 @@ http:
     nvr:
       loadBalancer:
         servers:
-          - url: "http://nas:5000/"
+          - url: "http://172.16.0.29:5000/"
     iptv:
       loadBalancer:
         servers:
-          - url: "http://nas:8409/"
+          - url: "http://nas:8409/"
+    wings:
+      loadBalancer:
+        servers:
+          - url: "http://jade:8090/"

roles/traefik/templates/remote-ash-1.yml.j2

@@ -0,0 +1,15 @@
+http:
+  routers:
+    wings:
+      rule: "Host(`ash-1.landite.games`)"
+      service: wings
+      entryPoints:  
+        - webSecure
+      tls:
+        certResolver: letsencrypt
+    
+  services:
+    wings:
+      loadBalancer:
+        servers:
+          - url: "http://5.161.219.50:8090"

roles/traefik/templates/remote-dynamic.yml.j2

@@ -0,0 +1,15 @@
+http:
+  routers:
+    wings:
+      rule: "Host(`wings.landite.games`)"
+      service: wings
+      entryPoints:  
+        - webSecure
+      tls:
+        certResolver: letsencrypt
+    
+  services:
+    wings:
+      loadBalancer:
+        servers:
+          - url: "http://5.161.64.174:8090"

scripts/deploy_containers.py

@@ -5,7 +5,7 @@ import subprocess
 def git_diff():
   args = sys.argv
   res = subprocess.run(f"git diff --name-only {args[1]} {args[2]}", capture_output=True, shell=True, text=True)
-  return [x for x in res.stdout.strip().split("\n") if "tasks/" in x or "roles/" in x or "host_vars" in x]
+  return [x for x in res.stdout.strip().split("\n") if "tasks/" in x or "roles/" in x]
 
 def construct_command(tag = None, host = None):
   command = f"ANSIBLE_CONFIG=ansible.cfg /usr/bin/ansible-playbook main.yml --vault-password-file ~/.vault_pass.txt"
@@ -21,80 +21,84 @@ def deploy(tag = None, host = None):
   command = construct_command(tag, host)
   
   if tag:
-    print(f"Deploying {tag}...\n")
+    print(f"[MAIN] Deploying {tag}...")
   else:
-    print(f"Deploying {host}...\n")
+    print(f"[MAIN] Deploying host {host}...")
   res = subprocess.run(command, shell=True)
 
   return res.returncode == 0
 
 def main():
-  tasks_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../tasks")
+  dir_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), '../')
   diff = git_diff()
-  host_vars_changed_for = []
+
+  # containers that need special treatment
+  removed_containers = []
   vpn_containers = [
     "tasks/qbittorrent.yml",
     "tasks/jackett.yml"
   ]
+  managed_roles = [
+    "roles/fivem",
+    "roles/gitea-runner",
+    "roles/traefik"
+  ]
 
-  # because these containers rely on gluetun for network, they need to be recreated when gluetun is recreated
+  # special actions
   if "tasks/gluetun.yml" in diff:
-    print("Gluetun detected in diff, queuing dependent containers for recreation")
+    print("[MAIN] Detected Gluetun in diff, recreating dependent containers..")
     for container in vpn_containers:
       if container not in diff:
         diff.append(container)
 
-  # when variables update for a host & there are no other modified containers, recreate containers on host
-  # for file in diff:
-  #   if "host_vars" in file:
-  #     hostname = file.split("/")[1].split(".")[0]
-  #     print(f"Secret file for '{hostname}' changed, will recreate containers on host after deployment")
-  #     host_vars_changed_for.append(hostname)
+  # clean up the diff
+  new_diff = []
+  for file in diff:
+    task_name = f"{file.split("/")[0]}/{file.split("/")[1]}"
+
+    # i'm not proud of this either
+    if not os.path.exists(os.path.join(dir_path, file)):
+      if "roles" in file and not os.path.exists(os.path.join(dir_path, task_name)) and task_name in managed_roles:
+        print(f"[MAIN] '{task_name}' role removed, marking for cleanup..")
+        removed_containers.append(task_name)
+      elif "tasks" in task_name:
+        print(f"[MAIN] '{task_name}' non-existent, marking for cleanup..")
+        removed_containers.append(task_name) 
+    elif "roles" in file:      
+      if task_name in managed_roles:
+        if task_name not in new_diff:
+          new_diff.append(task_name)
+    elif "tasks" in file:
+      new_diff.append(file.split(".")[0])
+    else:
+      new_diff.append(file)
 
   deployed = []
   failed = []
-  for file in diff:
-    # separating these for now because roles will typically
-    # have a bunch of other things tied to them
-    if "roles/" not in file and "host_vars/" not in file:
-      task_name = file.split("/")[1].split(".")[0]
-      task_file_path = os.path.join(tasks_path, file.split("/")[1])
 
-      if not os.path.exists(task_file_path):
-        print(f"{task_name} doesn't exist, running cleanup")
-        res = subprocess.run(f"/usr/bin/docker container stop {task_name}", shell=True)
-        if res.returncode == 0:
-          subprocess.run(f"/usr/bin/docker container rm {task_name}", shell=True)
-          subprocess.run("/usr/bin/docker image prune -f", shell=True)
-          subprocess.run("/usr/bin/docker container prune -f", shell=True)
+  for task in new_diff:
+    deployment = deploy(tag=task.split("/")[1])
 
-          print(f"Cleaned up container {task_name}")
+    if not deployment:
+      failed.append(task)
+    else:
+      deployed.append(task)
 
-    if "host_vars" not in file:
-      # deploy the task, regardless of its status
-      if "roles/" not in file:
-        if task_name not in deployed:
-          task = deploy(tag=task_name)
-      else:
-        task_name = file.split("/")[1]
-        
-        if task_name not in deployed:
-          task = deploy(tag=task_name)
+  for task in removed_containers:
+    print(f"[MAIN] Attempting to remove containers related to '{task}'...")
+    task_name = task.split("/")[1].split(".")[0]
 
-      if not task:
-        failed.append(task_name)
-      else:
-        deployed.append(task_name)
-
-  if len(host_vars_changed_for) > 0:
-    for host in host_vars_changed_for:
-      print(f"Redeploying containers on {host} due to host vars update")
-      task = deploy(host=host)
-      if task:
-        deployed.append(host)
-      else:
-        failed.append(host)
+    containers = subprocess.Popen(f"docker container list | grep {task_name}_", shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    for line in containers.stdout:
+      docker_container_id = line.rstrip().decode('utf8').split(" ")[0]
+      if docker_container_id and docker_container_id.strip() != "":
+        print(f"[MAIN] Found Docker container {docker_container_id} related to {task}, removing..")
 
+        # clean up containers & dangling images
+        subprocess.run(f"/usr/bin/docker container stop {docker_container_id}", shell=True, stdout=subprocess.DEVNULL)
+        subprocess.run(f"/usr/bin/docker container rm {docker_container_id}", shell=True, stdout=subprocess.DEVNULL)
+        subprocess.run("/usr/bin/docker image prune -f", shell=True, stdout=subprocess.DEVNULL)
+        subprocess.run("/usr/bin/docker container prune -f", shell=True, stdout=subprocess.DEVNULL)
 
   if len(failed) <= 0 and len(deployed) > 0:
     print("\n---------------------")
@@ -110,7 +114,7 @@ def main():
     print("---------------------\n")
     sys.exit(1)
   elif len(deployed) <= 0:
-    print("Successfully executed, no tasks required execution")
+    print("[MAIN] Successfully executed, no tasks required execution")
     sys.exit(0)
 
 if __name__ == "__main__":

scripts/extract_to_template.py

@@ -10,21 +10,39 @@ if os.path.exists(host_vars_path):
     
   vaults = os.listdir(host_vars_path)
 
+  # 1st run - extract ungrouped, global variables
   for vault in vaults:
     vault_path = os.path.join(host_vars_path, vault)
     vault_contents = subprocess.run(f'ansible-vault decrypt "{vault_path}" --vault-password-file ~/.vault_pass.txt --output -', shell=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
     stdout = vault_contents.stdout.strip().splitlines()
 
     for line in stdout:
-      if line.startswith("#") and line not in file_contents:
-        file_contents += f"\n{line}\n"
+      if line.startswith("#"):
+        break
+      elif line.split(":")[0] not in file_contents:
+        file_contents += f"{line.split(":")[0]}:\n"
+        
+  # 2nd run - extract service-specific variables
+  for vault in vaults:
+    vault_path = os.path.join(host_vars_path, vault)
+    vault_contents = subprocess.run(f'ansible-vault decrypt "{vault_path}" --vault-password-file ~/.vault_pass.txt --output -', shell=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+    stdout = vault_contents.stdout.strip().splitlines()
 
-      if ":" in line:
-        if line.split(":")[0] not in file_contents:
-          file_contents += f'{line.split(":")[0]}:\n'
+    has_found_start = False
+    for line in stdout:
+      if has_found_start or line.startswith("#"):
+        if not has_found_start:
+          has_found_start = True
+        
+        if line.startswith("#") and line not in file_contents:
+          file_contents += f"\n{line}\n"
 
-    with open(os.path.join(host_vars_path, 'all.template.yml'), 'w', encoding="utf8") as template_file:
-      template_file.write(file_contents)
-      template_file.close()
+        if ":" in line:
+          if line.split(":")[0] not in file_contents:
+            file_contents += f'{line.split(":")[0]}:\n'
+
+  with open(os.path.join(host_vars_path, 'all.template.yml'), 'w', encoding="utf8") as template_file:
+    template_file.write(file_contents)
+    template_file.close()
 
     print("Written to disk!")

scripts/run_updates.py

@@ -0,0 +1,64 @@
+import requests
+import subprocess
+import os
+import yaml
+
+def search_for_image(image_name):
+  tasks_folder = os.path.realpath(os.path.join('./', 'tasks'))
+  if "library/" in image_name:
+    image_name = image_name.replace("library/", "")
+  
+  for task in os.listdir(tasks_folder):
+    with open(os.path.join(tasks_folder, task), 'r') as file:
+      data = yaml.safe_load(file)
+
+      for key in data:
+        if "vars" in key:
+          if image_name in key["vars"]["image"]["name"] or image_name == key["vars"]["image"]["name"]:
+            return f"{task.split(".")[0]}_deploy"
+
+def main():
+  update_list = requests.get("https://cup.fntz.net/api/v3/json")
+  update_list.raise_for_status()
+  update_list = update_list.json()
+
+  deployable_tags = []
+  with open("main.yml", 'r') as file:
+    data = yaml.safe_load(file)
+    for host in data:
+      for task in host['tasks']:
+        deployable_tags.append(task['tags'])
+
+  if len(update_list["images"]) > 0:
+    already_deployed = []
+    actually_updatable = []
+    blacklist = []
+
+    for image in update_list["images"]:
+      if image['result']['has_update']:
+        if image in blacklist:
+          print(f"[UPDATE] Ignoring '{image}' due to its blacklist")
+        elif 'version_update_type' in image['result']['info'] and image['result']['info']['version_update_type'] != "major":
+          actually_updatable.append({ 'reference': image['reference'], 'repository': image['parts']['repository'] })
+        elif 'type' in image['result']['info'] and image['result']['info']['type'] == "digest":
+          actually_updatable.append({ 'reference': image['reference'], 'repository': image['parts']['repository'] })
+    
+    print(f"Redeploying {len(actually_updatable)} container(s)..")
+    for image in actually_updatable:
+      ansible_tag = search_for_image(image['repository'])
+      print(ansible_tag, image['reference'])
+      if ansible_tag and ansible_tag in deployable_tags and ansible_tag not in already_deployed:
+        print(f'[UPDATE] Deploying {ansible_tag}..')
+        subprocess.run(f'ANSIBLE_CONFIG=ansible.cfg ansible-playbook main.yml --tags {ansible_tag} --vault-password-file=~/.vault_pass.txt', shell=True)
+      else:
+        print('[UPDATE] Could not find corresponding task, cleaning up..')
+        subprocess.run(f"docker image remove {image['reference']}", shell=True)
+      already_deployed.append(ansible_tag)
+
+    print("\nAll images updated, refreshing Cup")
+    requests.get("https://cup.fntz.net/api/v3/refresh")
+  else:
+    print("No images to update!")
+
+if __name__ == "__main__":
+  main()

tasks/api.yml

@@ -1,49 +1,15 @@
 ---
-- name: "Create file structure"
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/api"
-    - "{{ data_dir }}/api/db"
-    - "{{ data_dir }}/api/app"
-
-- name: "Clone latest API"
-  git:
-    repo: git@git.alexav.gg:alex/api.git
-    dest: "{{ data_dir }}/api/app"
-
-- name: "Build API Docker Image"
-  docker_image:
-    name: api
-    tag: "latest"
-    build:
-      nocache: true
-      path: "{{ data_dir }}/api/app"
-      dockerfile: Dockerfile
-    source: build
-    force_source: true
-    state: present
-
-- name: Create API Network
-  docker_network:
-    name: api
-
-- name: Deploy Redis Container
-  docker_container:
-    name: api_redis
-    image: redis:latest
-    restart_policy: unless-stopped
-    recreate: true
-    networks:
-      - name: api
-
-- name: Deploy Database Container
-  docker_container:
+- name: Deploy API Database
+  include_role:
+    name: docker
+  vars:
     name: api_postgres
-    image: postgres:latest
-    restart_policy: unless-stopped
-    recreate: true
+    network_name: api
+    directories:
+      - "{{ data_dir }}/api/db"
+    image:
+      name: postgres
+      tag: "17"
     networks:
       - name: api
     volumes:
@@ -53,15 +19,34 @@
       POSTGRES_PASSWORD: "{{ API_POSTGRES_PASSWORD }}"
       PGDATA: "/var/lib/postgresql/data/pgdata"
 
-- name: Deploy API Container
-  docker_container:
+- name: Deploy API Redis
+  include_role:
+    name: docker
+  vars:
+    name: api_redis
+    network_name: api
+    image:
+      name: redis
+      tag: latest
+    networks:
+      - name: api
+
+- name: Deploy API
+  include_role:
+    name: docker
+  vars:
     name: api
-    image: api:latest
-    recreate: true
-    restart_policy: unless-stopped
+    network_name: api
     networks:
       - name: api
       - name: "{{ docker_network_name }}"
+    build:
+      git:
+        repo: git@git.alexav.gg:alex/api.git
+        dest: "{{ data_dir }}/api/app"
+    image:
+      name: api
+      tag: latest
     env:
       NODE_ENV: "production"
       VERSION: "v4"
@@ -73,6 +58,13 @@
       STEAM_API_KEY: "{{ API_STEAM_API_KEY }}"
       CONTACT_WEBHOOK: "{{ API_CONTACT_WEBHOOK }}"
       JWT_KEY: "{{ API_JWT_KEY }}"
+      DISCORD_PUBLIC_KEY: "{{ API_DISCORD_PUBLIC_KEY }}"
+      DISCORD_APP_ID: "{{ API_DISCORD_APP_ID }}"
+      DISCORD_BOT_TOKEN: "{{ API_DISCORD_BOT_TOKEN }}"
+      MINECRAFT_HOST: "{{ API_MINECRAFT_HOST }}"
+      MINECRAFT_USER: "{{ API_MINECRAFT_USER }}"
+      MINECRAFT_PASSWORD: "{{ API_MINECRAFT_PASSWORD }}"
+      MINECRAFT_DATABASE: "{{ API_MINECRAFT_DATABASE }}"
     labels:
       traefik.enable: "true"
       traefik.http.routers.aapi.rule: Host(`api.alexav.gg`)

tasks/codeserver.yml

@@ -1,23 +1,14 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/code-server"
-
-- name: Pull latest Code Server Docker Image
-  docker_image:
-    name: lscr.io/linuxserver/code-server
-    tag: latest
-    source: pull
-
-- name: Create Code Server Docker Container
-  docker_container:
-    name: codeserver
-    image: lscr.io/linuxserver/code-server:latest
-    restart_policy: unless-stopped
-    recreate: true
+- name: Deploy Code Server
+  include_role:
+    name: docker
+  vars:
+    name: "codeserver"
+    directories:
+      - "{{ data_dir }}/code-server"
+    image:
+      name: lscr.io/linuxserver/code-server
+      tag: latest
     networks:
       - name: homelab
     volumes:

tasks/cup.yml

@@ -1,17 +1,10 @@
 ---
-- name: Pull latest Cup Docker Image
-  docker_image:
-    name: ghcr.io/sergi0g/cup
-    tag: latest
-    source: pull
-
-- name: Create Cup Docker Container
-  docker_container:
-    name: Cup
-    image: ghcr.io/sergi0g/cup
+- name: Deploy Cup
+  include_role:
+    name: docker
+  vars:
+    name: cup
     command: serve
-    restart_policy: unless-stopped
-    recreate: true
     networks:
       - name: homelab
     volumes:
@@ -22,4 +15,6 @@
       traefik.http.routers.cup.entrypoints: webSecure
       traefik.http.routers.cup.tls.certresolver: letsencrypt
       traefik.http.services.cup.loadbalancer.server.port: "8000"
-      traefik.http.routers.cup.middlewares: tinyauth
+    image:
+      name: ghcr.io/sergi0g/cup
+      tag: latest

tasks/dashdot.yml

@@ -1,16 +1,12 @@
 ---
-- name: Pull latest Dashdot Docker Image
-  docker_image:
-    name: mauricenino/dashdot
-    tag: latest
-    source: pull
-
-- name: Create Dashdot Docker Container
-  docker_container:
+- name: Deploy Dashdot
+  include_role:
+    name: docker
+  vars:
     name: dashdot
-    image: mauricenino/dashdot
-    restart_policy: unless-stopped
-    recreate: true
+    image:
+      name: mauricenino/dashdot
+      tag: latest
     networks:
       - name: homelab
     volumes:

tasks/dozzle.yml

@@ -1,18 +1,14 @@
 ---
-- name: Pull latest Dozzle Docker Image
-  docker_image:
-    name: amir20/dozzle
-    tag: latest
-    source: pull
-
-- name: Create Dozzle Docker Container
-  docker_container:
+- name: Deploy Dozzle
+  include_role:
+    name: docker
+  vars:
     name: dozzle
-    image: amir20/dozzle:latest
-    restart_policy: unless-stopped
-    recreate: true
     networks:
       - name: homelab
+    image:
+      name: amir20/dozzle
+      tag: latest
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
     env:

tasks/drop.yml

@@ -1,29 +1,16 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/drop"
-    - "{{ data_dir }}/drop/db"
-    - "{{ data_dir }}/drop/app"
-
-- name: Create Drop Network
-  docker_network:
-    name: drop
-
-- name: Pull latest Drop Docker Image
-  docker_image:
-    name: ghcr.io/drop-oss/drop
-    tag: v0.3.3
-    source: pull
-
-- name: Create Drop DB Container
-  docker_container:
+- name: Deploy Drop Database
+  include_role:
+    name: docker
+  vars:
     name: drop_postgres
-    image: postgres:14-alpine
-    recreate: true
-    restart_policy: unless-stopped
+    directories:
+      - "{{ data_dir }}/drop"
+      - "{{ data_dir }}/drop/db"
+    image:
+      name: postgres
+      tag: 14-alpine
+    network_name: drop
     networks:
       - name: drop
     healthcheck:
@@ -39,12 +26,16 @@
       POSTGRES_USER: "drop"
       POSTGRES_DB: "drop"
 
-- name: Create Drop Container
-  docker_container:
+- name: Deploy Drop
+  include_role:
+    name: docker
+  vars:
     name: drop
-    image: ghcr.io/drop-oss/drop:latest
-    recreate: true
-    restart_policy: unless-stopped
+    directories:
+      - "{{ data_dir }}/drop/app"
+    image:
+      name: ghcr.io/drop-oss/drop
+      tag: latest
     networks:
       - name: homelab
       - name: drop

tasks/ersatztv.yml

@@ -1,23 +1,14 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/ersatz"
-
-- name: Pull latest Docker Image
-  docker_image:
-    name: ghcr.io/ersatztv/ersatztv
-    tag: latest
-    source: pull
-
-- name: Create Docker Container
-  docker_container:
+- name: Deploy Ersatz
+  include_role:
+    name: docker
+  vars:
     name: ersatztv
-    image: ghcr.io/ersatztv/ersatztv:latest
-    recreate: true
-    restart_policy: unless-stopped
+    directories:
+      - "{{ data_dir }}/ersatz"
+    image:
+      name: ghcr.io/ersatztv/ersatztv
+      tag: latest
     devices:
       - /dev/dri/renderD128:/dev/dri/renderD128
     mounts:

tasks/excalidraw.yml

@@ -1,16 +1,12 @@
 ---
-- name: Pull latest Excalidraw Docker Image
-  docker_image:
-    name: excalidraw/excalidraw
-    tag: latest
-    source: pull
-
-- name: Create Excalidraw Docker Container
-  docker_container:
+- name: Deploy Excalidraw
+  include_role:
+    name: docker
+  vars:
     name: excalidraw
-    image: excalidraw/excalidraw
-    restart_policy: unless-stopped
-    recreate: true
+    image:
+      name: excalidraw/excalidraw
+      tag: latest
     networks:
       - name: homelab
     labels:

tasks/frigate.yml

@@ -1,24 +1,15 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/frigate"
-
-- name: Pull latest Frigate Docker Image
-  docker_image:
-    name: ghcr.io/blakeblackshear/frigate
-    tag: stable
-    source: pull
-
-- name: Deploy Frigate Docker Container
-  docker_container:
+- name: Deploy Frigate
+  include_role:
+    name: docker
+  vars:
     name: frigate
-    image: ghcr.io/blakeblackshear/frigate:stable
-    recreate: true
+    directories:
+      - "{{ data_dir }}/frigate"
+    image:
+      name: ghcr.io/blakeblackshear/frigate
+      tag: stable
     privileged: true
-    restart_policy: unless-stopped
     published_ports:
       - "5000:5000"
       - "8555:8555/tcp"

tasks/gitea.yml

@@ -1,23 +1,14 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/gitea"
-
-- name: Pull latest Gitea Docker Image
-  docker_image:
-    name: docker.gitea.com/gitea
-    tag: latest
-    source: pull
-
-- name: Create Gitea Docker Container
-  docker_container:
+- name: Deploy Gitea
+  include_role:
+    name: docker
+  vars:
     name: gitea
-    image: docker.gitea.com/gitea:latest
-    restart_policy: unless-stopped
-    recreate: true
+    directories:
+      - "{{ data_dir }}/gitea"
+    image:
+      name: docker.gitea.com/gitea
+      tag: latest
     networks:
       - name: "{{ docker_network_name }}"
     volumes:

tasks/glance.yml

@@ -1,25 +1,16 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/glance"
-    - "{{ data_dir }}/glance/config"
-    - "{{ data_dir }}/glance/assets"
-
-- name: Pull latest Glance Docker Image
-  docker_image:
-    name: glanceapp/glance
-    tag: latest
-    source: pull
-
-- name: Create Glance Docker Container
-  docker_container:
+- name: Deploy Glance
+  include_role:
+    name: docker
+  vars:
     name: glance
-    image: glanceapp/glance
-    restart_policy: unless-stopped
-    recreate: true
+    image:
+      name: glanceapp/glance
+      tag: latest
+    directories:
+      - "{{ data_dir }}/glance"
+      - "{{ data_dir }}/glance/config"
+      - "{{ data_dir }}/glance/assets"
     networks:
       - name: homelab
     env:

tasks/helium.yml

@@ -1,95 +0,0 @@
----
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/helium"
-
-- name: Clone latest services
-  git:
-    repo: git@git.alexav.gg:alex/helium-services.git
-    dest: "{{ data_dir }}/helium"
-
-- name: Build NGINX image
-  docker_image:
-    name: helium_nginx
-    tag: "latest"
-    build:
-      args:
-        SERVICES_HOSTNAME: "{{ HELIUM_BASE_URL }}"
-      path: "{{ data_dir }}/helium/svc"
-      dockerfile: "{{ data_dir }}/helium/svc/nginx/Dockerfile"
-    source: build
-    force_source: yes
-    state: present
-
-- name: Build Extension Proxy image
-  docker_image:
-    name: helium_ext_proxy
-    tag: "latest"
-    build:
-      path: "{{ data_dir }}/helium/svc/extension-proxy"
-      dockerfile: Dockerfile
-    source: build
-    force_source: yes
-    state: present
-
-- name: Build UBO image
-  docker_image:
-    name: helium_ubo
-    tag: "latest"
-    build:
-      path: "{{ data_dir }}/helium/svc/ubo"
-      dockerfile: Dockerfile
-    source: build
-    force_source: yes
-    state: present
-
-- name: Create Helium Network
-  docker_network:
-    name: helium
-
-- name: Create NGINX Container
-  docker_container:
-    name: helium_nginx
-    image: helium_nginx:latest
-    recreate: true
-    restart_policy: unless-stopped
-    shm_size: "512M"
-    networks:
-      - name: helium
-      - name: homelab
-    mounts:
-      - type: tmpfs
-        target: /tmp
-        tmpfs_size: 5G
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.helium.rule: Host(`helium.fntz.net`)
-      traefik.http.routers.helium.entrypoints: webSecure
-      traefik.http.routers.helium.tls.certresolver: letsencrypt
-      traefik.http.services.helium.loadbalancer.server.port: "80"
-
-- name: Create UBO Proxy Container
-  docker_container:
-    name: helium_ubo
-    image: helium_ubo:latest
-    restart_policy: unless-stopped
-    recreate: true
-    networks:
-      - name: helium
-    env:
-      UBO_PROXY_BASE_URL: "https://{{ HELIUM_BASE_URL }}/ubo"
-
-- name: Create Extension Proxy Container
-  docker_container:
-    name: helium_ext_proxy
-    image: helium_ext_proxy:latest
-    restart_policy: unless-stopped
-    recreate: true
-    networks:
-      - name: helium
-    env:
-      HMAC_SECRET: "{{ HELIUM_EXT_HMAC_SECRET }}"
-      PROXY_BASE_URL: "https://{{ HELIUM_BASE_URL }}/ext"

tasks/home-assistant.yml

@@ -1,31 +0,0 @@
----
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/homeassistant"
-
-- name: Pull HA Docker Image
-  docker_image:
-    name: ghcr.io/home-assistant/home-assistant:stable
-    source: pull
-
-- name: Deploy Home Assistant Container
-  docker_container:
-    name: home_assistant
-    image: ghcr.io/home-assistant/home-assistant:stable
-    recreate: true
-    restart_policy: unless-stopped
-    network_mode: host
-    privileged: true
-    volumes:
-      - "{{ data_dir }}/homeassistant:/config"
-      - "/etc/localtime:/etc/localtime"
-      - "/run/dbus:/run/dbus:ro"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.ha.rule: Host(`ha.fntz.net`)
-      traefik.http.routers.ha.entrypoints: webSecure
-      traefik.http.routers.ha.tls.certresolver: letsencrypt
-      traefik.http.services.ha.loadbalancer.server.url: "http://{{ TRAEFIK_HOST_IP }}:8123"

tasks/homebridge.yml

@@ -1,24 +1,15 @@
 ---
-- name: Create Folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/homebridge"
-
-- name: Pull latest Homebridge Docker Image
-  docker_image:
-    name: homebridge/homebridge
-    tag: latest
-    source: pull
-
-- name: Create Homebridge Docker Container
-  docker_container:
+- name: Deploy Homebridge
+  include_role:
+    name: docker
+  vars:
     name: homebridge
-    image: homebridge/homebridge:latest
-    restart_policy: unless-stopped
+    directories:
+      - "{{ data_dir }}/homebridge:/homebridge"
+    image:
+      name: homebridge/homebridge
+      tag: latest
     network_mode: host
-    recreate: true
     volumes:
       - "{{ data_dir }}/homebridge:/homebridge"
     labels:

tasks/immich.yml

@@ -1,34 +1,16 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/immich"
-    - "{{ data_dir }}/immich/model-cache"
-    - "{{ data_dir }}/immich/db"
-
-- name: Pull latest Immich Server Docker Image
-  docker_image:
-    name: ghcr.io/immich-app/immich-server
-    tag: v2.1.0
-    source: pull
-
-- name: Create Immich Redis Docker Container
-  docker_container:
-    name: immich_redis
-    image: docker.io/valkey/valkey:8-bookworm@sha256:fea8b3e67b15729d4bb70589eb03367bab9ad1ee89c876f54327fc7c6e618571
-    restart_policy: unless-stopped
-    recreate: true
-    networks:
-      - name: immich
-
-- name: Create Immich DB Docker Container
-  docker_container:
+- name: Deploy Immich DB
+  include_role:
+    name: docker
+  vars:
     name: immich_postgres
-    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:bcf63357191b76a916ae5eb93464d65c07511da41e3bf7a8416db519b40b1c23
-    restart_policy: unless-stopped
-    recreate: true
+    directories:
+      - "{{ data_dir }}/immich"
+      - "{{ data_dir }}/immich/model-cache"
+      - "{{ data_dir }}/immich/db"
+    image:
+      name: ghcr.io/immich-app/postgres
+      tag: 14-vectorchord0.4.3-pgvectors0.2.0
     volumes:
       - "{{ data_dir }}/immich/db:/var/lib/postgresql/data"
     env:
@@ -38,13 +20,27 @@
       POSTGRES_INITDB_ARGS: "--data-checksums"
     networks:
       - name: immich
+    network_name: immich
 
-- name: Create Immich Server Docker Container
-  docker_container:
-    name: immich_server
-    image: ghcr.io/immich-app/immich-server:v2.1.0
-    restart_policy: unless-stopped
-    recreate: true
+- name: Deploy Immich Redis
+  include_role:
+    name: docker
+  vars:
+    name: immich_redis
+    image:
+      name: docker.io/valkey/valkey
+      tag: 8-bookworm
+    networks:
+      - name: immich
+
+- name: Deploy Immich Server
+  include_role:
+    name: docker
+  vars:
+    name: immich
+    image:
+      name: ghcr.io/immich-app/immich-server
+      tag: v2.1.0
     networks:
       - name: homelab
       - name: immich

tasks/jellyfin.yml

@@ -1,39 +0,0 @@
----
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/jellyfin"
-
-- name: Pull latest Jellyfin Docker Image
-  docker_image:
-    name: lscr.io/linuxserver/jellyfin
-    tag: latest
-    source: pull
-
-- name: Create Jellyfin Docker Container
-  docker_container:
-    name: jellyfin
-    image: lscr.io/linuxserver/jellyfin:latest
-    restart_policy: unless-stopped
-    recreate: true
-    networks:
-      - name: homelab
-    published_ports:
-      - 8096:8096
-    volumes:
-      - "{{ data_dir }}/jellyfin:/config"
-      - "{{ JELLYFIN_TV_PATH }}:/data/tvshows"
-      - "{{ JELLYFIN_MOVIE_PATH }}:/data/movies"
-      - "{{ JELLYFIN_MUSIC_PATH }}:/data/music"
-    env:
-      PUID: "{{ PUID }}"
-      PGID: "{{ PGID }}"
-      TZ: "{{ TZ }}"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.jf.rule: Host(`jf.fntz.net`)
-      traefik.http.routers.jf.entrypoints: webSecure
-      traefik.http.routers.jf.tls.certresolver: letsencrypt
-      traefik.http.services.jf.loadbalancer.server.port: "8096"

tasks/mariadb.yml

@@ -0,0 +1,39 @@
+---
+- name: Deploy MariaDB Database
+  include_role:
+    name: docker
+  vars:
+    name: mariadb
+    directories:
+      - "{{ data_dir }}/db"
+    image:
+      name: mariadb
+      tag: latest
+    published_ports:
+      - "3306:3306"
+    volumes:
+      - "{{ data_dir }}/db:/var/lib/mysql"
+      - "{{ data_dir }}/db/etc:/etc/mysql"
+    env:
+      MYSQL_USER: "root"
+      MYSQL_ROOT_PASSWORD: "{{ GLOBAL_POSTGRES_PASSWORD }}"
+
+- name: Deploy PHPMyAdmin
+  include_role:
+    name: docker
+  vars:
+    name: phpmyadmin
+    image:
+      name: phpmyadmin
+      tag: latest
+    networks:
+      - name: "{{ docker_network_name }}"
+    env:
+      PMA_HOST: "{{ PMA_HOST }}"
+      PMA_PORT: "{{ PMA_PORT }}"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.pma.rule: Host(`pma.landite.games`)
+      traefik.http.routers.pma.entrypoints: webSecure
+      traefik.http.routers.pma.tls.certresolver: letsencrypt
+      traefik.http.services.pma.loadbalancer.server.port: "80"

tasks/mastodon.yml

@@ -1,99 +0,0 @@
----
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/mastodon"
-    - "{{ data_dir }}/mastodon/db"
-    - "{{ data_dir }}/mastodon/redis"
-    - "{{ data_dir }}/mastodon/public"
-
-- name: Create Mastodon Network
-  docker_network:
-    name: mastodon
-
-- name: Pull latest Postgres Docker Image
-  docker_image:
-    name: postgres
-    tag: 14-alpine
-    source: pull
-- name: Pull latest Redis Docker Image
-  docker_image:
-    name: redis
-    tag: 7-alpine
-    source: pull
-- name: Pull latest Mastodon Docker Image
-  docker_image:
-    name: lscr.io/linuxserver/mastodon
-    tag: latest
-    source: pull
-
-- name: Create Mastodon DB Container
-  docker_container:
-    name: mastodon_db
-    image: postgres:14-alpine
-    recreate: true
-    restart_policy: unless-stopped
-    networks:
-      - name: mastodon
-    volumes:
-      - "{{ data_dir }}/mastodon/db:/var/lib/postgresql/data"
-    healthcheck:
-      test: CMD pg_isready -U postgres
-    env:
-      POSTGRES_HOST_AUTH_METHOD: "trust"
-      POSTGRES_USER: mastodon
-      POSTGRES_PASSWORD: "{{ MASTODON_DB_PASS }}"
-      POSTGRES_DB: mastodon
-
-- name: Create Mastodon Redis Container
-  docker_container:
-    name: mastodon_redis
-    image: redis:7-alpine
-    recreate: true
-    restart_policy: unless-stopped
-    healthcheck:
-      test: CMD redis-cli ping
-    networks:
-      - name: mastodon
-    volumes:
-      - "{{ data_dir }}/mastodon/redis:/data"
-
-- name: Create Mastodon Container
-  docker_container:
-    name: mastodon
-    image: lscr.io/linuxserver/mastodon:latest
-    recreate: true
-    restart_policy: unless-stopped
-    networks:
-      - name: mastodon
-      - name: "{{ docker_network_name }}"
-    volumes:
-      - "{{ data_dir }}/mastodon/public:/config"
-    env:
-      PUID: "{{ PUID }}"
-      PGID: "{{ PGID }}"
-      TZ: "{{ TZ }}"
-      LOCAL_DOMAIN: "{{ MASTODON_LOCAL_DOMAIN }}"
-      REDIS_HOST: "mastodon_redis"
-      REDIS_PORT: "6379"
-      DB_HOST: "mastodon_db"
-      DB_USER: "mastodon"
-      DB_PASS: "{{ MASTODON_DB_PASS }}"
-      DB_PORT: "5432"
-      ES_ENABLED: "false"
-      SECRET_KEY_BASE: "{{ MASTODON_SECRET_KEY_BASE }}"
-      VAPID_PRIVATE_KEY: "{{ MASTODON_VAPID_PRIVATE_KEY }}"
-      VAPID_PUBLIC_KEY: "{{ MASTODON_VAPID_PUBLIC_KEY }}"
-      OTP_SECRET: "{{ MASTODON_OTP_SECRET }}"
-      S3_ENABLED: "false"
-      ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: "{{ MASTODON_ARE_DETERMINISTIC }}"
-      ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: "{{ MASTODON_ARE_KEY_DERIVATION }}"
-      ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: "{{ MASTODON_ARE_PRIMARY }}"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.mst.rule: Host(`mst.fntz.net`)
-      traefik.http.routers.mst.entrypoints: webSecure
-      traefik.http.routers.mst.tls.certresolver: letsencrypt
-      traefik.http.services.mst.loadbalancer.server.url: "https://mastodon"

tasks/nextcloud.yml

@@ -1,54 +0,0 @@
----
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/nextcloud"
-    - "{{ data_dir }}/nextcloud/data"
-    - "{{ data_dir }}/nextcloud/db"
-
-- name: Create Nextcloud Docker Network
-  docker_network:
-    name: nextcloud
-
-- name: Pull latest Nextcloud Docker Image
-  docker_image:
-    name: nextcloud
-    tag: latest
-    source: pull
-
-- name: Create Nextcloud DB Docker Container
-  docker_container:
-    name: nc_postgresql
-    image: postgres:17-alpine
-    restart_policy: unless-stopped
-    recreate: true
-    networks:
-      - name: nextcloud
-    volumes:
-      - "{{ data_dir }}/nextcloud/db:/var/lib/postgresql/data"
-    env:
-      PGDATA: /var/lib/postgresql/data/pgdata
-      POSTGRES_PASSWORD: "{{ NEXTCLOUD_POSTGRES_PASSWORD }}"
-      POSTGRES_DATABASE: "{{ NEXTCLOUD_POSTGRES_DATABASE }}"
-      POSTGRES_USER: "{{ NEXTCLOUD_POSTGRES_USER }}"
-      POSTGRES_HOST: "{{ NEXTCLOUD_POSTGRES_HOST }}"
-
-- name: Create Nextcloud Docker Container
-  docker_container:
-    name: nextcloud
-    image: nextcloud
-    restart_policy: unless-stopped
-    recreate: true
-    networks:
-      - name: "{{ docker_network_name }}"
-      - name: nextcloud
-    volumes:
-      - "{{ data_dir }}/nextcloud/data:/var/www/html"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.nc.rule: Host(`{{ NEXTCLOUD_APP_URL }}`)
-      traefik.http.routers.nc.entrypoints: webSecure
-      traefik.http.routers.nc.tls.certresolver: letsencrypt
-      traefik.http.services.nc.loadbalancer.server.port: "80"

tasks/nfl-proxy.yml

@@ -1,23 +0,0 @@
----
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/nfl-proxy"
-
-- name: "Clone latest NFL-Proxy"
-  git:
-    repo: "git@git.alexav.gg:alex/nfl-proxy.git"
-    dest: "{{ data_dir }}/nfl-proxy"
-
-- name: "Stop & remove existing PM2 containers"
-  ignore_errors: yes
-  shell: |
-    /home/alex/.nvm/versions/node/v24.4.0/bin/pm2 delete "nfl-proxy"
-
-- name: "Start new PM2 container"
-  args:
-    chdir: "{{ data_dir }}/nfl-proxy"
-  shell: |
-    /home/alex/.nvm/versions/node/v24.4.0/bin/pm2 start --name="nfl-proxy" "venv/bin/activate && venv/bin/python main.py"

tasks/ntfy.yml

@@ -1,36 +0,0 @@
----
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/ntfy"
-    - "{{ data_dir }}/ntfy/cache"
-    - "{{ data_dir }}/ntfy/data"
-
-- name: Pull latest Ntfy Docker Image
-  docker_image:
-    name: binwiederhier/ntfy
-    tag: latest
-    source: pull
-
-- name: Create Ntfy Docker Container
-  docker_container:
-    name: ntfy
-    image: binwiederhier/ntfy
-    command: serve
-    restart_policy: unless-stopped
-    recreate: true
-    networks:
-      - name: homelab
-    volumes:
-      - "{{ data_dir }}/ntfy/cache:/var/cache/ntfy"
-      - "{{ data_dir }}/ntfy/data:/etc/ntfy"
-    env:
-      UPSTREAM_BASE_URL: "{{ NTFY_UPSTREAM_BASE_URL }}"
-      BASE_URL: "{{ NTFY_BASE_URL }}"
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.ntfy.rule: Host(`push.fntz.net`)
-      traefik.http.routers.ntfy.entrypoints: webSecure
-      traefik.http.routers.ntfy.tls.certresolver: letsencrypt

tasks/nzbget.yml

@@ -1,23 +1,14 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/nzbget"
-
-- name: Pull latest NZBGet Docker Image
-  docker_image:
-    name: lscr.io/linuxserver/nzbget
-    tag: latest
-    source: pull
-
-- name: Create NZBGet Docker Container
-  docker_container:
+- name: Deploy NZBGet
+  include_role:
+    name: docker
+  vars:
     name: nzbget
-    image: lscr.io/linuxserver/nzbget:latest
-    restart_policy: unless-stopped
-    recreate: true
+    directories:
+      - "{{ data_dir }}/nzbget"
+    image:
+      name: lscr.io/linuxserver/nzbget
+      tag: latest
     networks:
       - name: homelab
     volumes:

tasks/obsidian.yml

@@ -1,25 +1,16 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/obsidian"
-    - "{{ data_dir }}/obsidian/data"
-    - "{{ data_dir }}/obsidian/etc"
-
-- name: Pull Docker Image
-  docker_image:
-    name: couchdb
-    tag: latest
-    source: pull
-
-- name: Create Docker Container
-  docker_container:
-    name: couchdb
-    image: couchdb:latest
-    recreate: true
-    restart_policy: unless-stopped
+- name: Deploy Obsidian
+  include_role:
+    name: docker
+  vars:
+    name: obsidian
+    directories:
+      - "{{ data_dir }}/obsidian"
+      - "{{ data_dir }}/obsidian/data"
+      - "{{ data_dir }}/obsidian/etc"
+    image:
+      name: couchdb
+      tag: latest
     networks:
       - name: homelab
     volumes:

tasks/owncloud.yml

@@ -1,30 +1,18 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/owncloud"
-    - "{{ data_dir }}/owncloud/data"
-    - "{{ data_dir }}/owncloud/db"
-    - "{{ data_dir }}/owncloud/redis"
-
-- name: Create Owncloud Docker Network
-  docker_network:
-    name: owncloud
-
-- name: Pull latest Owncloud Docker Image
-  docker_image:
-    name: owncloud/server
-    tag: "10.15"
-    source: pull
-
-- name: Create Owncloud DB Docker Container
-  docker_container:
-    name: oc_database
-    image: mariadb:latest
-    restart_policy: unless-stopped
-    recreate: true
+- name: Deploy Owncloud Database
+  include_role:
+    name: docker
+  vars:
+    name: owncloud_database
+    image:
+      name: mariadb
+      tag: latest
+    directories:
+      - "{{ data_dir }}/owncloud"
+      - "{{ data_dir }}/owncloud/data"
+      - "{{ data_dir }}/owncloud/db"
+      - "{{ data_dir }}/owncloud/redis"
+    network_name: "owncloud"
     networks:
       - name: owncloud
     volumes:
@@ -42,12 +30,14 @@
       timeout: 5s
       retries: 5
 
-- name: Create Owncloud Redis Container
-  docker_container:
-    name: oc_redis
-    image: redis:latest
-    restart_policy: unless-stopped
-    recreate: true
+- name: Deploy Owncloud Redis
+  include_role:
+    name: docker
+  vars:
+    name: owncloud_redis
+    image:
+      name: redis
+      tag: latest
     networks:
       - name: owncloud
     command: "--databases 1"
@@ -59,12 +49,14 @@
     volumes:
       - "{{ data_dir }}/owncloud/redis:/data"
 
-- name: Create Owncloud Docker Container
-  docker_container:
+- name: Deploy Owncloud
+  include_role:
+    name: docker
+  vars:
     name: owncloud
-    image: owncloud/server:10.15
-    restart_policy: unless-stopped
-    recreate: true
+    image:
+      name: owncloud/server
+      tag: 10.16
     networks:
       - name: "{{ docker_network_name }}"
       - name: owncloud

tasks/pelican.yml

@@ -0,0 +1,32 @@
+---
+- name: Deploy Pelican Panel
+  include_role:
+    name: docker
+  vars:
+    name: Pelican
+    directories:
+      - "{{ data_dir }}/pelican"
+    image:
+      name: ghcr.io/pelican-dev/panel
+      tag: latest
+    volumes:
+      - "pelican-data:/pelican-data"
+      - "pelican-logs:/var/www/html/storage/logs"
+      - "{{ data_dir }}/pelican/Caddyfile:/etc/caddy/Caddyfile"
+    etc_hosts:
+      - "host.docker.internal:host-gateway"
+    networks:
+      - name: "{{ docker_network_name }}"
+    env:
+      XDG_DATA_HOME: /pelican-data
+      TRUSTED_PROXIES: "172.21.0.0/16"
+      APP_URL: "https://{{ PELICAN_APP_URL }}"
+      ADMIN_EMAIL: "{{ PELICAN_EMAIL }}"
+      PUID: "{{ PUID }}"
+      PGID: "{{ PGID }}"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.pelican.rule: Host(`panel.landite.games`)
+      traefik.http.routers.pelican.entrypoints: webSecure
+      traefik.http.routers.pelican.tls.certresolver: letsencrypt
+      traefik.http.services.pelican.loadbalancer.server.port: "80"

tasks/pihole.yml

@@ -1,28 +1,19 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/pihole"
-
-- name: Pull latest PiHole Docker Image
-  docker_image:
-    name: pihole/pihole
-    tag: latest
-    source: pull
-
-- name: Create PiHole Docker Container
-  docker_container:
+- name: Deploy PiHole
+  include_role:
+    name: docker
+  vars:
     name: pihole
-    image: pihole/pihole:latest
-    restart_policy: unless-stopped
-    recreate: true
+    directories:
+      - "{{ data_dir }}/pihole"
+    image:
+      name: pihole/pihole
+      tag: latest
+    published_ports:
+      - "53:53/tcp"
+      - "53:53/udp"
     networks:
       - name: homelab
-    published_ports:
-      - "{{ TRAEFIK_HOST_IP }}:53:53/tcp"
-      - "{{ TRAEFIK_HOST_IP }}:53:53/udp"
     volumes:
       - "{{ data_dir }}/pihole:/etc/pihole"
     env:

tasks/pocketid.yml

@@ -1,23 +1,14 @@
 ---
-- name: Create Folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/pocketid"
-
-- name: Pull latest PocketID Docker Image
-  docker_image:
-    name: ghcr.io/pocket-id/pocket-id
-    tag: v1
-    source: pull
-
-- name: Create PocketID Docker Container
-  docker_container:
+- name: Deploy PocketID
+  include_role:
+    name: docker
+  vars:
     name: pocketid
-    image: ghcr.io/pocket-id/pocket-id:v1
-    restart_policy: unless-stopped
-    recreate: true
+    directories:
+      - "{{ data_dir }}/pocketid"
+    image:
+      name: ghcr.io/pocket-id/pocket-id
+      tag: v1
     networks:
       - name: homelab
     volumes:

tasks/pterodactyl.yml

@@ -64,7 +64,7 @@
     restart_policy: unless-stopped
     networks:
       - name: pterodactyl
-      - name: homelab
+      - name: "{{ docker_network_name }}"
     volumes:
       - "{{ data_dir }}/pterodactyl/nginx:/etc/nginx/http.d"
       - "{{ data_dir }}/pterodactyl/logs:/app/storage/logs"
@@ -83,7 +83,7 @@
       TRUSTED_PROXIES: "*"
     labels:
       traefik.enable: "true"
-      traefik.http.routers.panel.rule: Host(`panel.fntz.net`)
+      traefik.http.routers.panel.rule: Host(`{{ PTERODACTYL_APP_URL }}`)
       traefik.http.routers.panel.entrypoints: webSecure
       traefik.http.routers.panel.tls.certresolver: letsencrypt
       traefik.http.services.panel.loadbalancer.server.port: "80"

tasks/servarr.yml

@@ -1,36 +1,17 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/servarr"
-    - "{{ data_dir }}/servarr/sonarr_config"
-    - "{{ data_dir }}/servarr/radarr_config"
-    - "{{ data_dir }}/servarr/lidarr_config"
-
-- name: Pull latest Radarr Docker Image
-  docker_image:
-    name: lscr.io/linuxserver/radarr
-    tag: latest
-    source: pull
-- name: Pull latest Sonarr Docker Image
-  docker_image:
-    name: lscr.io/linuxserver/sonarr
-    tag: latest
-    source: pull
-- name: Pull latest Lidarr Docker Image
-  docker_image:
-    name: lscr.io/linuxserver/lidarr
-    tag: latest
-    source: pull
-
-- name: Deploy Radarr Container
-  docker_container:
+- name: Deploy Radarr
+  include_role:
+    name: docker
+  vars:
     name: radarr
-    image: lscr.io/linuxserver/radarr:latest
-    restart_policy: unless-stopped
-    recreate: true
+    directories:
+      - "{{ data_dir }}/servarr"
+      - "{{ data_dir }}/servarr/sonarr_config"
+      - "{{ data_dir }}/servarr/radarr_config"
+      - "{{ data_dir }}/servarr/lidarr_config"
+    image:
+      name: lscr.io/linuxserver/radarr
+      tag: latest
     volumes:
       - "{{ data_dir }}/servarr/radarr_config:/config"
       - "{{ SERVARR_MEDIA_PATH }}:/media"
@@ -48,12 +29,14 @@
       traefik.http.routers.radarr.tls.certresolver: letsencrypt
       traefik.http.services.radarr.loadbalancer.server.port: "7878"
 
-- name: Deploy Sonarr Container
-  docker_container:
+- name: Deploy Sonarr
+  include_role:
+    name: docker
+  vars:
     name: sonarr
-    image: lscr.io/linuxserver/sonarr:latest
-    restart_policy: unless-stopped
-    recreate: true
+    image:
+      name: lscr.io/linuxserver/sonarr
+      tag: latest
     volumes:
       - "{{ data_dir }}/servarr/sonarr_config:/config"
       - "{{ SERVARR_MEDIA_PATH }}:/data"
@@ -71,12 +54,14 @@
       traefik.http.routers.sonarr.tls.certresolver: letsencrypt
       traefik.http.services.sonarr.loadbalancer.server.port: "8989"
 
-- name: Deploy Lidarr Container
-  docker_container:
+- name: Deploy Lidarr
+  include_role:
+    name: docker
+  vars:
     name: lidarr
-    image: lscr.io/linuxserver/lidarr:latest
-    restart_policy: unless-stopped
-    recreate: true
+    image:
+      name: lscr.io/linuxserver/lidarr
+      tag: latest
     env:
       PUID: "{{ PUID }}"
       PGID: "{{ PGID }}"

tasks/storage-api.yml

@@ -1,34 +1,20 @@
 ---
-- name: "Create file structure"
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/storage-api"
-    - "{{ data_dir }}/storage-api/app"
-    - "{{ data_dir }}/storage-api/files"
-
-- name: "Clone latest Storage API"
-  git:
-    repo: git@git.alexav.gg:alex/storage-api.git
-    dest: "{{ data_dir }}/storage-api/app"
-
-- name: "Build Storage API Docker Image"
-  docker_image:
+- name: Deploy Storage API
+  include_role:
+    name: docker
+  vars:
     name: storage-api
-    tag: "latest"
+    directories:
+      - "{{ data_dir }}/storage-api"
+      - "{{ data_dir }}/storage-api/app"
+      - "{{ data_dir }}/storage-api/files"
+    image:
+      name: storage-api
+      tag: latest
     build:
-      path: "{{ data_dir }}/storage-api/app"
-      dockerfile: Dockerfile
-    source: build
-    state: present
-
-- name: Deploy Storage API Container
-  docker_container:
-    name: storage_api
-    image: storage-api:latest
-    recreate: true
-    restart_policy: unless-stopped
+      git:
+        repo: git@git.alexav.gg:alex/storage-api.git
+        dest: "{{ data_dir }}/storage-api/app"
     networks:
       - name: "{{ docker_network_name }}"
     volumes:

tasks/tautulli.yml

@@ -1,23 +1,14 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/tautulli"
-
-- name: Pull latest Tautulli Docker Image
-  docker_image:
-    name: ghcr.io/tautulli/tautulli
-    tag: latest
-    source: pull
-
-- name: Create Tautulli Docker Container
-  docker_container:
+- name: Deploy Tautulli
+  include_role:
+    name: docker
+  vars:
     name: tautulli
-    image: ghcr.io/tautulli/tautulli
-    restart_policy: unless-stopped
-    recreate: true
+    directories:
+      - "{{ data_dir }}/tautulli"
+    image:
+      name: ghcr.io/tautulli/tautulli
+      tag: latest
     networks:
       - name: homelab
     volumes:

tasks/termix.yml

@@ -0,0 +1,23 @@
+---
+- name: Deploy Termix
+  include_role:
+    name: docker
+  vars:
+    name: termix
+    directories:
+      - "{{ data_dir }}/termix"
+    image:
+      name: ghcr.io/lukegus/termix
+      tag: latest
+    networks:
+      - name: homelab
+    volumes:
+      - "{{ data_dir }}/termix:/app/data"
+    env:
+      PORT: "8080"
+    labels:
+      traefik.enable: "true"
+      traefik.http.routers.termix.rule: Host(`ssh.fntz.net`)
+      traefik.http.routers.termix.entrypoints: webSecure
+      traefik.http.routers.termix.tls.certresolver: letsencrypt
+      traefik.http.services.termix.loadbalancer.server.port: "8080"

tasks/tinyauth.yml

@@ -1,18 +1,16 @@
 ---
-- name: Pull latest Tinyauth Docker Image
-  docker_image:
-    name: ghcr.io/steveiliop56/tinyauth
-    tag: v4
-    source: pull
-
-- name: Create Tinyauth Docker Container
-  docker_container:
+- name: Deploy Tinyauth
+  include_role:
+    name: docker
+  vars:
     name: tinyauth
-    image: ghcr.io/steveiliop56/tinyauth:v4
-    restart_policy: unless-stopped
-    recreate: true
+    image:
+      name: ghcr.io/steveiliop56/tinyauth
+      tag: v4
     networks:
       - name: homelab
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock"
     env:
       USERS: "{{ TINYAUTH_USERS }}"
       SECRET: "{{ TINYAUTH_SECRET }}"
@@ -28,8 +26,6 @@
       OAUTH_WHITELIST: "{{ TINYAUTH_OAUTH_WHITELIST }}"
       APP_TITLE: "{{ TINYAUTH_APP_TITLE }}"
       BACKGROUND_IMAGE: "{{ TINYAUTH_BACKGROUND_IMAGE }}"
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock"
     labels:
       traefik.enable: "true"
       traefik.http.routers.tinyauth.rule: Host(`auth.fntz.net`)

tasks/uptime-kuma.yml

@@ -1,23 +1,14 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/uptime-kuma"
-
-- name: Pull latest Uptime Kuma Docker Image
-  docker_image:
-    name: louislam/uptime-kuma
-    tag: latest
-    source: pull
-
-- name: Create Uptime Kuma Docker Container
-  docker_container:
+- name: Deploy Uptime Kuma
+  include_role:
+    name: docker
+  vars:
     name: uptime-kuma
-    image: louislam/uptime-kuma
-    restart_policy: unless-stopped
-    recreate: true
+    directories:
+      - "{{ data_dir }}/uptime-kuma"
+    image:
+      name: louislam/uptime-kuma
+      tag: latest
     networks:
       - name: homelab
     volumes:

tasks/vaultwarden.yml

@@ -1,23 +1,14 @@
 ---
-- name: Create folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - "{{ data_dir }}/vaultwarden"
-
-- name: Pull latest Vaultwarden Docker Image
-  docker_image:
-    name: vaultwarden/server
-    tag: latest
-    source: pull
-
-- name: Create Vaultwarden Docker Container
-  docker_container:
+- name: Deploy Vaultwarden
+  include_role:
+    name: docker
+  vars:
     name: vaultwarden
-    image: vaultwarden/server:latest
-    restart_policy: unless-stopped
-    recreate: true
+    directories:
+      - "{{ data_dir }}/vaultwarden"
+    image:
+      name: vaultwarden/server
+      tag: latest
     networks:
       - name: homelab
     volumes:

tasks/wings.yml

@@ -28,12 +28,12 @@
     restart_policy: unless-stopped
     networks:
       - name: wings
-      - name: homelab
+      - name: "{{ docker_network_name }}"
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "/etc/pterodactyl:/etc/pterodactyl"
       - "{{ data_dir }}/wings/lib:{{ data_dir }}/wings/lib"
-      - "/storage-pool/Docker/containers:/storage-pool/Docker/containers"
+      - "{{ WINGS_CONTAINER_DIR }}:{{ WINGS_CONTAINER_DIR }}"
       - "/var/log/pterodactyl:/var/log/pterodactyl"
       - "/tmp/pterodactyl:/tmp/pterodactyl"
     env:
@@ -45,7 +45,7 @@
       - "2022:2022"
     labels:
       traefik.enable: "true"
-      traefik.http.routers.wings.rule: Host(`wings.fntz.net`)
+      traefik.http.routers.wings.rule: Host(`{{ WINGS_URL }}`)
       traefik.http.routers.wings.entrypoints: webSecure
       traefik.http.routers.wings.tls.certresolver: letsencrypt
       traefik.http.services.wings.loadbalancer.server.port: "8080"