From 466207902b0706794946d42944463a761b489484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix.piedallu@non.se.com>
Date: Wed, 31 Jan 2024 16:41:58 +0100
Subject: [PATCH] Move /var/lib/pgadmin to install_dir/data

---
 conf/config_local.py |  2 ++
 scripts/backup       |  2 --
 scripts/install      |  5 +----
 scripts/remove       |  3 ---
 scripts/restore      |  4 ----
 scripts/upgrade      | 12 ++++++++----
 6 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/conf/config_local.py b/conf/config_local.py
index 1397b47..40da066 100644
--- a/conf/config_local.py
+++ b/conf/config_local.py
@@ -1,3 +1,5 @@
 #!/usr/bin/env python3
 
 DESKTOP_USER = '__APP__@__DOMAIN__'
+
+DATA_DIR = '__INSTALL_DIR__/data'
diff --git a/scripts/backup b/scripts/backup
index 9f52868..1485371 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -36,8 +36,6 @@ ynh_backup --src_path="/etc/uwsgi/apps-available/$app.ini"
 # BACKUP VARIOUS FILES
 #=================================================
 
-ynh_backup --src_path="/var/lib/pgadmin"
-
 # Backup hashed password
 ynh_psql_execute_as_root --sql="SELECT rolpassword FROM pg_authid WHERE rolname='$app';" | head -3 | tail -1 > hashed_password.txt
 
diff --git a/scripts/install b/scripts/install
index 9d62b4e..6466781 100644
--- a/scripts/install
+++ b/scripts/install
@@ -31,13 +31,10 @@ ynh_script_progression --message="Setting up source files..."
 ynh_install_venv
 
 _install_pgadmin_pip
+mkdir -p "$install_dir/data"
 
 chown -R "$app:root" "$install_dir"
 
-mkdir -p /var/lib/pgadmin
-chmod -R 750 /var/lib/pgadmin
-chown -R "$app:root" /var/lib/pgadmin
-
 mkdir -p /var/log/pgadmin
 chown -R "$app:root" /var/log/pgadmin
 
diff --git a/scripts/remove b/scripts/remove
index d7dcf48..66283a2 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -34,9 +34,6 @@ ynh_remove_nginx_config
 #=================================================
 ynh_script_progression --message="Removing various files..."
 
-# Remove app data
-ynh_secure_remove --file="/var/lib/$app"
-
 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"
 
diff --git a/scripts/restore b/scripts/restore
index 71a119a..e3d7f99 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -50,10 +50,6 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 ynh_script_progression --message="Restoring various files..."
 
-ynh_restore_file --origin_path="/var/lib/pgadmin"
-chmod -R 750 /var/lib/pgadmin
-chown -R "$app:root" /var/lib/pgadmin
-
 ynh_restore_file --origin_path="/var/log/$app/"
 chmod -R 750 /var/log/pgadmin
 chown -R "$app:root" /var/log/pgadmin
diff --git a/scripts/upgrade b/scripts/upgrade
index 18f6fc4..f964603 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -32,6 +32,14 @@ usermod -d "$install_dir" "$app"
 # Clean old uwsgi config
 ynh_secure_remove /etc/uwsgi/apps-enabled/pgadmin.ini
 
+if [ -d "/var/lib/pgadmin" ]; then
+    if [ ! -d "$install_dir/data" ]; then
+        mv "/var/lib/pgadmin" "$install_dir/data"
+    fi
+    ynh_secure_remove "/var/lib/pgadmin"
+fi
+
+
 #=================================================
 # Postgresql superuser
 #=================================================
@@ -50,10 +58,6 @@ _install_pgadmin_pip
 
 chown -R "$app:root" "$install_dir"
 
-mkdir -p /var/lib/pgadmin
-chmod -R 750 /var/lib/pgadmin
-chown -R "$app:root" /var/lib/pgadmin
-
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================