Use pkg_custom in jails

16 files changed, 24 insertions, 50 deletions

diff --git a/roles/jails/04_taulubot/defaults/main.yml b/roles/jails/04_taulubot/defaults/main.yml
index 3cac581..4f94671 100644
--- a/roles/jails/04_taulubot/defaults/main.yml
+++ b/roles/jails/04_taulubot/defaults/main.yml
@@ -16,5 +16,8 @@ pkg:
   - git
   - jpeg-turbo
 
+pkg_custom:
+  - taulubot
+
 services:
   - taulubot
diff --git a/roles/jails/04_taulubot/tasks/main.yml b/roles/jails/04_taulubot/tasks/main.yml
index 9116fc4..dca15df 100644
--- a/roles/jails/04_taulubot/tasks/main.yml
+++ b/roles/jails/04_taulubot/tasks/main.yml
@@ -2,11 +2,6 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install taulubot
-  shell: pkg install -y -r poudriere taulubot
-  register: _taulubot_install
-  changed_when: "'Installing' in _taulubot_install.stdout"
-
 - name: Deploy bot token file
   copy:
     content: "{{ taulubot_token }}"
diff --git a/roles/jails/06_hommabot/defaults/main.yml b/roles/jails/06_hommabot/defaults/main.yml
index 97d237f..782e097 100644
--- a/roles/jails/06_hommabot/defaults/main.yml
+++ b/roles/jails/06_hommabot/defaults/main.yml
@@ -8,5 +8,8 @@ pkg:
   - node
   - npm
 
+pkg_custom:
+  - hommabot
+
 services:
   - hommabot
diff --git a/roles/jails/06_hommabot/tasks/main.yml b/roles/jails/06_hommabot/tasks/main.yml
index b3c4481..f414140 100644
--- a/roles/jails/06_hommabot/tasks/main.yml
+++ b/roles/jails/06_hommabot/tasks/main.yml
@@ -2,11 +2,6 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install hommabot
-  shell: pkg install -y -r poudriere hommabot
-  register: _hommabot_install
-  changed_when: "'Installing' in _hommabot_install.stdout"
-
 - name: Deploy bot token file
   copy:
     content: "{{ hommabot_telegram_bot_token }}"
diff --git a/roles/jails/07_aggro/defaults/main.yml b/roles/jails/07_aggro/defaults/main.yml
index 77a65e9..2893a2d 100644
--- a/roles/jails/07_aggro/defaults/main.yml
+++ b/roles/jails/07_aggro/defaults/main.yml
@@ -15,5 +15,8 @@ pkg:
   - libxml2
   - libxslt
 
+pkg_custom:
+  - aggro
+
 services:
   - aggro
diff --git a/roles/jails/07_aggro/tasks/main.yml b/roles/jails/07_aggro/tasks/main.yml
index a7194e5..e3c11ce 100644
--- a/roles/jails/07_aggro/tasks/main.yml
+++ b/roles/jails/07_aggro/tasks/main.yml
@@ -2,11 +2,6 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install aggro
-  shell: pkg install -y -r poudriere aggro
-  register: _aggro_install
-  changed_when: "'Installing' in _aggro_install.stdout"
-
 - name: Deploy aggro env file
   template:
     src: "{{ jail_role_dir }}/templates/aggro.env.j2"
diff --git a/roles/jails/08_diddle/defaults/main.yml b/roles/jails/08_diddle/defaults/main.yml
index 1843ea9..391c0cc 100644
--- a/roles/jails/08_diddle/defaults/main.yml
+++ b/roles/jails/08_diddle/defaults/main.yml
@@ -14,5 +14,8 @@ pkg:
   - py312-sqlite3
   - git
 
+pkg_custom:
+  - diddle
+
 services:
   - diddle
diff --git a/roles/jails/08_diddle/tasks/main.yml b/roles/jails/08_diddle/tasks/main.yml
index 69a68d2..c0b3363 100644
--- a/roles/jails/08_diddle/tasks/main.yml
+++ b/roles/jails/08_diddle/tasks/main.yml
@@ -2,11 +2,6 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install diddle
-  shell: pkg install -y -r poudriere diddle
-  register: _diddle_install
-  changed_when: "'Installing' in _diddle_install.stdout"
-
 - name: Deploy diddle env file
   template:
     src: "{{ jail_role_dir }}/templates/diddle.env.j2"
diff --git a/roles/jails/11_spliit/defaults/main.yml b/roles/jails/11_spliit/defaults/main.yml
index 66ba0be..8c175c5 100644
--- a/roles/jails/11_spliit/defaults/main.yml
+++ b/roles/jails/11_spliit/defaults/main.yml
@@ -8,5 +8,8 @@ pkg:
   - py312-sqlite3
   - python
 
+pkg_custom:
+  - expense-tracker
+
 services:
   - expense_tracker
diff --git a/roles/jails/11_spliit/tasks/main.yml b/roles/jails/11_spliit/tasks/main.yml
index ef793b9..2ec7629 100644
--- a/roles/jails/11_spliit/tasks/main.yml
+++ b/roles/jails/11_spliit/tasks/main.yml
@@ -2,11 +2,6 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install expense-tracker
-  shell: pkg install -y -r poudriere expense-tracker
-  register: _spliit_install
-  changed_when: "'Installing' in _spliit_install.stdout"
-
 - name: Configure expense_tracker
   community.general.sysrc:
     name: "{{ item.name }}"
diff --git a/roles/jails/13_plex/defaults/main.yml b/roles/jails/13_plex/defaults/main.yml
index 710d6a3..49e5511 100644
--- a/roles/jails/13_plex/defaults/main.yml
+++ b/roles/jails/13_plex/defaults/main.yml
@@ -11,5 +11,8 @@ nullfs:
   - src: /usr/local/jails/volumes/storage/media
     dst: /mnt/media
 
+pkg_custom:
+  - plexmediaserver
+
 services:
   - plexmediaserver
diff --git a/roles/jails/13_plex/tasks/main.yml b/roles/jails/13_plex/tasks/main.yml
index 3effb64..2abdaff 100644
--- a/roles/jails/13_plex/tasks/main.yml
+++ b/roles/jails/13_plex/tasks/main.yml
@@ -1,12 +1,2 @@
 - import_role:
     name: jail
-    tasks_from: jail_setup
-
-- name: Install plexmediaserver
-  shell: pkg install -y -r poudriere plexmediaserver
-  register: _plex_install
-  changed_when: "'Installing' in _plex_install.stdout"
-
-- import_role:
-    name: jail
-    tasks_from: jail_launch
diff --git a/roles/jails/15_paste/defaults/main.yml b/roles/jails/15_paste/defaults/main.yml
index 3d13a3e..4bff37d 100644
--- a/roles/jails/15_paste/defaults/main.yml
+++ b/roles/jails/15_paste/defaults/main.yml
@@ -8,5 +8,8 @@ pkg:
   - rust
   - cargo-c
 
+pkg_custom:
+  - pastebin
+
 services:
   - pastebin
diff --git a/roles/jails/15_paste/tasks/main.yml b/roles/jails/15_paste/tasks/main.yml
index 7ba86c9..2abdaff 100644
--- a/roles/jails/15_paste/tasks/main.yml
+++ b/roles/jails/15_paste/tasks/main.yml
@@ -1,12 +1,2 @@
 - import_role:
     name: jail
-    tasks_from: jail_setup
-
-- name: Install pastebin
-  shell: pkg install -y -r poudriere pastebin
-  register: _paste_install
-  changed_when: "'Installing' in _paste_install.stdout"
-
-- import_role:
-    name: jail
-    tasks_from: jail_launch
diff --git a/roles/jails/19_leolalla_fi/defaults/main.yml b/roles/jails/19_leolalla_fi/defaults/main.yml
index 463fde8..1d536ec 100644
--- a/roles/jails/19_leolalla_fi/defaults/main.yml
+++ b/roles/jails/19_leolalla_fi/defaults/main.yml
@@ -10,5 +10,8 @@ pkg:
   - py312-pillow
   - python
 
+pkg_custom:
+  - gdrive-photo-gallery
+
 services:
   - gdrive_photo_gallery
diff --git a/roles/jails/19_leolalla_fi/tasks/main.yml b/roles/jails/19_leolalla_fi/tasks/main.yml
index 4a33140..021b2cf 100644
--- a/roles/jails/19_leolalla_fi/tasks/main.yml
+++ b/roles/jails/19_leolalla_fi/tasks/main.yml
@@ -2,11 +2,6 @@
     name: jail
     tasks_from: jail_setup
 
-- name: Install gdrive-photo-gallery
-  shell: pkg install -y -r poudriere gdrive-photo-gallery
-  register: _gallery_install
-  changed_when: "'Installing' in _gallery_install.stdout"
-
 - name: Deploy environment file
   template:
     src: "{{ jail_role_dir }}/templates/gdrive_photo_gallery.env.j2"