From 94f627e9631f89fd626da4411adf803f631884cd Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Mon, 22 Jan 2024 03:24:19 +0100
Subject: [PATCH] moving the data folder to the standard ynh one

---
 conf/config.json |  8 +++----
 doc/ADMIN.md     |  1 +
 manifest.toml    | 58 ++++++++++++++++++++++++++----------------------
 scripts/upgrade  | 12 ++++++++++
 4 files changed, 49 insertions(+), 30 deletions(-)
 create mode 100644 doc/ADMIN.md

diff --git a/conf/config.json b/conf/config.json
index 1b77585..2acd288 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -11,12 +11,12 @@
   },
   "daemon": {
     "data": {
-      "cache": "/var/lib/__APP__/cache",
-      "servers": "/var/lib/__APP__/servers"
+      "cache": "__DATA_DIR__/cache",
+      "servers": "__DATA_DIR__/servers"
     }
   },
   "web": {
-  "host": "127.0.0.1:__PORT__"
+    "host": "127.0.0.1:__PORT__"
   },
   "panel": {
     "email": {
@@ -29,4 +29,4 @@
       "key": ""
     }
   }
-}
+}
\ No newline at end of file
diff --git a/doc/ADMIN.md b/doc/ADMIN.md
new file mode 100644
index 0000000..af60ee3
--- /dev/null
+++ b/doc/ADMIN.md
@@ -0,0 +1 @@
+Game server files are stored in `__DATA_DIR__`
diff --git a/manifest.toml b/manifest.toml
index 2179dc4..aa58c70 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -9,12 +9,14 @@ version = "2.6.9~ynh2"
 
 maintainers = [""]
 
+
 [upstream]
 license = "Apache-2.0"
 website = "https://www.pufferpanel.com/"
 admindoc = "https://docs.pufferpanel.com/en/latest/"
 code = "https://github.com/PufferPanel/PufferPanel"
 
+
 [integration]
 yunohost = ">= 11.2"
 architectures = "all"
@@ -25,41 +27,45 @@ disk = "50M"
 ram.build = "350M"
 ram.runtime = "50M"
 
+
 [install]
-    [install.domain]
-    type = "domain"
+[install.domain]
+type = "domain"
 
-    [install.init_main_permission]
-    type = "group"
-    default = "visitors"
+[install.init_main_permission]
+type = "group"
+default = "visitors"
 
-    [install.admin]
-    help.en = "Admin username minimum length is five characters."
-    help.fr = "La longueur minimale du nom d'utilisateur de l'administrateur est de cinq caractères."
-    type = "user"
+[install.admin]
+help.en = "Admin username minimum length is five characters."
+help.fr = "La longueur minimale du nom d'utilisateur de l'administrateur est de cinq caractères."
+type = "user"
+
+[install.password]
+type = "password"
 
-    [install.password]
-    type = "password"
 
 [resources]
-    [resources.system_user]
-    allow_email = true
+[resources.system_user]
+allow_email = true
 
-    [resources.install_dir]
+[resources.install_dir]
 
-    [resources.ports]
+[resources.data_dir]
+subdirs = ["binaries", "cache", "servers"]
 
-    [resources.permissions]
-    main.url = "/"
-    main.auth_header = false
+[resources.ports]
 
-    [resources.apt]
-    packages = "postgresql"
+[resources.permissions]
+main.url = "/"
+main.auth_header = false
 
-    extras.pufferpanel.repo = "deb https://packagecloud.io/pufferpanel/pufferpanel/debian/ buster main"
-    extras.pufferpanel.key = "https://packagecloud.io/pufferpanel/pufferpanel/gpgkey"
-    extras.pufferpanel.packages = "pufferpanel"
+[resources.apt]
+packages = "postgresql"
 
-    [resources.database]
-    type = "postgresql"
-   
\ No newline at end of file
+extras.pufferpanel.repo = "deb https://packagecloud.io/pufferpanel/pufferpanel/debian/ buster main"
+extras.pufferpanel.key = "https://packagecloud.io/pufferpanel/pufferpanel/gpgkey"
+extras.pufferpanel.packages = "pufferpanel"
+
+[resources.database]
+type = "postgresql"
diff --git a/scripts/upgrade b/scripts/upgrade
index 41f4066..398e3a5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -30,6 +30,18 @@ ynh_script_progression --message="Stopping a systemd service..."
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 
+#=================================================
+# ENSURE DOWNWARD COMPATIBILITY
+#=================================================
+ynh_script_progression --message="Ensuring downward compatibility..."
+
+# moving the data folder to the standard ynh one
+if [ -d "/var/lib/$app" ]; then
+    ynh_print_info --message="Moving the data folder from '/var/lib/$app' to '$data_dir'"
+    mv "/var/lib/$app" "$data_dir"
+    rm -r "/var/lib/$app"
+fi
+
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================