From 47d25cd91c5711b4151ca1e3e65a7ea3ce709628 Mon Sep 17 00:00:00 2001 From: Jacob Babor Date: Thu, 6 Jun 2024 22:24:33 -0500 Subject: [PATCH] Decom firefly --- inventories/production/group_vars/all.yml | 72 ------------------- .../group_vars/manufacturers_raspi.yml | 8 --- playbooks/local_dns.yml | 4 -- playbooks/prod_db.yml | 4 -- playbooks/prod_web.yml | 8 --- playbooks/tasks/web/firefly-iii.yml | 53 -------------- 6 files changed, 149 deletions(-) delete mode 100644 playbooks/tasks/web/firefly-iii.yml diff --git a/inventories/production/group_vars/all.yml b/inventories/production/group_vars/all.yml index 77e7243..0df5081 100644 --- a/inventories/production/group_vars/all.yml +++ b/inventories/production/group_vars/all.yml @@ -86,78 +86,6 @@ secret_ara_secret_key: !vault | 31346465336361316433383865613233373836643366346538633330616232386132636662643963 303938396531623561653335646231616239 -# For Firefly III -secret_firefly_app_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 36326365626537313464373434303833373261303835643035666431326335633634376364376233 - 3664323235383337313266316466363734643331313862630a636164616462623965353331373266 - 65653363353039653231316464653366303938656363333239313165313662636163323366303433 - 6432633664666339660a383938333531333536666361633762633831363132366563396237346330 - 32323266346363656336396264626231653331343862636632646466353236393438363037623466 - 6535373866616238323339326338316330383064336138646663 -secret_firefly_db_pass: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 31386133326239313637393462633930626634653562303361326634323633363037303862313361 - 3133356362333833653636623761386163646435633239370a613632646461303534353134346431 - 36613930393235653862376639626238326561633064333565383564626330636639633136643365 - 3565316233663262360a353631323762313130326361643532626334363263636539313233646362 - 37633961633162353936386366623136633436306235336235363566616563366563 -secret_firefly_access_token: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 65663238653330636264353332336237306565373135666462623937363564393366636231333662 - 6130333864613462323864333832343261393730383332340a383032353036626630366564396231 - 31396233383763653739363939343938663866666664623463616462376337383433646436303932 - 6265396236383437380a633432633233663562303062316164343463636565356437353633663964 - 32356462393036346433306366613333613236656535643662666237663335646461613434613738 - 33626634333235323561633134653362636461306439663834623136376134353733653039653635 - 61323863663566336265323831633532396337653432376362366533313064303635366539623033 - 38353063366135646566376338333536376335653766666336306664616664616633616562663339 - 32373138666262326666616234303938353631333663303834376161396232633635393133313235 - 65626337356536383430346538616366336134383731643536656235376563303063306263306562 - 62343631613837346138393936366135646636643463333637656137313931346661643261633437 - 35343261643339343861636235323331346432656435323564396535376539303764663031393164 - 63353932653866366634656631633133633333303564626466333265363138376638636534316166 - 36353839383264613634336237343463366662313432376161643532356566626162313362383339 - 64663739343365346264316363653939663663656231373262653439653765613764346336306465 - 65336561396363323637396432633362376537626361383765326363363635306537613533356436 - 62303439656661343337353933643963623730653732393236616533626564386339383965623334 - 38366332666131303230636431626237623561623333313236636438613564333631633237663961 - 61386435633832656639363962653138363863363861616162326430623133373330336236336232 - 34636134333230393064303234343962633166323462363939323732336263346662643066633436 - 37666234393733306364346161653138616564646534393266326632666435303531333866633332 - 38323638393066623937646237393738343433393637346338356164346439333632343033366233 - 66356163326164313735353738386637336365623331383337306538326663373666373639393238 - 33363537376633373336376633666136386530633961373430313666313463616637663161303436 - 32363265313739646164666534323165373562303766326338623534396434323162623533386337 - 33653262663935306365393438613137373162353063306431666439383161613937653062313366 - 35376630376530643464363364626561373137646165353464363937613235353635353833386661 - 38613862303236316632646532373635303865643531663665386536613233373863346331633138 - 33303561303637366138663834633634653861623462666634396237393663613465653032306237 - 36303566356163666363653535616632366533633365306265333962303134306132656131316464 - 39343864386139616230643238356335653736623064336163393832386332656130306465353566 - 37393364323263623838663464346439373038303766643033356137633238343439303234326330 - 65373037613435366232306530653734623036353333383935353937376136326237316361303538 - 62343033333339613935393061323039396332646537656263386230373664336661653237663365 - 66613961366531316631653334373563353032396462303265636464326261353531643132633764 - 63663133636264386364393435323736303831313162646336646166396361643834313865303536 - 65343734386630326432633930343462643065383535393033663132383933626337613732623536 - 64323964396133326432336538616130303631306330343361366339343736373062313861663431 - 63303031326561303566303164376531376535646665386263653630303832636661393561373233 - 37663039633934666332336132343262626132613764343138376165633637656237353565646536 - 34663965626333353034666134363966366531356635323739363331383761396638356265666537 - 38326235613035383235396166323663343139663439613834306462666364643530633038373763 - 31393431393464393530656435326531656665343362646634303734646436633364366339626139 - 35326636343031626631653230633636393561663736623931316637323435626336383430613365 - 32663237313161376261656261313737636465316664643531313639356533616265646264393636 - 32646465663035336537363236643461666663653838626531333130383261653637313762623735 - 35616362343331313035396232656361313032633630656530613833313064376335393365636439 - 39646334663436643466633561646364373265366230656662633364646463373435623963306464 - 61346164623739303335306138636531333938363566326336393462666132383838613837326664 - 34613334306336656564636636393934303963626533616365363634353232326235653735663666 - 33623938373530373166386162353635333135613837626437383435656439643064303961326664 - 65613139313836663038393164363264383738376564363730616635326233376533313161303564 - 66636639663531333166616635396630616237666232343464653139646364653339 - # For GVM secret_gvm_db_pass: !vault | $ANSIBLE_VAULT;1.1;AES256 diff --git a/inventories/production/group_vars/manufacturers_raspi.yml b/inventories/production/group_vars/manufacturers_raspi.yml index 6070910..a43461a 100644 --- a/inventories/production/group_vars/manufacturers_raspi.yml +++ b/inventories/production/group_vars/manufacturers_raspi.yml @@ -26,11 +26,3 @@ secret_keepalived_pass: !vault | 64613934346234316564613564363863356663653063333432316434353633333138643561316638 6563386233656364310a626363663234623161363537323035663663383333353138386239623934 65613231666661633262633439393462316337393532623263363630353133373236 -secret_firefly_db_pass: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 31656262333131613762373430323032663634316133346661333762323631323931633633623666 - 6665373939396238383965653635653039336635313361350a333133303239323262383938303436 - 64396137343737346362646330323662333731376332306663336638333161313835626261343031 - 3165643531336534650a393237623435663566346332313838616137343831643030333230356230 - 65386234316565666465376538333661623938326234323136303764376239326135 - diff --git a/playbooks/local_dns.yml b/playbooks/local_dns.yml index c7d88b4..5d6b93b 100755 --- a/playbooks/local_dns.yml +++ b/playbooks/local_dns.yml @@ -92,10 +92,6 @@ value: [ "{{ item.value }}" ] with_items: # Public - - record: firefly.desu.ltd - value: vm-general-1.ashburn.mgmt.desu.ltd - - record: firefly-importer.desu.ltd - value: vm-general-1.ashburn.mgmt.desu.ltd - record: git.desu.ltd value: vm-general-1.ashburn.mgmt.desu.ltd - record: matrix.desu.ltd diff --git a/playbooks/prod_db.yml b/playbooks/prod_db.yml index 9a654d9..b42bd17 100755 --- a/playbooks/prod_db.yml +++ b/playbooks/prod_db.yml @@ -27,8 +27,6 @@ postgresql_users: - name: ara-desultd password: "{{ secret_ara_db_pass }}" - - name: firefly-desultd - password: "{{ secret_firefly_db_pass }}" - name: gitea-desultd password: "{{ secret_gitea_db_pass }}" - name: gitlab-desultd @@ -50,8 +48,6 @@ postgresql_databases: - name: ara-desultd owner: ara-desultd - - name: firefly-desultd - owner: firefly-desultd - name: gitea-desultd owner: gitea-desultd - name: gitlab-desultd diff --git a/playbooks/prod_web.yml b/playbooks/prod_web.yml index 599fd2e..ac733c7 100755 --- a/playbooks/prod_web.yml +++ b/playbooks/prod_web.yml @@ -21,7 +21,6 @@ - web/9iron.yml - web/desultd.yml - web/element-web.yml - - web/firefly-iii.yml - web/gitea.yml - web/netbox.yml - web/nextcloud.yml @@ -234,13 +233,6 @@ contents: | default_type application/json; return 200 '{"m.homeserver":{"base_url":"https://matrix.desu.ltd"}}'; - - name: firefly.desu.ltd - proxy_pass: http://firefly:8080 - - name: firefly-importer.desu.ltd - directives: - - "allow {{ common_home_address }}/{{ common_home_address_mask }}" - - "deny all" - proxy_pass: http://firefly-importer:8080 - name: git.desu.ltd proxy_pass: http://gitea:3000 - name: matrix.desu.ltd diff --git a/playbooks/tasks/web/firefly-iii.yml b/playbooks/tasks/web/firefly-iii.yml deleted file mode 100644 index a8aaf7f..0000000 --- a/playbooks/tasks/web/firefly-iii.yml +++ /dev/null @@ -1,53 +0,0 @@ -# vim:ft=ansible: -# -# NOTE: This app is currently not fully-functional. It needs a cronjob -# implemented for things like recurring transactions and budgets. -# -# https://docs.firefly-iii.org/firefly-iii/advanced-installation/cron/ -# -- name: docker deploy firefly - docker_container: - name: firefly - image: fireflyiii/core:latest - env: - APP_KEY: "{{ secret_firefly_app_key }}" - APP_URL: "https://firefly.desu.ltd" - # We set TRUSTED_PROXIES to * here, which allows any app in the docker - # network to proxy this. I'm considering this a fine security concession - # since we can't guarantee the IP of the ingress container - TRUSTED_PROXIES: "*" - DB_HOST: "10.0.0.2" - DB_PORT: "5432" - DB_CONNECTION: pgsql - DB_DATABASE: "firefly-desultd" - DB_USERNAME: "firefly-desultd" - DB_PASSWORD: "{{ secret_firefly_db_pass }}" - networks: - - name: web - aliases: [ "firefly" ] - volumes: - - /data/firefly/export:/var/www/html/storage/export - - /data/firefly/logs:/var/www/html/storage/logs - - /data/firefly/upload:/var/www/html/storage/upload - tags: [ docker, firefly ] -- name: docker deploy firefly importer - docker_container: - name: firefly-importer - image: fireflyiii/data-importer:latest - # We need to use this workaround with custom DNS servers due to some host - # entries on the container host - dns_servers: - - "8.8.8.8" - - "8.8.4.4" - env: - # This TRUSTED_PROXIES line is still undocumented - # https://github.com/firefly-iii/firefly-iii/issues/3256 - # God fucking dammit - TRUSTED_PROXIES: "*" - FIREFLY_III_ACCESS_TOKEN: "{{ secret_firefly_access_token }}" - FIREFLY_III_URL: "http://firefly:8080" - VANITY_URL: "https://firefly.desu.ltd" - networks: - - name: web - aliases: [ "firefly-importer" ] - tags: [ docker, firefly ]