From 1ca17e65e94ace369b9e98f03662e5b8418da642 Mon Sep 17 00:00:00 2001
From: LinuxSquare <linuxscripting.sh@gmail.com>
Date: Fri, 5 Jan 2024 23:21:28 +0100
Subject: [PATCH] Move podman-apps to podman/apps, Add pms-cli

---
 apps/init.sls                                 |  1 -
 podman/apps/init.sls                          |  3 ++
 .../pms-cli/files/pms-cli_config.json.jinja   | 11 ++++++
 podman/apps/pms-cli/init.sls                  | 38 +++++++++++++++++++
 .../poddoc/files/poddoc_config.json.jinja     |  0
 {apps => podman/apps}/poddoc/init.sls         | 10 ++---
 6 files changed, 57 insertions(+), 6 deletions(-)
 create mode 100644 podman/apps/init.sls
 create mode 100644 podman/apps/pms-cli/files/pms-cli_config.json.jinja
 create mode 100644 podman/apps/pms-cli/init.sls
 rename {apps => podman/apps}/poddoc/files/poddoc_config.json.jinja (100%)
 rename {apps => podman/apps}/poddoc/init.sls (85%)

diff --git a/apps/init.sls b/apps/init.sls
index f86dc97..c89de02 100644
--- a/apps/init.sls
+++ b/apps/init.sls
@@ -1,4 +1,3 @@
 include:
   - .noveriablcgen
   - .generate-motd
-  - .poddoc
diff --git a/podman/apps/init.sls b/podman/apps/init.sls
new file mode 100644
index 0000000..9052a6c
--- /dev/null
+++ b/podman/apps/init.sls
@@ -0,0 +1,3 @@
+include:
+  - .poddoc
+  - .pms-cli
diff --git a/podman/apps/pms-cli/files/pms-cli_config.json.jinja b/podman/apps/pms-cli/files/pms-cli_config.json.jinja
new file mode 100644
index 0000000..59b7a47
--- /dev/null
+++ b/podman/apps/pms-cli/files/pms-cli_config.json.jinja
@@ -0,0 +1,11 @@
+{
+  "PODMAN_DIRECTORY": "{{ PODMAN_DIR }}",
+  "SERVERRUNNERS": {
+      "paper": "https://api.papermc.io/v2/projects/paper",
+      "folia": "https://api.papermc.io/v2/projects/folia"
+    },
+  "PROXYRUNNERS": {
+      "waterfall": "https://api.papermc.io/v2/projects/waterfall",
+      "velocity": "https://api.papermc.io/v2/projects/velocity"
+    }
+}
diff --git a/podman/apps/pms-cli/init.sls b/podman/apps/pms-cli/init.sls
new file mode 100644
index 0000000..a7d07e8
--- /dev/null
+++ b/podman/apps/pms-cli/init.sls
@@ -0,0 +1,38 @@
+include:
+  - system.base
+
+{% from "map.jinja" import noveria %}
+
+podman_apps_pms-cli_git:
+  git.latest:
+    - name: https://git.noveria.org/Tools/pms-cli.git
+    - target: {{ noveria.app_dir }}/pms-cli
+    - user: root
+    - force_reset: True
+    - require:
+      - system_base_apps_dir
+
+podman_apps_pms-cli_link:
+  file.symlink:
+    - name: {{ noveria.bin_dir }}/pms-cli
+    - target: {{ noveria.app_dir }}/pms-cli/pms-cli
+    - user: root
+    - group: root
+    - mode: '0755'
+    - require:
+      - system_base_bin_dir
+      - podman_apps_pms-cli_git
+
+podman_apps_pms-cli_config:
+  file.managed:
+    - name: {{ noveria.etc_dir }}/pms-cli/pms-cli.json
+    - source: salt://{{ tpldir }}/files/pms-cli_config.json.jinja
+    - template: jinja
+    - context:
+        PODMAN_DIR: "/opt/podman"
+    - mode: '0644'
+    - makedirs: True
+    - user: root
+    - group: root
+    - require:
+      - podman_apps_pms-cli_git
diff --git a/apps/poddoc/files/poddoc_config.json.jinja b/podman/apps/poddoc/files/poddoc_config.json.jinja
similarity index 100%
rename from apps/poddoc/files/poddoc_config.json.jinja
rename to podman/apps/poddoc/files/poddoc_config.json.jinja
diff --git a/apps/poddoc/init.sls b/podman/apps/poddoc/init.sls
similarity index 85%
rename from apps/poddoc/init.sls
rename to podman/apps/poddoc/init.sls
index 8116b56..ea25d8b 100644
--- a/apps/poddoc/init.sls
+++ b/podman/apps/poddoc/init.sls
@@ -3,7 +3,7 @@ include:
 
 {% from "map.jinja" import noveria %}
 
-apps_poddoc_git:
+podman_apps_poddoc_git:
   git.latest:
     - name: https://git.noveria.org/Tools/poddoc.git
     - target: {{ noveria.app_dir }}/poddoc
@@ -12,7 +12,7 @@ apps_poddoc_git:
     - require:
       - system_base_apps_dir
 
-apps_poddoc_link:
+podman_apps_poddoc_link:
   file.symlink:
     - name: {{ noveria.bin_dir }}/poddoc
     - target: {{ noveria.app_dir }}/poddoc/poddoc
@@ -21,9 +21,9 @@ apps_poddoc_link:
     - mode: '0755'
     - require:
       - system_base_bin_dir
-      - apps_poddoc_git
+      - podman_apps_poddoc_git
 
-apps_poddoc_config:
+podman_apps_poddoc_config:
   file.managed:
     - name: {{ noveria.etc_dir }}/poddoc/poddoc.json
     - source: salt://{{ tpldir }}/files/poddoc_config.json.jinja
@@ -36,4 +36,4 @@ apps_poddoc_config:
     - user: root
     - group: root
     - require:
-      - apps_poddoc_git
+      - podman_apps_poddoc_git