From bad29a931c8c8fba0026043e19ed961421a580be Mon Sep 17 00:00:00 2001
From: VC <veretcle+framagit@mateu.be>
Date: Thu, 27 Feb 2025 08:48:31 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A:=20move=20firefly3=20to=20web1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inventory/host_vars/web1.dmz.mateu.be.yml | 25 +++++++++++++++++------
 inventory/host_vars/web4.dmz.mateu.be.yml | 25 -----------------------
 inventory/production.yml                  |  7 +++----
 playbooks/webapps.yml                     |  5 -----
 4 files changed, 22 insertions(+), 40 deletions(-)
 delete mode 100644 inventory/host_vars/web4.dmz.mateu.be.yml

diff --git a/inventory/host_vars/web1.dmz.mateu.be.yml b/inventory/host_vars/web1.dmz.mateu.be.yml
index 5cd6dac..29703d2 100644
--- a/inventory/host_vars/web1.dmz.mateu.be.yml
+++ b/inventory/host_vars/web1.dmz.mateu.be.yml
@@ -15,14 +15,27 @@ web_hostname:
   - host: perso.nintendojo.fr
   - host: perso.libertus.eu
   - host: r.mateu.be
+  - host: ff.libertus.eu
+    type: firefly3
 
-mariadb_root_pass: !vault |
+firefly3_app_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
-          66643966366639636466333561363734623563323936613063623133323466393630393135636238
-          3663396465366630333630353563653166623461623935390a613362376538333239343532386231
-          61363465343165366430323033373730356636356462623332616364323265613934383664393461
-          6266393162633761340a613835393138353438656136643132353966646536316563646439336534
-          3064
+          65623434616434373137303830363336383931633131333563336434353761623238343539316364
+          3930303562396232333839653032633833363162393164390a643565366361616366376165663139
+          36386538363336653530323430353032333832383965363137383330363463373133366231616131
+          6662326237333931390a646262343262623362623264373237383531653932623838366431373733
+          32653064386338333161323762386336396232363830323233646266626431303765396261616262
+          38343764353565376264366330386463303239643836393733323031393434363033356630333465
+          396638363531336334303335363539623561
+firefly3_pg_role: "firefly"
+firefly3_pg_database: "fireflydb"
+firefly3_pg_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          36326366373734376134393732383634366561613164333038346430366566323435666231613535
+          3534336164663564613634666438353964653734316630610a303035333465646466623364383738
+          66373039373131383562626133333966336665386165313866313665366164386465366231666530
+          6337636434383666640a316462616564343662313661393562653339366664636466346638393762
+          6366
 
 roundcube_des_key: !vault |
           $ANSIBLE_VAULT;1.1;AES256
diff --git a/inventory/host_vars/web4.dmz.mateu.be.yml b/inventory/host_vars/web4.dmz.mateu.be.yml
deleted file mode 100644
index 9d35498..0000000
--- a/inventory/host_vars/web4.dmz.mateu.be.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-php_modules: ['opcache', 'pgsql', 'mbstring', 'gd', 'intl', 'xml', 'bcmath']
-
-web_hostname:
-  - host: ff.libertus.eu
-    type: firefly3
-
-firefly3_app_key: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          65623434616434373137303830363336383931633131333563336434353761623238343539316364
-          3930303562396232333839653032633833363162393164390a643565366361616366376165663139
-          36386538363336653530323430353032333832383965363137383330363463373133366231616131
-          6662326237333931390a646262343262623362623264373237383531653932623838366431373733
-          32653064386338333161323762386336396232363830323233646266626431303765396261616262
-          38343764353565376264366330386463303239643836393733323031393434363033356630333465
-          396638363531336334303335363539623561
-firefly3_pg_role: "firefly"
-firefly3_pg_database: "fireflydb"
-firefly3_pg_password: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          36326366373734376134393732383634366561613164333038346430366566323435666231613535
-          3534336164663564613634666438353964653734316630610a303035333465646466623364383738
-          66373039373131383562626133333966336665386165313866313665366164386465366231666530
-          6337636434383666640a316462616564343662313661393562653339366664636466346638393762
-          6366
diff --git a/inventory/production.yml b/inventory/production.yml
index 58e74e6..67b41f7 100644
--- a/inventory/production.yml
+++ b/inventory/production.yml
@@ -37,7 +37,7 @@ resticservers:
     pt1.dmz.mateu.be:
     voice1.dmz.mateu.be:
     vlt1.dmz.mateu.be:
-    web[1:4].dmz.mateu.be:
+    web[1:3].dmz.mateu.be:
 
 garageservers:
   children:
@@ -74,7 +74,7 @@ webservers:
     voice3.dmz.mateu.be:
     munin.dmz.mateu.be:
     vlt1.dmz.mateu.be:
-    web[1:4].dmz.mateu.be:
+    web[1:3].dmz.mateu.be:
 
 peertubeservers:
   hosts:
@@ -82,7 +82,7 @@ peertubeservers:
 
 phpservers:
   hosts:
-    web[1:4].dmz.mateu.be:
+    web[1:3].dmz.mateu.be:
 
 mariadbservers:
   hosts:
@@ -93,7 +93,6 @@ pgsqlservers:
     masto1.dmz.mateu.be:
     pt1.dmz.mateu.be:
     web1.dmz.mateu.be:
-    web4.dmz.mateu.be:
     git1.dmz.mateu.be:
 
 giteaservers:
diff --git a/playbooks/webapps.yml b/playbooks/webapps.yml
index e65eb20..15c7716 100644
--- a/playbooks/webapps.yml
+++ b/playbooks/webapps.yml
@@ -8,11 +8,6 @@
     - shaarli
     - freshrss
     - nextcloud
-
-- name: Install libertus webapplications
-  hosts: web4.dmz.mateu.be
-  diff: true
-  roles:
     - firefly3
 
 - name: Install dojo webapplications