Automated template extraction

2025-10-18 22:23:35 +00:00
52 changed files with 1187 additions and 1340 deletions
--- a/.gitea/workflows/update.yml
+++ b/.gitea/workflows/update.yml
@@ -1,17 +0,0 @@
 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
--- a/.gitea/workflows/write-new-template.yml
+++ b/.gitea/workflows/write-new-template.yml
@@ -1,6 +1,11 @@
 name: Create New Secrets Template
 on:
  push:
    branches:
      - main
    paths:
      - "host_vars/**"
  workflow_dispatch:
 jobs:
--- a/host_vars/all.template.yml
+++ b/host_vars/all.template.yml
@@ -2,10 +2,6 @@ ansible_user:
 data_dir:
 docker_network_name:
 TZ:
 PUID:
 PGID:
 ansible_become_pass:
 media_path:
 # api
 API_CONTACT_WEBHOOK:
@@ -39,21 +35,16 @@ TRAEFIK_ENABLE_DASH:
 # fivem
 FIVEM_LICENSE_KEY:
 PUID:
 PGID:
 media_path:
-# mastodon
+# frigate
-MASTODON_DB_PASS:
+FRIGATE_RECORDINGS_PATH:
 MASTODON_LOCAL_DOMAIN:
 MASTODON_SECRET_KEY_BASE:
 MASTODON_OTP_SECRET:
 MASTODON_VAPID_PRIVATE_KEY:
 MASTODON_VAPID_PUBLIC_KEY:
 MASTODON_ARE_DETERMINISTIC:
 MASTODON_ARE_KEY_DERIVATION:
 MASTODON_ARE_PRIMARY:
-# wings
+# plex
-WINGS_URL:
+PLEX_CLAIM_TOKEN:
-WINGS_CONTAINER_DIR:
+ansible_become_pass:
 # glance
 GLANCE_PIHOLE_TOKEN:
@@ -72,7 +63,6 @@ TINYAUTH_GENERIC_TOKEN_URL:
 TINYAUTH_GENERIC_USER_URL:
 TINYAUTH_GENERIC_SCOPES:
 TINYAUTH_GENERIC_NAME:
 TINYAUTH_REDIRECT_URL:
 TINYAUTH_OAUTH_WHITELIST:
 TINYAUTH_APP_TITLE:
 TINYAUTH_BACKGROUND_IMAGE:
@@ -163,14 +153,3 @@ COUCHDB_PASSWORD:
 # helium
 HELIUM_BASE_URL:
 HELIUM_EXT_HMAC_SECRET:
 # pterodactyl
 PTERODACTYL_APP_URL:
 PTERODACTYL_MYSQL_PASSWORD:
 PTERODACTYL_MYSQL_ROOT_PASSWORD:
 # frigate
 FRIGATE_RECORDINGS_PATH:
 # plex
 PLEX_CLAIM_TOKEN:
--- a/host_vars/ash-1.yml
+++ b/host_vars/ash-1.yml
@@ -1,20 +0,0 @@
 $ANSIBLE_VAULT;1.1;AES256
 63396333353166316666616661613532383538393239303966633336363361613332343437376566
 3265326538643839326262386165623639353130656164320a323536333037353664646163386335
 33336631303336616636343538353865383531316561623166323762396262643930376231616638
 6638613961313364390a366564343030633665646666626165383334356364623761383032633963
 39393264353635626539393831323530366630343665623561653836303065633965316163386166
 63353836333639363765616164383133623330653762333762623632653535623438313831653365
 32393732306135323062666539663839656563306133393031643766626666323534626638653236
 63613832333833626439653034366336633534323131356262396138373938383039336263356531
 36323432653634366365663039336231343239626539393961636562366263653934613333633535
 61613937336336323135376663336364386533366537626133316130353862633862336530633339
 33663439663332653461643839353564333765646537363864653765303933393562383134316434
 38333134646362663837653461646661633539623734316635383163313363653730653763326262
 65326365383661306466663930646162343033383932633866383862626339366631633862346334
 36366161636663653136383439333461366264383533346461613631623730326437376537373638
 64323863333364613039613533393232373162346436613864336237336439353134313361653634
 64366663303265386663623139636131383432343238306631333436373939393832616262393232
 33376466613639396436396166363032653434653730643734356432653063303762333230323431
 34313338303838346466666463376636323433663038363935633362656164383762343531633563
 386432323237313039376531653362326337
--- a/host_vars/jackson.yml
+++ b/host_vars/jackson.yml
@@ -1,150 +1,70 @@
 $ANSIBLE_VAULT;1.1;AES256
-37643962356232333837626335333837656531656363366365306436653930373333393939653239
+66306532353835666663633632373037633561613261613139306436626532656366336362343465
-6464373031336361323535383731396538323539646335610a396166353437663437633034323663
+3966653330313132663633663462363361373230623262370a623661366633623762656363616537
-38633966666230653963613661623333373430346135613039656531643664363531383266653463
+66323464363164323131663335313264396538313237303432653532393631306635666138316261
-3431613963653938640a363637613966323132303039313037653962623438656139386631363233
+3738653338316132640a643935646530393362346431653966643061643334316238333632346265
-34346561653037326566636138626664666461346433323230663235626265363235626364373532
+66633336316466356566336132626332623661316337613634373036646236363736376561643733
-61366533623135653134383064396366356164393666333763333532386163343532333032353334
+66383830386336653236633933623037316632326266363136613031373439383834653134336237
-30626635323565313735353964316139653835303631623738653033396561663839653237656635
+66363039316661353837383964363163353433383734656564313139383764346533313564616333
-31616663323164383365333837623537313332363065383430653138373062633335633834373161
+36336231363661326638373963393265323365636665653034373536663232353266656365656338
-32653230313839326165623563363161353934326264313461303966393833663465386265333233
+66313034646236356364323238326265633933346530393430373364393837376437623138306630
-33363038336562386238303366353261366233646438353439323064386264373832663534336331
+35306266643835316136323232393630336330346133313963646539636463323862306236653335
-32396264346662653661356665396539633633336631653738313131663639303662383463356339
+30356335366365356439653130376139616336346363656436356333333538373036313266353163
-61343131666536316636626432633266643139393639306239626662333335646164633738616363
+39306365303630636135373731366334623165363336383261386334313061356461303664343133
-31393964666438613161366665643036346562376139376362356636626462626431643331656634
+63383763633566393662623833346662366235323836353639306266383532333736386161393138
-35646237663931646264306433323737316434646331646363303165633938646437656137323337
+36666662306233306439386639666434353639343137653831343666393463323865316464396636
-63613131396364623234333433626336386630333461306232623632343630616163616161643734
+33646238363236303531323131613731343262353365306232343634313637613634626162363566
-38353036373134623934633337323335653438333163303539643239666164666435343134643035
+64326238383331316365343566623464383732653333326534636365386230343836396234396634
-38653166646632376161323065393463656566613434353962333265636135653939366135393263
+63646235356639363036313839643632333066653634323661313263313331393332656131393065
-64663737313166326238646138663330653334623930373035633262383334656631663236316363
+65303338323466383161333237643433303961613266623134383936663866363337653535326133
-31363134316462373637643833343030393536313335316261323332656363363032316631613236
+62323464636638643163313064373736353263356638666434333135656133336534343932613234
-62653034356539646165633335393665616237633030376462313234623035633662383739613662
+32356361346366316262383232653835396435333837633737356335353837336632376337616364
-34366364366636393264353737333832343035356664386239326332333138626662613962666462
+35616365633738366466623835653866663461393738396633343235316231636138333663383364
-37323463653435373864303934633336396566633066313239663364656638646234623236646436
+63376164646563353335333133333665396132343439363861623734336335356663393735313837
-65613632623566646330396130373639306161653264663161336531663939633739313663356231
+34323034336431643362313332633665653837353635303061376235306665336362323630376132
-36343765343862323864356166303630333538383433326436356136666164393861646661623139
+36313539326336656134633564343538636264623932626164366138653035343732396464633863
-34343731623562303135613035303730656565316532663030616463396330663839313961633035
+32613363383366326332383835316666366430623235636536353337373035386361373236363036
-32326635356232383638653834386632316235613332323861613739383335313066383739613263
+31353865333933356561623661353133353864643038626366666431313831353234653430396331
-31373537643630623866303333313735356633633162343365316337376366353734326363623063
+35653864633263613963333734636364366336613430623032666666666266613538663665623437
-65346365613936356332373063336338323438613366643634326136376238383830316635626231
+30643562333561626636646337626234653936616438623738623364653561396638383564333262
-66353966393539666434376436616162633462623636326139653461386432366464303334376237
+39323265346263366530643132303033343835353334373865373561613539613461343962316663
-30393331633431353532373463663933646262646433666565313663643964333765396633336134
+32636461316234313832313635636431326134323638646164396537383963326439633063313063
-33636166623337323061336563363131663461643633393930333339613865303466356465353231
+37353062616233323932343033376636613039343734336630303139616331626431616330396363
-31356630376664616232333633306636326130633638303539643633656266343634353733373633
+65623565653235303630383534343739346234316337343233366530313238623139666538363430
-36366266646632653964333537643865303535643265326537373366356361373765636136386439
+61613833663666386161356331656131356462376463373432316331626531393136393838313065
-66383734346566333931646363353633323765633461326633626333393439633166313635316436
+34323361323836323561633032663833343537663637346330326337363165306237616335333233
-31616436633231396164663233653961613630616463313261616533666437643232373562316634
+35656530303666633438303732623232383965633038616632633164663461393465336233643635
-34366164383639313134383134383962633964356162646631353064353264363932376661623534
+30363334646161363234393533663064363364343838396562626232383036623236343664313366
-65313363353363623831623265393463623066303234663733333432343231383937323136376339
+35646532383164393365343366633134393061633362303164393034653862653535613761356630
-35656539343531313936313137646133356666316630376534366534663335656164363737383963
+65633634393033653363373235323933333766306165326237636530663737393063623664343031
-33353530373935353230366166343364646335633236333766613665383930366437353763613339
+63643538366238363066666566333236653362633861346136663036373731626136383530356466
-61653161653165373965373434333138383638613734616166323133346466656636643163303566
+33326230303864353838333136373736373963386638663164363139386638396265626365356535
-35653331376464323331323337656630323639656434333364366230653432333537636566643261
+35396236306639316631366461373235326665643565326539333739393264373733363163366537
-30623632656338366266383962663864373863623438363830376361376134303436373465636632
+31656366343831616339393065323331636136346236386131306533383436356566633830623163
-38643263663437316333383431366365303437633264383239353438326631373133376539383638
+37303036663935376132323733353433306361383234343962633165616538626564653239393137
-32643666633965396666343239636361323635336338386438313065383263653063393436326434
+65346236656266383130323662636565643033663933346337663836643765656266623563656430
-31366636633436303835326639663830356466356432656134376161646632323134356230323364
+31386365646437306362643965653631373862623266303165386666626430663130666130323062
-65393663323138633638343638626434656466623563653939663665303161616631306337616537
+36326331313838316339653231666138616332653564323635356366316237313662353531336636
-64613365363966653964626138303935643835383763316634663561656432383436336135656131
+31666263313134656136663862303536366631663965343565646637663566656466646435613839
-38653962306530343933663038353738306261336463623635323861623937386463306363666338
+39656230616465653465316633373561343237356637643336373535653438656137323264643239
-30353462656135396135633037376561636133643834633966306365623938366238383439656531
+66363066666161316362383737333638336565613230306138343735633432356661386631383530
-63323534626364393761313835386636353335616166666131646136643839636439633161616331
+64353161396463313532336430613862396537643436396562633665613736663965356335313131
-38643264313433366335326563613339356161383663623864656434376532363966646434326633
+63303563383734353331656164313638386135343336346263643430323932366133306261663562
-31393163353163343139333039336631363839343631376463623866656132306161666537666364
+32633363373537626633373433396565363032323536336263373835653363323661663834333365
-62663033663838383134643339616631396637383565633930376262333263396463356133323831
+65636332383232653933363736363131653032666135373436663834656337653739333338636437
-66663866646536653064343663343938346332323863356430323430623538386136636237366436
+62613463626437306133333632663662303732376364663339306637653534396433643665353366
-39663237383364326164373263386435646434303736303931366134373964653566623135363532
+30633332383136306230613435346536323434666431653834333639343234613631323031643138
-61366464393032653031386636316661306565313036366562616233393064396432653636363434
+38613536336465656232336238653532636664313766633432363364613937323337653464616461
-32396335353233313435643032313065373465373635333134373635316664656162666262396430
+32653939386537663635653733336463303538333431303537323633623834623637666132613030
-34383933323731326238626234653266636563623661343437643263346365626465643833656564
+31666539353762346335643134333637366533313833383634356266653831663333393661353439
-66363130353931393861363731646430373937316265646633613531306563396431373737633562
+64353432393432333865306535643261376536663064323163393266373235623530626138316237
-33653137393761656339333034366436346534663338616562616636643762613462346232626161
+63333631396234326534386238623937626661663265383631386662383866636231646531633562
-64616436343663646233653138613230353432316435616333313236326162633239653964393562
+64323762616431663664613564366562303630313137353838323064333966323062643233353830
-66306230663038366230633262393936343435383864623238353935393061326661363132386561
+37363763666530643535666235383062646163626164353037346365366332366162636563313361
-35666163323332333637323363333534626330343831303132326231393630633539366635396630
+37343861373764653633393930316666613335393232663332323035386431326566663038613861
-32636162616330326237386332636339336237326266663761643933636365613030643539323635
+37303061653936636234363937623162313731353961343337356663623362306461636438333131
-64653664313337623438383131343430373038303333663330666333616533626437333433656530
+32376633663639333534396162383438373863633664383266626537343165396435346337343935
-33346461366231343763346165663432376233623963613265393033373832623736356635623238
+62623232646432346362623430363665353036376564323734346536393430336135306335613238
-30323230326331316537346133386630326135383534303636396639383437373764623835306635
+35633365333430626134353535623363396330343138616530613333633961303930623633663662
-63643836333334666231653164646566663063333361396431346665336236613164633566623732
+65313032353232653233346665616562363138333639323562653035646431313365623036393665
-37626561366636356538626533663134316362616464356438313333633134343433613033323035
+3363
 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
--- a/host_vars/jade.yml
+++ b/host_vars/jade.yml
@@ -1,221 +1,209 @@
 $ANSIBLE_VAULT;1.1;AES256
-62383466373737653035333232303338326366323539316363336337393862373265666333356433
+62316431346466333036383039323736336662386634373664343961343732303963323361663530
-3261393563633166343066346436363532336261376134350a353937653561346237666134343561
+3038393463616438356133633430393535333335663236350a323064386662623762656138373763
-32623332613731343631666563663731663739323633636239353035366335386366626366343934
+36343534333364666466656138313034393239626435323163376239333662373538323530646663
-3333313835326639340a333463326635643561393464643063613530396430333838666234353538
+3961386133613637320a333536636263646133303231386663386237626430626439373435333233
-32643366326165383435366266303463626330343533346561646232383337323332623663353131
+66306661326232303032653066353433363839303630376237363538626537303765663065653336
-66306538353864356466663233353237356132616161373166393736336438353066303963663764
+33346335363733343938393335626661626431343134353164396533373562396332616262666362
-65643465626461393232396461356132383939353035643736633437316132386461313131623961
+62396662653461643331373664653735653563396330303165646233363266333562313532303164
-35366464356133373333663530613066613233303161623534653331393864376333303937333037
+63363566353336646664373633376331633465353037656332333562663731373463636133303637
-61663239633030626339653062663939633662316633376135626466623637656239616234373461
+32346231386463353864343465336333623136336663633531343830613935666535306131326666
-64353633386638363132643530366237396335333263306136373939343565323765313565643666
+30353866646264313536333165373638373034346230373738666531613934313762613131333634
-30366162373337366331313232373333393939653561626238373236393430363464633333313562
+36656566376535643833623631383539363163323933343662306365383732303764346665306363
-63626463313336363961663431366364303065623933303261303963326266386131346566323638
+39336162653734303062346335656431366636626262666639393162346430343737376233613761
-36316161343738386436383731383961656336363137303566366335653538663432323765663062
+38366263663062653332366137346235376261356666663331353430663836626339663064396461
-34626232383533643363383039643762626337316636626438633438383037353432323132663464
+65386431646435313038653131633531326631386436333361316233306465333533393163653437
-38616532316534356632643630326534643962353634383162313338396538643862313061613838
+38633765666362383236386130313961386266353463396138353439643232333965643062356334
-35636165366337623532623737393738343230626530623330303465383263393763623664343466
+37326136396133373061323366383631663165396564623631653362623438336464356633303538
-63666135353663363961306366626162373836653461316537373961333364373236373361383238
+64346435613736633839626561363161383435663333383133343030653835323131373937613435
-66656636646665623739326638623061663765363030316263613666666364663261343830393330
+31396661613534636138616336333538663835623531313835616266653662353262616162646431
-65366366306333323837343666633935613635396663623962386430613937626366313232363962
+34393366633433643536666230356635376332393632333531633139396432613463653030623564
-65613064303731613865366432353866326135386464386637363335653135343665623632663066
+64356232653337613535326661633539333663316566616133663338656139656639393538306332
-66663165633163396264303236613734383464633966663663333731616665333037663538636530
+65333036663563333733383439393332386137313437623834633231646433653233623037346535
-32323830303864616565363862316132303131636635326431303261313131646234346164653862
+62386262373032646230303764323138623332353236653461393838316663633033353339623132
-62396666303961633165333931653061613132396433393436623665383033396130336231323337
+39356438653366633464666638656630333438323936333035383764396334326637656238383932
-39333563313137623035376139396261343432666130306566326662376636663938326439663235
+36313165353534336666626664373033616132643536366335333466346631323262616239343564
-66636561663464336637323663363363333338393665616339643864633839656463626665666664
+38376135616264313461323739616663326631636431633937366534646366383430623062316537
-30373463363135326134613730366430326666623766613131326562366265663662323438333563
+37313536663139656235663335636665633634626237303365326665383965636265353262643362
-62363037356231656664623332626562346266363035393562336262373363333366383739616636
+65323963326430353362346235346434306133376334613831396635373936666565633232316465
-63333763303038353234643564303132353834353439656239396463313862363464366634646439
+61316135336633356534356363636130353837653435343032663361363335623164373835613364
-32643638623035366632396234626134393461633163616664303934623861383462623438323831
+64643365616165393436376263323439613637326434666639613164383066306365396463633633
-33316361363830353062353832336366363161653630323735356239663037616364636665636330
+32633332346335623831383734653838323436346463633435333530363036393838346231663932
-65313531396530323064353862353939393565376662356138653736386637623265326632306561
+38356663653066323966626137623334623739666463366166646636306638393638356332336630
-61343764393034633461353432343830326661353663373965373961663330313035396437663738
+39626534666235613237343634313933653931343831316137656439653266393663343930303462
-66333539626565313635663531323366323636336237306561346234323962613636653864383532
+34666266653162323231376564393662326430353965383364326337363333666562326262326233
-36326138383566666434393932343439653263393332663766626261653336333432623337343439
+36383733646362303330303934326533653365643538623039366265663931613031373862366634
-30316336346466383333313332303238383761303033336164613462366532353761383333666665
+31343835626430663962386532326666346261653236613132373535303937386535303432663766
-36306661303832646432626461616236333730353538663765653539303561343534643862356463
+37313932366562643933303434623234393765363464666362323635646462326438303333393132
-61646361653464653462346334313232316633376539643836326462336236366330323061373538
+32393735303039623135613033636532613763396362366565316536323933366631663765333033
-63363638643862343539643639383935326439356534653339393835383139626539373834653238
+34356536646339346130383338316162646530326239373235663632643034616331356533363234
-62396464373766316132376136343631316132396661336233623637396166376466353936666263
+32373365343435343561623265343237376265663039653634663538313062626633373238356262
-31613261356366356130306437613364333866333830643665333866646263333034326336373563
+64356431353936663536363362626165383662343835626238353036393235343034643465653663
-66343764633164666666353161636236376163626262373536353464363032333561363963376266
+30393861363965636436663732616165393231636235316533663264383265323763656536626166
-37646539316163336637313863373064393466613863653834636639626566383535363663393866
+32363562656266656331353262356435353030323330663032653930363437313934633265333861
-31633737376532316165333531656166646533386439323130396430323431376662626661383564
+33616531326633383237323231353866366531636437356230636330393533333331313566383138
-63323265383933626631326133636163363630666538316331623733663535326261323438383263
+38303562643435383736363036353138626561323530393736666236346639326162383638303165
-66623035343132646466613063396561323164323336636639636535393832383234623062626630
+39616361316632323936653734656264333764356431393635613833346434303861646264373337
-66383739336565643563653438376430353961383062386539353965323462356462353266306163
+31623435646463346630336235653762656561633035343332636135393464393332633139643761
-35383964616562653563666262366264343735333461646564646264306365373933656565363136
+66613964663862626664393133326638343336373962343566646231356261386339393162313438
-64313530356536336665393333323464336238333637306562396635383835306135326165373763
+38303036323132353132653633333064346338653566346437356633666565643730343763373137
-63336665366461663137383834643136383034646238643463656539386330363761363064613434
+36363432346633626336373934646635353264623834303431313466346536653839366661646636
-65623836323732633262643062396366633264396334353938633463623462383563343631303239
+30616461653938633562613536393864376230393262313663666634303566333766626435643333
-37363263383935333665336334366334323166306165333466326232656637646132613339323239
+63393461643266643538343132356130383262366463313132383239323838636361653638653437
-66303830356330396432613163616166323261643861646264336436313733363362343835646464
+61383936303836323931666164373963656138343962326135623565623930346136656566373335
-66383762613665306465643938363631343630633733376137383133346465653662313938623237
+35623132613663356430363139323936643137393337653438306361316464363734313135356362
-63313333383933393131373039323065333635353030396163623130303462343764656533643936
+34636566663636363933363462666635643135323631356262323635323932363035323763623734
-65333239333236393537373863386435623231376163323261326331306263326662653132623032
+34316637626263313734326466366364313732383465383062326137646262383130313365356463
-61663532383865636566623761356533656363343863633161343230633433306533633130323131
+38376565396339346463653833303361646430323636623830646233633362353838333131386461
-37366234376565666633353962353939343634653662336139353662356337393438363261353636
+64323464376361333239313739376436623830393937353934386339366339326439386564306434
-35643563316165376233383134653363343262633035326261666633383437626237373637663932
+66396136656463643462353663633233333931316532346162653961383334656337636261663266
-66326636643662636539346138663530623365376330343833363263616666623938623736303030
+39636331353566343966616166363066623561633837313062633038633137633264346663623730
-62393135626565303464666138613365623632666638653265666139333930333737663965323631
+31336438643536396134643338316637333562663639366133663637646236613963353966643938
-39613330363561363366333765313837343462316633613835313865656363333132326336626539
+30366364643165616435353062323330396631326137633034666330376633353466336230643466
-39623364343131306263363863323730323939353261646335366133393962623137653864373131
+36626366313639373331303734353862336665643962303837393164616266323433316665626436
-62383935313265363937313664336432393965653463643466646137373630373631363736636431
+31303137326331646539373863623638663839373461363135326132646632343764656538393035
-35323432636633663138376339383131383461656465643766636636306565663639623163636234
+30663833653236396563393634373364306536323965656331666465643762643036633866343139
-33626237353334396432656530663833633235666239326336316139323439633337663433643331
+33343438333137643733616530666466376563653535326261633933303539383032643439383030
-35643766323361393064336137666664396465373765393034303462653737663063373065316465
+32643033346463366335303663363339323866316437383366393731373034323763363562333033
-61336363353831316338663536653063613061333034613237306531663037653835663538666337
+35663464336636623835333632623166623163323237353831643666343564303632646539623461
-37613834343164396133343736393165663263653161663537313234613366653532646630373766
+61613864326438653935396434613761376234306261396262323732393338376339613866643639
-37636331326338383039663030346666323234393632363233323037383863313564363563346338
+36386537363536376135323862396363323062356161353638393063336466653437323838633862
-63656261653464663663643231653833346130386433373562623662633963346630336533316435
+62663738353235663230636639616638313237313638626334633061633535373733613734626665
-66333439396638343563633138326431346131373439396566633232356535393565656231663737
+38316464643035343261633466343238393632333530323562333066326334663932643337626530
-36376163393133643337613639303039623832666438666661383436636661393233366663333838
+32373366323364306236653465633964326539646265346466633730396236366638313032613363
-64653564623562363339656162353836306437303738373439303933313637393464306265323336
+32323332613562613835363433376562643431623266323131313031316163366137623434323030
-63326436393364373931653563356363313139343734633663316362323738653738343732363138
+34336234363861366435393532616466363631313535303264643765346631396564613432616363
-61393761326138653036643332383235626236356564633232323462333135326264353937336463
+64336364393563396132646166313163323666373638616136313061386561623338656538373033
-31313965366132623737353232373134323433306564333862326634663362356238353465653364
+38373166333762323065326464363134346335653236613530313235333864393265383633663637
-31623933316465666331653831393461316538393537386636376461653236336434626134616662
+32363134313230333039613137306135373964386230326561626137633133326463373935646239
-62623634366336333739373332376239386336336631396263303535373564303862663666663562
+35316536623932323135306233383332333832396338366561666565323462656666363834346431
-61313830386438616262633533336334353735333331346436373230613363356166353430386430
+61316139343634653538396233656262396466376263643236346438306630666534303337323565
-62343735373231656139343035396562386661356538376661643435353237353962333930363939
+61343636303564363132393236363333653263353061376330653534333762346130653561623039
-61613733653064343833396530343432663238363537373631306132666235613330343866353031
+66656135393864313934393233663738386430333534303432396534623831333363393439386135
-64396531363337373236656235633261623239663439303834356139623833623339353862663230
+35616436303439653132356530626138373934383962396564646237316665323538396666366437
-31363039663033323663353766616465393063356263323239353461616239346332396532633066
+30376339383233383664343965306534386166613964313534636261316537316637343631393836
-64346563613934633937333433383764363731366132626365323661313962636464396539386236
+30613761323964636433613036653631303434346633623166636139326637363537613833386165
-63316563353661376330346139663737306162366661656461353862326666373030336136366632
+34303032346137623736373563303464306232663066373931626532373639343535313830613135
-63616439616630366435623065386430646537363333393965663534383531323462373833363965
+66656261646465366366313436313139376136373939396330393464346365383730626466613530
-64323931383534643730303466373366393435313663306631666364376665626434623430326164
+36303663626337633735633636666164366237323635383664333938373362626164386233663165
-64366437626634643362396565306665313231326336366630326163356630373663653633376434
+30643432356433346536663932616530326339383736343036333663383039613132303263646236
-64393033336463326631303862653337656163343932363661303862346133373562663537663930
+38633939383866646534366663393434373464616165633335373034306133393666326439613761
-34373761373537633130366661653539343931383663653234333663323738356535306664656664
+65373661346661366437663236663236663632356466386564376163636636343666303535653661
-61383337323238636634373830626138393466336666386262393039393963633835366531643831
+66646465386133353539323863656131653238363633336239376131613531396336313562623331
-35313531613832663637386566313436363566346432346536313263633038393438666431663737
+66393466613461393931343765303565383730356131663533346133386337316431366461343731
-62633631656534353961306663613634616336393833616166613836373539333131633066666365
+38646562613462653733323163653062663332393438313238316530653165363762313537333961
-63656264353831353630343834356239653331376539376331386663386334366463363935656431
+39666635363534646232386538396530316232363130666231643363336361336339653461326236
-64386439656135383139626136653066613166353738613262623231323132626330366561643030
+61373932346234343537366433386335353636636666326164393364623035656530333036363632
-36613765336339383863666535303930626534643934383731336461383432376461636230343030
+30643836393939646139646134636362336332383836663862663935383536613031316135613137
-36383330376231336661653735373961643936303064373365616333663836323663333361376462
+62613065363265666165363732636437313536383037313863613937656437316331356630636161
-34616538343235366332633430613130633237303363353932346366636631366466306533373063
+37386335303237313365346134356266336330303134646339353432333062303931336639613365
-66363832623237636266643861363238396534666164393735303165393933623766313262323333
+64353431373862616363616330393034396630333232383661353533323034383762353062303538
-37623830613733333162303061383166363838303965666664633861376238343165633234633232
+62326433366439393030373163656332353636343432633133626139613535363063353263393761
-63636633353937376131306435383061343030666361323061616262353935643030333966626433
+65383238636564663061356561616430633033323233336530663335623538643466343165326434
-35356562316336343932313539623239363036336361326234666339366335343033643435346536
+35313835386566326138663736613838613064306238383063376530636362303938656364653436
-65346261663338326465316237353934633334353033646433353035653530396232666638636262
+32313364653439393132353961343264346231333732323537623065303839663939323466613834
-37393532656561643839373333363331316235636566316531393865633131373936316236663839
+30393138346632623236356130346538643934623762663538666432343065643465663164386564
-63663835633437346336626432326235356432616364316465376239363864323561383636623338
+39356565646566353830383338623939306161373437336230373166316530313331626139633039
-39646266396162313938613062623430663237633465633261626562626636396637373137366465
+32336535633839643532626632356464336533623766626233336335366639346666663931306536
-65643134666236386538643062663135643266303861396337353638306532306236636136623039
+64333239613736343534353663383232626638396438653262393835643138353466373936353234
-34336130666633313661653761393536346661343063653562326462363434366531656430353232
+39626439663463636237306630376231343537623262313635316164316539613231343565333532
-32643164303364613362616631356364643835346561383962316265336637353837383462653037
+66363539626638336637396532386437363438373530393165613434616162353561633839366533
-34633031346261633835373131656166386439306361356636663338613731393434323039353665
+35643265646439393563303433386432316663643165613065306461313939636133613733373138
-35636365303365353833623463626463326632383737373235353464323939616539636531383665
+31623965393466363831626135663335646661373136613934316532333964346230633238646539
-32333761313439626339613834316464363835636331373331363730373861313739363164313330
+38613732393135363430663334316162623330663865393234343730653434386462366234343332
-33326136326566336633316437316132613430393166333130623335393232653065376131666465
+39646636646630303964623662663437326161316635646361623833343136373333336463346230
-31303132353465313761633265313266373132633231353766346633386639336464613134353832
+61353830383364393137343134306665306633396632633634326339393331303231343461623364
-34613035396165633864616664636563353265316432336636326632386234633263393261323136
+32353131333133323939656637633664663437316666623438666335376264353637323562343935
-66356338613666303863393937626365376631643666363830613836333236383466353835306535
+32336261653664303965316132353764346663656466323464643434373736393462616166636162
-63313939386335313936376233626231343062323662313565653439306534386133396336623265
+66336563626536656533316165313735386334393533623038656664333438376536396264353030
-30326334373433386639626362396138346234346630383930373636616239353734356432356237
+35366532613733346366353366623630306630623130653331363165346338343832373338393765
-33636135353736313961303730386433346433663332363465343732353132356162383936343238
+30336130326639333334393338366362646235383635343139643136366630373761386438343130
-35633866303031663238666662366137316366333564336134393465383438616465656666653664
+38613831663533626632623632653934653635633366353130663538326538316636383262386433
-37383231623136363163663562343938653631316131613864663936363336343465343931613830
+34326163363136613861646438323132376139306533643765316435356363643235616365303932
-61633166663534643765306337316635633163326238353561376631353661386437363935353636
+65303737306339633330633937363638663337636538623535323637383761666461306363616338
-35623831366532393061343764633735396363623161373661316238303639396166643430323432
+63356364646463346437303665376266656466636265663864663163333032623836646533326437
-36363137303834643233616331623764343161623264653531373431646364376662376238353233
+34316131633031363966316238643163613838653061383734366631653733633438313038333432
-62626464393336653530383434353066353865333139323363396635393530616332383463373032
+36633963653366353431386261303264323931353465343333323339613138313562616464663931
-36363665653234313263333334393535333961393063303366393034333734626235313835313665
+37663636376633333033383666323161656234346261363536343134343566656530346433383766
-39376330346132343035653531396430656231646631653131633064643530363561393665663661
+61373166666530323637303737653733396333313335646666613936623630303262306565343239
-64636133623231396663393662333738653631356436646166356531303066636139376166353830
+35363639393138323062393436306466383831656638666232616466343065363464313333333162
-36626461646635323730326463323065393061356633653931663334633532663834323332363534
+32393539623737373231636235666233656132383966663964343161626563383965616161623666
-34306539386532386365313766343462656264653332346363366231663764633436343334343235
+31356461653264353239356433646132316462386161356330663932353461386339346530653232
-61653465303635353062333232396261336139633561373034396533383933373933356462666134
+33306566663061616133323230643930643030386633666133313132353436336135383336356563
-32323631353536663761663439353162633539346561396166303738376432383533643766366465
+32393838333532383637363531396234623038386665336363303731376461306630663761303139
-61373536663836613237366666646133343532376461323139643565396135366533356439306438
+64333130356538623032373839313864633561316565383434383962353738353666636366333765
-62643235316231663564326238386238353536356330363236313064333862366336636363323834
+34353334646365616234623031393339663666633765636432666666336261343761333733396534
-33336236313939316162393964346363363236383263363638336531623463643338323461326338
+65303064643535383866623363333162303333393461313964396365363666313134333033383233
-33626430343834623466666461396534326466393934643631306637633562623531643636343031
+63393837636161653031633066326662366366663636313666663834376332356336666530396263
-35626637363265306563643463666337316633613263353363306330613064306664343735353265
+66326634376365343635666130333936346133656263343463613763393738393862353934343237
-38623033623364626437353434653732636161303732326239633837346336343666386138383935
+61316437383830636264326564346535646635386562613466323832343665636630346462333863
-63626238663630366630366635356531303564663866616563393164346564643338666561396432
+32623537396538643964663936623031326265373066313637636232363364653538363064613262
-37396439393866666661353463623865333863613765353264306633636239656530303230373537
+62306561373133373532376366336637393131383233393036313161363563303666303339363230
-61336634383861633165366265313136343464396464663136393864623436626537313935663831
+65633263363064633837363362393632383966366337393030353132346465346463636535303062
-64386162356665616331383839373533363161623630663431663136643732353065376161336564
+37316665653230656363313937663636336336333136306536303861303439366531323266336662
-36663931383033313130643831306364663365313265313831373636643861303261626130326234
+62376339646334303233376134323065363938366162316461626566343235303761633132383433
-36613038356132343936346463636463356332303261663830373333346435316364383161643065
+66303435633336313961333734353236623536653739336164353037343334386163326432303031
-35323262373736626636343562313731646234373464633664663562366364656466323737356435
+37353630346164633766353365613662373936663265353962333566336238336533396639373839
-63653266356265633163386337333731316266663032656131346134353264306436366466393464
+62346564646261303762663366303939393963393134303730383038326562353837623130396439
-66653662333464646437636439313565333465366339383365666538376464653563313835343561
+66636535663137333535393864613464636334363132376562393531376132333230346632363230
-35373661353832643363363266343561613066343138636339633033343932643633633035616232
+32306363336638326235663466333236646130336539333533306236653861313465343661613235
-39336635636135666461643134636435326433613331353035656232313662343735663833353234
+32643633633832636336313431653134623234303534363838306337363164326531343061306264
-39653337386430353364373237313533373933383333346536356337356535653531303532663235
+62643033326137643461636534623965343161636437326165303536343135393163643734373936
-36323531643735666538323838323932623438646236613330383863393836393365363636626232
+61373237326663616461326462393431633765346330313136383030323736313533313662633438
-34393239383236626537303666393532626335396434363763356466326633363464646565323431
+30616335373732303931643131383732646261333432323537393736313438616336306439626535
-35383934613964663839343332353539653136306566653763396564343538643663366636306331
+65306137303464636330303765303663366436353063643434383631376462303530643836366632
-63386531326635373134353564316532353333383834376332306237336366616532363034383866
+64613730316439666462613534383561343632323832383336636535626163316535383833313834
-32326133333932323861373433376662343537343935663864346537633063316561316538666431
+61383433643637366561316665346335623135323361346532656139353261663531396464343638
-32623863373432363264373637373864396363353933303762373662626364653434363738393234
+65653137303664613562333661363636623533333735616231623139343661353866623864363533
-64616464633433376336356236376635623232306264316464616465636139363861666435316563
+62636131393364643938363463303465333430386564306531366436316365613063623866666666
-66396630346437616433613665303462653662376563623763633466653166643536376466323133
+65653261363562653363306331666566336462613661646264306361663835633162323032616236
-64626630376338666164353839323062303132663633343937643761356535633238356634626165
+33393663613762313033396136356339356538376633353837613366326634303438373036633362
-62363237336264623932613835303236623333316564393338633861313333666466346435323766
+30613361633037356633376336353539616134663561663462633336373836373736646363306165
-35626432373737653138653931616562396161363037613339323961633534623537666637626133
+33323935313131376531643733353965353761393532333835616534613062373237353932656234
-61653637306531646239383639333366643937393932623131383335616436663863393064323833
+35356538633032383961326562346161356231613564656336343039616339306335666563323464
-35306635386336613037383761653638643930303334386139623135313434346232316233373632
+31393961636330333966306332373837636135646465316235653533626261393865653932613930
-38393737636132333138636534383565666230323831303964333132656663383838386538656537
+32376539343530326138656361356238653238643830663636656435383634336562306339366330
-36316166653239323162326333383035346636366163636233393936613563333032653339623264
+37613663343837626661383235303238653533326436643236653034636139333630393934633462
-35303766623730653939383439643265343365363064336430356431666163656661666330323563
+39613365636262613736316530663732623837653134653133363032623931663933666262323035
-33383761326562333937396535303366373136653163643138393931323838313531383264386463
+38666662333835336464316434303436373663353333396162653333663234643139386332313762
-63316230333735396538613561313132613861336166663238613730323438383830643963356230
+30303365646236653362376464656165366536303331393935303936306639656331636261646530
-66343933656536356136633065663037663233623662393133353739343065333438333235333836
+39333332626565343964623136643734643664383662663133663431353161303639666437386638
-39613962376238643933653131363261313164333333383032613235653136326262623461663032
+37653332613865636666373634626466623638326237656663323734303363636334643430626533
-36326164323036386562313638623331663166633039373264323333386635363437373839393432
+39386437366430613737376433366539376637393963613137633162653130666535313363343437
-31363564643536613530383066383530643537353263366565346533343761353530313739346137
+39363232366136343937343131303438353837613335326437333166643336306638623665616439
-38616335386539363861306232326330386563663433663132383938323866646564383864333864
+65616662613331623137653539313462336138633739623036623264313835363435303262643031
-64663733333961373730366137656563376562366366646135383662333831636462623762356563
+65316236636432346562643262353663656364353536666138623437373334623131613238353763
-65313433363633343662316337306638383132613131393765653135366631633561356138353730
+61356664323066356533616563336231393432643038306464396664333236326332393161373963
-61313135326366373837303130663466353563313465613932633863383664306262653833346462
+32663435383363356563363134623736363966613834663933633963383463313335643036613633
-32393566666566656339326531343265316631623230383130343633333535643939343733343161
+63336661393531346534373231316537353539373738373433383666313435633433613031643538
-64336639666233383865386533326437613630613536303063656631346463353564613030366662
+36326135306139353032656230663734383437623439333031323163643230613866323535663162
-35313331303564663835393439623730633031363435366363376230346432333834663933313834
+37346161303935333966346565613234356331333031656431376238336438666239623032356435
-37653561626430363962646136633865353138323835633062666631626436653461303966386164
+36653235663664303235303933626163616363633866393337326430376335303736626561386231
-31616235623932356136663763623263626331343131323933356439316430336564653630653836
+34376563633963323565616136343765316365383538333765346365653432353261346533656661
-38326538666265306230396461376635386464656637363461623639356531313939613363373461
+30346433333639626234643630366638616563623133646666323061366530646264363566333530
-34366136616238373731333962613437383563653161323337336135356462346431343064386463
+32623161393733383036336238626236356361656633343732393438663937376163323865653366
-36613235353263623430333035376133353966373130316134303639303865323534386239386632
+34613035623230613362346337343535313139363636353536656131353139363835616236663863
-31313935343336303535653861363036363461373537336561363532626137623066663932343037
+62363666396338653732316133666536393663663030313531616437343761613637636233313431
-37333164356232343763613464326234343230616362326333643665643261656266336638303330
+36306566303832393136663963323836653561653664666661356461313131636435306632343836
-36626133333166386661393833356661383337336136336537656233326666383133623637396264
+64613839633264343239626430363632656162343233626330613538663362356561623965336232
-64316264616439313565306666616238336661363365633833623263333363623132383830346130
+66393432343132643039383138323733353463323263663239303233316366626437336531313562
-35366234323837646531366330333632616133333364343766393233333237373836323837666161
+31626561663962326431336138643438623836633262616533656434343436636134333066613065
-63643138376538363639353330373136376564643261623731313931333666353239333561663432
+66633663643632313436616533326163343733393035636433303336613463333532633066633565
-65396663373436666236376434666632376335353566353530393533633132366130663038643264
+38613932633632353434393433373738326166663764383765613136326630663434363764316431
-37313832613732353230306135363466616162313137343436653064343231356433366563303738
+35353562653363363533363538646336646666393564613933303066333033653965333033316163
-35623531636631613061653963656664313038633434316336333633316661306563643262646334
+61393666383935393261373335626262313661653639643830376265633562356638326336663432
-33613563386330376333663133653138336234386366316538383362383665643361386366386538
+35333936313866383432666239313630613661613433303330363539303462366237313533636263
-65396534643064303332366532663834366537626261316139326236356136343136383638333339
+63376331633865396639643530663237326338383535643930653233306166343834333061346463
-36346530356565666332613037373364353366386130313464626565323730316132336262323264
+61353734613765356165346437336137346639616561643238613565323938386161326139623861
-36633532326534343362656465306535653539613265323634393865646235653363626637383339
+31643866393765656263646663376638656237323532363935353961633361623862316431643861
-32346264306561383332366462613236316364393931316132323937623763393935313830346430
+36333339386266396132613066323834376265396563326261646561323434323639343561613161
-64383236333664353431363934303132313434326534646239363366626530643536646230663139
+38306464383031393633363764303930306163643365333532363138376365316239363361643962
-65316466313562316266653665636361363734393461396630643637623462343866646265633838
+30393333646233363564643661373865373034663131656331386631616466333166373331643963
-39633137643937656438643433663765363430313337343166366161323434663439353562666132
+64346234386338663464356165366461353365323737343165616439646463353661323534323331
-38623464623962343534393064376237373231333939323666306465306134336234383932353635
+66643931636631616331383065613334333262633639636164333165373237623235316434326531
-62656337636465326532613139626462323162303730663837313935633437313265353930663463
+30336663373437343264353032363737633838303034396561303035656234653333636366343463
-38626231323462363461373131306261326463313763623737303466353835643931653334653132
+30393966336664386434303764356531326665376230623830303237346261666162633864393866
-65626639396365646333653064396662626566646666306362366334363934646237663830393962
+63646332616135653138333437356565643333663730333263396466303234643331653836356431
-31343561613162396632396336653834616663643130363131383463613265393337613866353365
+37316434366533316132336238373833346165303062633866623033623037646461346263623734
-62653737373132616335643731646236363263366433653965393736333766393262613836333365
+62393039626239393435316538636433333634616161663833653564353637663864373264313530
-34306635666366636430393365626364633061356165353661326563636366346562643733353334
+30343533306335623130
 63316437376330656661633661393362323133666434366565633436363034363039373761633032
 37393163613131383537616434373730303664663562656333653232313937633164363236303663
 32363065366634363731313534343566623830663361663430333061383765363137366662623139
 66346334333061303437396532343330346366396362366362323535306639333962636232363730
 33343236636163666136373264666236386361306337653564623637626135613562303636613535
 38633130396532313362616666636238343035313233323661373032646432626262643662616262
 61353166363330323665616561643736326236363438353636373063373738383361653539303131
 30366364653464373662653066363865626338613433316362393564653739636635333562333036
 30376530323462626264373235313231313163393838633437326265646638373439336638636166
 64323762373835316138636137363166616161616633613632333063323632626637653630346562
 33376334616439376161643038666438373833343632643934303164353866613231346262346261
 61663265366461613634
--- a/host_vars/nas.yml
+++ b/host_vars/nas.yml
@@ -1,31 +1,26 @@
 $ANSIBLE_VAULT;1.1;AES256
-62303937306432656235663330303934363930356632333966343535366438343261323139386135
+34633334666530383466643739336536363136366631613464383161656535656466616261663232
-6238653639363962373032656433623835313834366431380a653866666266313861643035653638
+6237633664336364643136643738643563653637613136360a363431663336626432616538623435
-62343639336336353130363537356635653661333463386637333331353162636438393462353161
+35373839383830393334663037353262653763353935623332383534376436613161313934316338
-3531386264373537340a653431633436353030303733343738616431663831316238613930633038
+3930623638356537630a616339653631666163376134343535313235363234356664366234663038
-62353466313762366561396366376363633132383438646362386239616362306563316461626438
+30376239633164643335336166663737346262313864626234663839333132386232346139666131
-37316232373664656165396237306333336433656464306664653566383761393636396537653331
+33633463353330343037306365666463653039643235333566663164313730663738663036623539
-30666631383234353064313061306164613364326638356636633636343133666638653261366339
+64636663613566656338636638383066353562306137376432346639316533303665613463333832
-37376632336133333736626130336165313735313033373138343662396265636563663234376138
+37313361623639653533343536616566613865353733656338633833666263323433306431633635
-32303137646437626435376463323539636264666663636533363733616637653934333936633139
+35393333346134333466323239666335613862663935353662373833343635393532633461653932
-36363162306237303931343133363238346231633732656535343963636262316363613434336363
+38303034613166336632376264313961336665303332306165636663306237653336316330376236
-36373339336332633332626534643762643264653365353062646663623837626463376363363161
+31313362616434663861333264306661653532316365306138333131643731346636646365353733
-31383865383166396663366230333334373037376333383938363738383862313736313261336234
+62366335643566636631633630336231353666363965623664376231363164313362366164333431
-65326434383165363861343131363139666238646562383837653233656365313932653163626564
+33323632366335646137666466316530613862373162376461623633333238616637373336333064
-38633761343338666662393333393165316563346636636135663133613062333836313561333963
+39303761353139656333663362303365316131646633303238623031386137656263646364373163
-39663733393738336336626438323365366566333331373433326539653565616230643936383737
+36336633323266393663336462626236353466353266656264343639303739313362313537396238
-38356434323433326432316265396661323964653039393164663533653731626162376134616261
+36303637386266386665663163633438633763386232313861653438303965393938656166656562
-39613666393764636331353764306531396339373032636531353165316437616464653237356536
+63373064396135346361633739663534666230356566366333636266643932316264343339303833
-66396661306235333732326136306439316362363063313837383663316361313731303634383331
+38313233643536356232363636306363333463323133656536366662323963643637343365643035
-30626239633235623164396666396533613734613962653030343334343832323664353431393636
+30393061343630633263303864336438653339323264396434623038363464366235626235326464
-38623838306239326537383765643036643830303066616232313935376635346237366434396162
+62623861333264616331396230383831346163303433653236663738396164643937643663363834
-66303932656265316463363432623037383462333638376430616562313238393762616263663138
+30316530623433313633653639363065343264353630613436393237363930326632343230343538
-63326239623666326636396361353764386363613364643935666339336565393830613435373231
+64356230316530353663663534343739376138653266323037336163386130623361613632393037
-64383265666661633664383031646530653539323037613837356638643335653235323135323361
+33376232666337316536613763623066653431303366656333646361613839323831623562613266
-37333731316234646135303566393439363338323264386635336432623862353661313962663965
+36323263616364653666343264303338373232343063313266653661323933656662386237323637
-35333631336233366364633537396234656430373832326334653030363635626439646532643032
+66666337356337343864613034633934656461653834306338313031366432353263
 30636666383865313737353962326665383936613434353830636561323439373537613538393836
 31353164613631386665353762343938383766323739363363633634363433623039376564346333
 64323939356238323462346562616335383437326233363838383930396238343261633863393232
 39346165656662626631376362623663343164376634363532376363623737613962323434313339
 3133306237396463313938383035643034616133336662636234
--- a/3
+++ b/3
@@ -1,5 +1,4 @@
 [ungrouped]
-jade ansible_host=172.16.0.25 ansible_user=alex
+jade ansible_host=fntz.net 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
--- a/main.yml
+++ b/main.yml
@@ -28,6 +28,9 @@
    - 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
@@ -58,32 +61,42 @@
    - name: Deploy Immich
      import_tasks: tasks/immich.yml
      tags: immich_deploy
    - name: Deploy Navidrome
      import_tasks: tasks/navidrome.yml
      tags: navidrome_deploy
    - name: Deploy Drop
      import_tasks: tasks/drop.yml
      tags: drop_deploy
    - name: Deploy Home Assistant
      import_tasks: tasks/home-assistant.yml
      tags: home-assistant_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 Pterodactyl
+    - name: Deploy Helium services
-      import_tasks: tasks/pterodactyl.yml
+      import_tasks: tasks/helium.yml
-      tags: pterodactyl_deploy
+      tags: helium_deploy
    - name: Deploy Termix
      import_tasks: tasks/termix.yml
      tags: termix_deploy
 - hosts: jackson
  roles:
    - role: traefik
      tags: traefik_deploy
      vars:
        server: "jackson"
    - role: fivem
      tags: fivem_deploy
@@ -103,21 +116,9 @@
    - name: Deploy Owncloud
      import_tasks: tasks/owncloud.yml
      tags: owncloud_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
  roles:
    - role: traefik
      tags: traefik_deploy
      vars:
        server: "nas"
  tasks:
    - name: Deploy Plex
      import_tasks: tasks/plex.yml
@@ -125,17 +126,3 @@
    - name: Deploy Frigate
      import_tasks: tasks/frigate.yml
      tags: frigate_deploy
    - name: Deploy Ersatz
      import_tasks: tasks/ersatztv.yml
      tags: ersatztv_deploy
    - name: Deploy Wings
      import_tasks: tasks/wings.yml
      tags: wings_deploy
 - hosts: ash-1
  roles:
    - role: traefik
      tags: traefik_deploy
      vars:
        server: "ash-1"
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,51 +0,0 @@
 ---
 - 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) }}"
--- a/roles/traefik/tasks/main.yml
+++ b/roles/traefik/tasks/main.yml
@@ -31,11 +31,6 @@
    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:
--- a/roles/traefik/templates/local-dynamic.yml.j2
+++ b/roles/traefik/templates/local-dynamic.yml.j2
@@ -1,9 +1,4 @@
 http:
  middlewares:
    tinyauth:
      forwardauth:
        address: http://tinyauth:3000/api/auth/traefik
  routers:
    plex:
      rule: "Host(`tv.fntz.net`)"
@@ -36,26 +31,12 @@ http:
    nvr:
      rule: "Host(`nvr.fntz.net`)"
      service: nvr
      middlewares: tinyauth
      entryPoints:
        - webSecure
      tls:
        certResolver: letsencrypt
    iptv:
      rule: "Host(`iptv.fntz.net`)"
      service: iptv
      entryPoints:
        - webSecure
      tls:
        certResolver: letsencrypt
    wings:
      rule: "Host(`wings.fntz.net`)"
      service: wings
      entryPoints:
        - webSecure
      tls:
        certResolver: letsencrypt
  services:
    plex:
      loadBalancer:
@@ -76,12 +57,4 @@ http:
    nvr:
      loadBalancer:
        servers:
-          - url: "http://172.16.0.29:5000/"
+          - url: "http://nas:5000/"
    iptv:
      loadBalancer:
        servers:
          - url: "http://nas:8409/"
    wings:
      loadBalancer:
        servers:
          - url: "http://jade:8090/"
--- a/roles/traefik/templates/remote-ash-1.yml.j2
+++ b/roles/traefik/templates/remote-ash-1.yml.j2
@@ -1,15 +0,0 @@
 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"
--- a/roles/traefik/templates/remote-dynamic.yml.j2
+++ b/roles/traefik/templates/remote-dynamic.yml.j2
@@ -1,15 +0,0 @@
 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"
--- a/scripts/deploy_containers.py
+++ b/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]
+  return [x for x in res.stdout.strip().split("\n") if "tasks/" in x or "roles/" in x or "host_vars" 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,84 +21,80 @@ def deploy(tag = None, host = None):
  command = construct_command(tag, host)
  if tag:
-    print(f"[MAIN] Deploying {tag}...")
+    print(f"Deploying {tag}...\n")
  else:
-    print(f"[MAIN] Deploying host {host}...")
+    print(f"Deploying {host}...\n")
  res = subprocess.run(command, shell=True)
  return res.returncode == 0
 def main():
-  dir_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), '../')
+  tasks_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "../tasks")
  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"
  ]
-  # special actions
+  # because these containers rely on gluetun for network, they need to be recreated when gluetun is recreated
  if "tasks/gluetun.yml" in diff:
-    print("[MAIN] Detected Gluetun in diff, recreating dependent containers..")
+    print("Gluetun detected in diff, queuing dependent containers for recreation")
    for container in vpn_containers:
      if container not in diff:
        diff.append(container)
-  # clean up the diff
+  # when variables update for a host, recreate containers
  new_diff = []
  for file in diff:
-    task_name = f"{file.split("/")[0]}/{file.split("/")[1]}"
+    if "host_vars" in file:
-
+      hostname = file.split("/")[1].split(".")[0]
-    # i'm not proud of this either
+      print(f"Secret file for '{hostname}' changed, will recreate containers on host after deployment")
-    if not os.path.exists(os.path.join(dir_path, file)):
+      host_vars_changed_for.append(hostname)
      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])
-  for task in new_diff:
+      if not os.path.exists(task_file_path):
-    deployment = deploy(tag=task.split("/")[1])
+        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)
-    if not deployment:
+          print(f"Cleaned up container {task_name}")
-      failed.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:
-      deployed.append(task)
+        task_name = file.split("/")[1]
-  for task in removed_containers:
+        if task_name not in deployed:
-    print(f"[MAIN] Attempting to remove containers related to '{task}'...")
+          task = deploy(tag=task_name)
    task_name = task.split("/")[1].split(".")[0]
-    containers = subprocess.Popen(f"docker container list | grep {task_name}_", shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+      if not task:
-    for line in containers.stdout:
+        failed.append(task_name)
-      docker_container_id = line.rstrip().decode('utf8').split(" ")[0]
+      else:
-      if docker_container_id and docker_container_id.strip() != "":
+        deployed.append(task_name)
-        print(f"[MAIN] Found Docker container {docker_container_id} related to {task}, removing..")
+
  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)
        # 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---------------------")
@@ -114,7 +110,7 @@ def main():
    print("---------------------\n")
    sys.exit(1)
  elif len(deployed) <= 0:
-    print("[MAIN] Successfully executed, no tasks required execution")
+    print("Successfully executed, no tasks required execution")
    sys.exit(0)
 if __name__ == "__main__":
--- a/scripts/extract_to_template.py
+++ b/scripts/extract_to_template.py
@@ -10,30 +10,12 @@ 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("#"):
        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()
    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"
--- a/scripts/run_updates.py
+++ b/scripts/run_updates.py
@@ -1,64 +0,0 @@
 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()
--- a/tasks/api.yml
+++ b/tasks/api.yml
@@ -1,15 +1,49 @@
 ---
- name: Deploy API Database
+- name: "Create file structure"
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: api_postgres
+  with_items:
-    network_name: api
+    - "{{ data_dir }}/api"
    directories:
    - "{{ data_dir }}/api/db"
-    image:
+    - "{{ data_dir }}/api/app"
-      name: postgres
+
-      tag: "17"
+- 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: api_postgres
    image: postgres:latest
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: api
    volumes:
@@ -19,34 +53,15 @@
      POSTGRES_PASSWORD: "{{ API_POSTGRES_PASSWORD }}"
      PGDATA: "/var/lib/postgresql/data/pgdata"
- name: Deploy API Redis
+- name: Deploy API Container
-  include_role:
+  docker_container:
    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
-    network_name: api
+    image: api:latest
    recreate: true
    restart_policy: unless-stopped
    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"
@@ -58,13 +73,6 @@
      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`)
--- a/tasks/codeserver.yml
+++ b/tasks/codeserver.yml
@@ -1,14 +1,23 @@
 ---
- name: Deploy Code Server
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: "codeserver"
+  with_items:
    directories:
    - "{{ data_dir }}/code-server"
-    image:
+
 - 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
    networks:
      - name: homelab
    volumes:
--- a/tasks/cup.yml
+++ b/tasks/cup.yml
@@ -1,10 +1,17 @@
 ---
- name: Deploy Cup
+- name: Pull latest Cup Docker Image
-  include_role:
+  docker_image:
-    name: docker
+    name: ghcr.io/sergi0g/cup
-  vars:
+    tag: latest
-    name: cup
+    source: pull
 - name: Create Cup Docker Container
  docker_container:
    name: Cup
    image: ghcr.io/sergi0g/cup
    command: serve
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: homelab
    volumes:
@@ -15,6 +22,4 @@
      traefik.http.routers.cup.entrypoints: webSecure
      traefik.http.routers.cup.tls.certresolver: letsencrypt
      traefik.http.services.cup.loadbalancer.server.port: "8000"
-    image:
+      traefik.http.routers.cup.middlewares: tinyauth
      name: ghcr.io/sergi0g/cup
      tag: latest
--- a/tasks/dashdot.yml
+++ b/tasks/dashdot.yml
@@ -1,12 +1,16 @@
 ---
- name: Deploy Dashdot
+- name: Pull latest Dashdot Docker Image
-  include_role:
+  docker_image:
    name: docker
  vars:
    name: dashdot
    image:
    name: mauricenino/dashdot
    tag: latest
    source: pull
 - name: Create Dashdot Docker Container
  docker_container:
    name: dashdot
    image: mauricenino/dashdot
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: homelab
    volumes:
--- a/tasks/dozzle.yml
+++ b/tasks/dozzle.yml
@@ -1,14 +1,18 @@
 ---
- name: Deploy Dozzle
+- name: Pull latest Dozzle Docker Image
-  include_role:
+  docker_image:
    name: docker
  vars:
    name: dozzle
    networks:
      - name: homelab
    image:
    name: amir20/dozzle
    tag: latest
    source: pull
 - name: Create Dozzle Docker Container
  docker_container:
    name: dozzle
    image: amir20/dozzle:latest
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: homelab
    volumes:
      - "/var/run/docker.sock:/var/run/docker.sock"
    env:
--- a/tasks/drop.yml
+++ b/tasks/drop.yml
@@ -1,16 +1,29 @@
 ---
- name: Deploy Drop Database
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: drop_postgres
+  with_items:
    directories:
    - "{{ data_dir }}/drop"
    - "{{ data_dir }}/drop/db"
-    image:
+    - "{{ data_dir }}/drop/app"
-      name: postgres
+
-      tag: 14-alpine
+- name: Create Drop Network
-    network_name: drop
+  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: drop_postgres
    image: postgres:14-alpine
    recreate: true
    restart_policy: unless-stopped
    networks:
      - name: drop
    healthcheck:
@@ -26,16 +39,12 @@
      POSTGRES_USER: "drop"
      POSTGRES_DB: "drop"
- name: Deploy Drop
+- name: Create Drop Container
-  include_role:
+  docker_container:
    name: docker
  vars:
    name: drop
-    directories:
+    image: ghcr.io/drop-oss/drop:latest
-      - "{{ data_dir }}/drop/app"
+    recreate: true
-    image:
+    restart_policy: unless-stopped
      name: ghcr.io/drop-oss/drop
      tag: latest
    networks:
      - name: homelab
      - name: drop
--- a/tasks/ersatztv.yml
+++ b/tasks/ersatztv.yml
@@ -1,22 +0,0 @@
 ---
 - name: Deploy Ersatz
  include_role:
    name: docker
  vars:
    name: ersatztv
    directories:
      - "{{ data_dir }}/ersatz"
    image:
      name: ghcr.io/ersatztv/ersatztv
      tag: latest
    devices:
      - /dev/dri/renderD128:/dev/dri/renderD128
    mounts:
      - type: tmpfs
        target: /transcode
        tmpfs_size: 5G
    volumes:
      - "{{ data_dir }}/ersatz:/config"
      - "{{ media_path }}:{{ media_path }}:ro"
    published_ports:
      - "8409:8409"
--- a/tasks/excalidraw.yml
+++ b/tasks/excalidraw.yml
@@ -1,12 +1,16 @@
 ---
- name: Deploy Excalidraw
+- name: Pull latest Excalidraw Docker Image
-  include_role:
+  docker_image:
    name: docker
  vars:
    name: excalidraw
    image:
    name: excalidraw/excalidraw
    tag: latest
    source: pull
 - name: Create Excalidraw Docker Container
  docker_container:
    name: excalidraw
    image: excalidraw/excalidraw
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: homelab
    labels:
--- a/tasks/frigate.yml
+++ b/tasks/frigate.yml
@@ -1,15 +1,24 @@
 ---
- name: Deploy Frigate
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: frigate
+  with_items:
    directories:
    - "{{ data_dir }}/frigate"
-    image:
+
 - 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: frigate
    image: ghcr.io/blakeblackshear/frigate:stable
    recreate: true
    privileged: true
    restart_policy: unless-stopped
    published_ports:
      - "5000:5000"
      - "8555:8555/tcp"
--- a/tasks/gitea.yml
+++ b/tasks/gitea.yml
@@ -1,14 +1,23 @@
 ---
- name: Deploy Gitea
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: gitea
+  with_items:
    directories:
    - "{{ data_dir }}/gitea"
-    image:
+
 - 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: gitea
    image: docker.gitea.com/gitea:latest
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: "{{ docker_network_name }}"
    volumes:
--- a/tasks/glance.yml
+++ b/tasks/glance.yml
@@ -1,16 +1,25 @@
 ---
- name: Deploy Glance
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: glance
+  with_items:
    image:
      name: glanceapp/glance
      tag: latest
    directories:
    - "{{ 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: glance
    image: glanceapp/glance
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: homelab
    env:
--- a/tasks/helium.yml
+++ b/tasks/helium.yml
@@ -0,0 +1,95 @@
 ---
 - 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"
--- a/tasks/home-assistant.yml
+++ b/tasks/home-assistant.yml
@@ -0,0 +1,31 @@
 ---
 - 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"
--- a/tasks/homebridge.yml
+++ b/tasks/homebridge.yml
@@ -1,15 +1,24 @@
 ---
- name: Deploy Homebridge
+- name: Create Folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: homebridge
+  with_items:
-    directories:
+    - "{{ data_dir }}/homebridge"
-      - "{{ data_dir }}/homebridge:/homebridge"
+
-    image:
+- name: Pull latest Homebridge Docker Image
  docker_image:
    name: homebridge/homebridge
    tag: latest
    source: pull
 - name: Create Homebridge Docker Container
  docker_container:
    name: homebridge
    image: homebridge/homebridge:latest
    restart_policy: unless-stopped
    network_mode: host
    recreate: true
    volumes:
      - "{{ data_dir }}/homebridge:/homebridge"
    labels:
--- a/tasks/immich.yml
+++ b/tasks/immich.yml
@@ -1,16 +1,28 @@
 ---
- name: Deploy Immich DB
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: immich_postgres
+  with_items:
    directories:
    - "{{ data_dir }}/immich"
    - "{{ data_dir }}/immich/model-cache"
    - "{{ data_dir }}/immich/db"
-    image:
+
-      name: ghcr.io/immich-app/postgres
+- name: Create Immich Redis Docker Container
-      tag: 14-vectorchord0.4.3-pgvectors0.2.0
+  docker_container:
    name: immich_redis
    image: docker.io/valkey/valkey:8-bookworm@sha256:ff21bc0f8194dc9c105b769aeabf9585fea6a8ed649c0781caeac5cb3c247884
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: immich
 - name: Create Immich DB Docker Container
  docker_container:
    name: immich_postgres
    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0
    restart_policy: unless-stopped
    recreate: true
    volumes:
      - "{{ data_dir }}/immich/db:/var/lib/postgresql/data"
    env:
@@ -20,27 +32,24 @@
      POSTGRES_INITDB_ARGS: "--data-checksums"
    networks:
      - name: immich
    network_name: immich
- name: Deploy Immich Redis
+# - name: Create Immich ML Docker Container
-  include_role:
+#   docker_container:
-    name: docker
+#     name: immich_machine_learning
-  vars:
+#     image: ghcr.io/immich-app/immich-machine-learning:release
-    name: immich_redis
+#     restart_policy: unless-stopped
-    image:
+#     recreate: true
-      name: docker.io/valkey/valkey
+#     volumes:
-      tag: 8-bookworm
+#       - "{{ data_dir }}/immich/model-cache:/cache"
-    networks:
+#     networks:
-      - name: immich
+#       - name: immich
- name: Deploy Immich Server
+- name: Create Immich Server Docker Container
-  include_role:
+  docker_container:
-    name: docker
+    name: immich_server
-  vars:
+    image: ghcr.io/immich-app/immich-server:release
-    name: immich
+    restart_policy: unless-stopped
-    image:
+    recreate: true
      name: ghcr.io/immich-app/immich-server
      tag: v2.1.0
    networks:
      - name: homelab
      - name: immich
@@ -52,7 +61,6 @@
      REDIS_HOSTNAME: "immich_redis"
      DB_PASSWORD: "{{ IMMICH_DB_PASSWORD }}"
      DB_USERNAME: "{{ IMMICH_DB_USERNAME }}"
      DB_DATABASE_NAME: "{{ IMMICH_DB_DATABASE_NAME }}"
    labels:
      traefik.enable: "true"
      traefik.http.routers.img.rule: Host(`img.fntz.net`)
--- a/tasks/jellyfin.yml
+++ b/tasks/jellyfin.yml
@@ -0,0 +1,39 @@
 ---
 - 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"
--- a/tasks/mariadb.yml
+++ b/tasks/mariadb.yml
@@ -1,39 +0,0 @@
 ---
 - 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"
--- a/tasks/nextcloud.yml
+++ b/tasks/nextcloud.yml
@@ -0,0 +1,54 @@
 ---
 - 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"
--- a/tasks/nfl-proxy.yml
+++ b/tasks/nfl-proxy.yml
@@ -0,0 +1,23 @@
 ---
 - 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"
--- a/tasks/ntfy.yml
+++ b/tasks/ntfy.yml
@@ -0,0 +1,36 @@
 ---
 - 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
--- a/tasks/nzbget.yml
+++ b/tasks/nzbget.yml
@@ -1,14 +1,23 @@
 ---
- name: Deploy NZBGet
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: nzbget
+  with_items:
    directories:
    - "{{ data_dir }}/nzbget"
-    image:
+
 - 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: nzbget
    image: lscr.io/linuxserver/nzbget:latest
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: homelab
    volumes:
--- a/tasks/obsidian.yml
+++ b/tasks/obsidian.yml
@@ -1,16 +1,25 @@
 ---
- name: Deploy Obsidian
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: obsidian
+  with_items:
    directories:
    - "{{ data_dir }}/obsidian"
    - "{{ data_dir }}/obsidian/data"
    - "{{ data_dir }}/obsidian/etc"
-    image:
+
 - 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
    networks:
      - name: homelab
    volumes:
--- a/tasks/owncloud.yml
+++ b/tasks/owncloud.yml
@@ -1,18 +1,30 @@
 ---
- name: Deploy Owncloud Database
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: owncloud_database
+  with_items:
    image:
      name: mariadb
      tag: latest
    directories:
    - "{{ data_dir }}/owncloud"
    - "{{ data_dir }}/owncloud/data"
    - "{{ data_dir }}/owncloud/db"
    - "{{ data_dir }}/owncloud/redis"
-    network_name: "owncloud"
+
 - 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
    networks:
      - name: owncloud
    volumes:
@@ -30,14 +42,12 @@
      timeout: 5s
      retries: 5
- name: Deploy Owncloud Redis
+- name: Create Owncloud Redis Container
-  include_role:
+  docker_container:
-    name: docker
+    name: oc_redis
-  vars:
+    image: redis:latest
-    name: owncloud_redis
+    restart_policy: unless-stopped
-    image:
+    recreate: true
      name: redis
      tag: latest
    networks:
      - name: owncloud
    command: "--databases 1"
@@ -49,14 +59,12 @@
    volumes:
      - "{{ data_dir }}/owncloud/redis:/data"
- name: Deploy Owncloud
+- name: Create Owncloud Docker Container
-  include_role:
+  docker_container:
    name: docker
  vars:
    name: owncloud
-    image:
+    image: owncloud/server:10.15
-      name: owncloud/server
+    restart_policy: unless-stopped
-      tag: 10.16
+    recreate: true
    networks:
      - name: "{{ docker_network_name }}"
      - name: owncloud
--- a/tasks/pelican.yml
+++ b/tasks/pelican.yml
@@ -1,32 +0,0 @@
 ---
 - 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"
--- a/tasks/pihole.yml
+++ b/tasks/pihole.yml
@@ -1,19 +1,28 @@
 ---
- name: Deploy PiHole
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: pihole
+  with_items:
    directories:
    - "{{ data_dir }}/pihole"
-    image:
+
 - name: Pull latest PiHole Docker Image
  docker_image:
    name: pihole/pihole
    tag: latest
-    published_ports:
+    source: pull
-      - "53:53/tcp"
+
-      - "53:53/udp"
+- name: Create PiHole Docker Container
  docker_container:
    name: pihole
    image: pihole/pihole:latest
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: homelab
    published_ports:
      - "{{ TRAEFIK_HOST_IP }}:53:53/tcp"
      - "{{ TRAEFIK_HOST_IP }}:53:53/udp"
    volumes:
      - "{{ data_dir }}/pihole:/etc/pihole"
    env:
--- a/tasks/pocketid.yml
+++ b/tasks/pocketid.yml
@@ -1,14 +1,23 @@
 ---
- name: Deploy PocketID
+- name: Create Folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: pocketid
+  with_items:
    directories:
    - "{{ data_dir }}/pocketid"
-    image:
+
 - 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: pocketid
    image: ghcr.io/pocket-id/pocket-id:v1
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: homelab
    volumes:
--- a/tasks/pterodactyl.yml
+++ b/tasks/pterodactyl.yml
@@ -1,89 +0,0 @@
 ---
 - name: Create folder structure
  file:
    path: "{{ item }}"
    state: directory
  with_items:
    - "{{ data_dir }}/pterodactyl"
    - "{{ data_dir }}/pterodactyl/var"
    - "{{ data_dir }}/pterodactyl/logs"
    - "{{ data_dir }}/pterodactyl/nginx"
    - "{{ data_dir }}/pterodactyl/db"
 - name: Create Pterodactyl Network
  docker_network:
    name: pterodactyl
 - name: Pull latest MariaDB Docker Image
  docker_image:
    name: mariadb
    tag: "10.5"
    source: pull
 - name: Pull latest Redis Docker image
  docker_image:
    name: redis
    tag: 7-alpine
    source: pull
 - name: Pull latest Pterodactyl Docker image
  docker_image:
    name: ghcr.io/pterodactyl/panel
    tag: latest
    source: pull
 - name: Create Redis Container
  docker_container:
    name: pterodactyl_redis
    image: redis:7-alpine
    recreate: true
    restart_policy: unless-stopped
    networks:
      - name: pterodactyl
 - name: Create Database Container
  docker_container:
    name: pterodactyl_db
    image: mariadb:10.5
    command: --default-authentication-plugin=mysql_native_password
    recreate: true
    restart_policy: unless-stopped
    volumes:
      - "{{ data_dir }}/pterodactyl/db:/var/lib/mysql"
    networks:
      - name: pterodactyl
    env:
      MYSQL_DATABASE: "panel"
      MYSQL_USER: "pterodactyl"
      MYSQL_ROOT_PASSWORD: "{{ PTERODACTYL_MYSQL_ROOT_PASSWORD }}"
      MYSQL_PASSWORD: "{{ PTERODACTYL_MYSQL_PASSWORD }}"
 - name: Create Pterodactyl Docker Container
  docker_container:
    name: pterodactyl
    image: ghcr.io/pterodactyl/panel:latest
    recreate: true
    restart_policy: unless-stopped
    networks:
      - name: pterodactyl
      - name: "{{ docker_network_name }}"
    volumes:
      - "{{ data_dir }}/pterodactyl/nginx:/etc/nginx/http.d"
      - "{{ data_dir }}/pterodactyl/logs:/app/storage/logs"
      - "{{ data_dir }}/pterodactyl/var:/app/var"
    env:
      APP_URL: "{{ PTERODACTYL_APP_URL }}"
      APP_ENVIRONMENT_ONLY: "false"
      APP_TIMEZONE: "{{ TZ }}"
      DB_PASSWORD: "{{ PTERODACTYL_MYSQL_PASSWORD }}"
      APP_ENV: "production"
      CACHE_DRIVER: "redis"
      SESSION_DRIVER: "redis"
      QUEUE_DRIVER: "redis"
      REDIS_HOST: "pterodactyl_redis"
      DB_HOST: "pterodactyl_db"
      TRUSTED_PROXIES: "*"
    labels:
      traefik.enable: "true"
      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"
--- a/tasks/servarr.yml
+++ b/tasks/servarr.yml
@@ -1,17 +1,36 @@
 ---
- name: Deploy Radarr
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: radarr
+  with_items:
    directories:
    - "{{ data_dir }}/servarr"
    - "{{ data_dir }}/servarr/sonarr_config"
    - "{{ data_dir }}/servarr/radarr_config"
    - "{{ data_dir }}/servarr/lidarr_config"
-    image:
+
 - 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: radarr
    image: lscr.io/linuxserver/radarr:latest
    restart_policy: unless-stopped
    recreate: true
    volumes:
      - "{{ data_dir }}/servarr/radarr_config:/config"
      - "{{ SERVARR_MEDIA_PATH }}:/media"
@@ -29,14 +48,12 @@
      traefik.http.routers.radarr.tls.certresolver: letsencrypt
      traefik.http.services.radarr.loadbalancer.server.port: "7878"
- name: Deploy Sonarr
+- name: Deploy Sonarr Container
-  include_role:
+  docker_container:
    name: docker
  vars:
    name: sonarr
-    image:
+    image: lscr.io/linuxserver/sonarr:latest
-      name: lscr.io/linuxserver/sonarr
+    restart_policy: unless-stopped
-      tag: latest
+    recreate: true
    volumes:
      - "{{ data_dir }}/servarr/sonarr_config:/config"
      - "{{ SERVARR_MEDIA_PATH }}:/data"
@@ -54,14 +71,12 @@
      traefik.http.routers.sonarr.tls.certresolver: letsencrypt
      traefik.http.services.sonarr.loadbalancer.server.port: "8989"
- name: Deploy Lidarr
+- name: Deploy Lidarr Container
-  include_role:
+  docker_container:
    name: docker
  vars:
    name: lidarr
-    image:
+    image: lscr.io/linuxserver/lidarr:latest
-      name: lscr.io/linuxserver/lidarr
+    restart_policy: unless-stopped
-      tag: latest
+    recreate: true
    env:
      PUID: "{{ PUID }}"
      PGID: "{{ PGID }}"
--- a/tasks/storage-api.yml
+++ b/tasks/storage-api.yml
@@ -1,20 +1,34 @@
 ---
- name: Deploy Storage API
+- name: "Create file structure"
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: storage-api
+  with_items:
    directories:
    - "{{ data_dir }}/storage-api"
    - "{{ data_dir }}/storage-api/app"
    - "{{ data_dir }}/storage-api/files"
-    image:
+
-      name: storage-api
+- name: "Clone latest Storage API"
      tag: latest
    build:
  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: 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
    networks:
      - name: "{{ docker_network_name }}"
    volumes:
--- a/tasks/tautulli.yml
+++ b/tasks/tautulli.yml
@@ -1,14 +1,23 @@
 ---
- name: Deploy Tautulli
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: tautulli
+  with_items:
    directories:
    - "{{ data_dir }}/tautulli"
-    image:
+
 - 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: tautulli
    image: ghcr.io/tautulli/tautulli
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: homelab
    volumes:
--- a/tasks/termix.yml
+++ b/tasks/termix.yml
@@ -1,23 +0,0 @@
 ---
 - 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"
--- a/tasks/tinyauth.yml
+++ b/tasks/tinyauth.yml
@@ -1,28 +1,29 @@
 ---
- name: Deploy Tinyauth
+- name: Pull latest Tinyauth Docker Image
-  include_role:
+  docker_image:
    name: docker
  vars:
    name: tinyauth
    image:
    name: ghcr.io/steveiliop56/tinyauth
-      tag: v4
+    tag: v3
    source: pull
 - name: Create Tinyauth Docker Container
  docker_container:
    name: tinyauth
    image: ghcr.io/steveiliop56/tinyauth:v3
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: homelab
    volumes:
      - "/var/run/docker.sock:/var/run/docker.sock"
    env:
      USERS: "{{ TINYAUTH_USERS }}"
      SECRET: "{{ TINYAUTH_SECRET }}"
      APP_URL: "{{ TINYAUTH_APP_URL }}"
-      PROVIDERS_POCKETID_CLIENT_ID: "{{ TINYAUTH_GENERIC_CLIENT_ID }}"
+      GENERIC_CLIENT_ID: "{{ TINYAUTH_GENERIC_CLIENT_ID }}"
-      PROVIDERS_POCKETID_CLIENT_SECRET: "{{ TINYAUTH_GENERIC_CLIENT_SECRET }}"
+      GENERIC_CLIENT_SECRET: "{{ TINYAUTH_GENERIC_CLIENT_SECRET }}"
-      PROVIDERS_POCKETID_AUTH_URL: "{{ TINYAUTH_GENERIC_AUTH_URL }}"
+      GENERIC_AUTH_URL: "{{ TINYAUTH_GENERIC_AUTH_URL }}"
-      PROVIDERS_POCKETID_TOKEN_URL: "{{ TINYAUTH_GENERIC_TOKEN_URL }}"
+      GENERIC_TOKEN_URL: "{{ TINYAUTH_GENERIC_TOKEN_URL }}"
-      PROVIDERS_POCKETID_USER_INFO_URL: "{{ TINYAUTH_GENERIC_USER_URL }}"
+      GENERIC_USER_URL: "{{ TINYAUTH_GENERIC_USER_URL }}"
-      PROVIDERS_POCKETID_SCOPES: "{{ TINYAUTH_GENERIC_SCOPES }}"
+      GENERIC_SCOPES: "{{ TINYAUTH_GENERIC_SCOPES }}"
-      PROVIDERS_POCKETID_NAME: "{{ TINYAUTH_GENERIC_NAME }}"
+      GENERIC_NAME: "{{ TINYAUTH_GENERIC_NAME }}"
      PROVIDERS_POCKETID_REDIRECT_URL: "{{ TINYAUTH_REDIRECT_URL }}"
      OAUTH_WHITELIST: "{{ TINYAUTH_OAUTH_WHITELIST }}"
      APP_TITLE: "{{ TINYAUTH_APP_TITLE }}"
      BACKGROUND_IMAGE: "{{ TINYAUTH_BACKGROUND_IMAGE }}"
--- a/tasks/uptime-kuma.yml
+++ b/tasks/uptime-kuma.yml
@@ -1,14 +1,23 @@
 ---
- name: Deploy Uptime Kuma
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: uptime-kuma
+  with_items:
    directories:
    - "{{ data_dir }}/uptime-kuma"
-    image:
+
 - 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: uptime-kuma
    image: louislam/uptime-kuma
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: homelab
    volumes:
--- a/tasks/vaultwarden.yml
+++ b/tasks/vaultwarden.yml
@@ -1,14 +1,23 @@
 ---
- name: Deploy Vaultwarden
+- name: Create folder structure
-  include_role:
+  file:
-    name: docker
+    path: "{{ item }}"
-  vars:
+    state: directory
-    name: vaultwarden
+  with_items:
    directories:
    - "{{ data_dir }}/vaultwarden"
-    image:
+
 - name: Pull latest Vaultwarden Docker Image
  docker_image:
    name: vaultwarden/server
    tag: latest
    source: pull
 - name: Create Vaultwarden Docker Container
  docker_container:
    name: vaultwarden
    image: vaultwarden/server:latest
    restart_policy: unless-stopped
    recreate: true
    networks:
      - name: homelab
    volumes:
--- a/tasks/wings.yml
+++ b/tasks/wings.yml
@@ -1,51 +0,0 @@
 ---
 - name: Create folder structure
  file:
    path: "{{ item }}"
    state: directory
  with_items:
    - "{{ data_dir }}/wings"
    - "{{ data_dir }}/wings/lib"
 - name: Pull latest Wings Docker image
  docker_image:
    name: ghcr.io/pterodactyl/wings
    tag: latest
    source: pull
 - name: Create Wings Network
  docker_network:
    name: wings
    driver: bridge
    ipam_config:
      - subnet: "172.55.0.0/16"
 - name: Create Wings Docker Container
  docker_container:
    name: pterodactyl_wings
    image: ghcr.io/pterodactyl/wings:latest
    recreate: true
    restart_policy: unless-stopped
    networks:
      - name: wings
      - 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"
      - "{{ WINGS_CONTAINER_DIR }}:{{ WINGS_CONTAINER_DIR }}"
      - "/var/log/pterodactyl:/var/log/pterodactyl"
      - "/tmp/pterodactyl:/tmp/pterodactyl"
    env:
      TZ: "{{ TZ }}"
      WINGS_UID: "988"
      WINGS_GID: "988"
      WINGS_USERNAME: pterodactyl
    published_ports:
      - "2022:2022"
    labels:
      traefik.enable: "true"
      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"