From 982f3bbde2178906fd1b8244a2bc207281b8a4ea Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Tue, 12 Jun 2018 18:32:43 +0200
Subject: Testing 2.4 (#90)

* Ready to Yunohost 3 and Debian Stretch

* Remove mastodon cron tasks

* Fix Upgrade yarn not installed

* Fix Upgrade
---
 scripts/backup | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'scripts/backup')

diff --git a/scripts/backup b/scripts/backup
index 5e134ac..0846afe 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -65,16 +65,10 @@ ynh_backup "/etc/systemd/system/$app-web.service"
 ynh_backup "/etc/systemd/system/$app-sidekiq.service"
 ynh_backup "/etc/systemd/system/$app-streaming.service"
 
-#=================================================
-# BACKUP THE CRON FILE
-#=================================================
-
-# Copy the nginx conf files
-ynh_backup "/etc/cron.d/$app"
-
 #=================================================
 # BACKUP THE sources.list FILES
 #=================================================
-
-ynh_backup "/etc/apt/sources.list.d/backports.list" "apt_backports.list"
+if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+	ynh_backup "/etc/apt/sources.list.d/backports.list" "apt_backports.list"
+fi
 ynh_backup "/etc/apt/sources.list.d/yarn.list" "apt_yarn.list"
-- 
cgit v1.2.3-70-g09d2


From ae04282b9e5bb3a2dff513b1c37c0ff54fd95db4 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Tue, 12 Jun 2018 22:53:03 +0200
Subject: Change db_name on all scripts

to mastodon_production
---
 scripts/backup  | 6 +++++-
 scripts/install | 4 +++-
 scripts/remove  | 5 ++++-
 scripts/restore | 6 +++++-
 scripts/upgrade | 4 ++--
 5 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'scripts/backup')

diff --git a/scripts/backup b/scripts/backup
index 0846afe..f32dfdd 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -33,7 +33,11 @@ app=$YNH_APP_INSTANCE_NAME
 # Retrieve app settings
 domain=$(ynh_app_setting_get "$app" domain)
 final_path=$(ynh_app_setting_get "$app" final_path)
-db_name=$(ynh_sanitize_dbid "$app")
+db_name=$(ynh_app_setting_get "$app" db_name)
+if [ -z "$db_name" ]; then
+	db_name="${app}_production"
+	ynh_app_setting_set "$app" db_name "$db_name"
+fi
 
 #=================================================
 # STANDARD BACKUP STEPS
diff --git a/scripts/install b/scripts/install
index 9e8a873..90a8dfc 100644
--- a/scripts/install
+++ b/scripts/install
@@ -124,8 +124,10 @@ ynh_install_app_dependencies \
 ynh_psql_test_if_first_run
 
 db_user=$(ynh_sanitize_dbid "$app")
-db_name=$(ynh_sanitize_dbid "$app")
+db_name="${app}_production"
+db_name=$(ynh_sanitize_dbid "$db_name")
 db_pwd=$(ynh_string_random)
+ynh_app_setting_set $app db_name $db_name
 ynh_app_setting_set $app db_pwd $db_pwd
 ynh_psql_setup_db "$db_user" "$db_name" "$db_pwd"
 
diff --git a/scripts/remove b/scripts/remove
index e939908..470455e 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -22,8 +22,11 @@ app=$YNH_APP_INSTANCE_NAME
 # Retrieve app settings
 domain=$(ynh_app_setting_get "$app" domain)
 db_name=$(ynh_app_setting_get "$app" db_name)
+if [ -z "$db_name" ]; then
+	db_name="${app}_production"
+	ynh_app_setting_set "$app" db_name "$db_name"
+fi
 db_user=$(ynh_sanitize_dbid "$app")
-db_name=$(ynh_sanitize_dbid "$app")
 final_path=$(ynh_app_setting_get "$app" final_path)
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 0d32504..b41b9cd 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -124,7 +124,11 @@ ynh_install_app_dependencies \
 
 # Restore PostgreSQL database
 db_user=$(ynh_sanitize_dbid "$app")
-db_name=$(ynh_sanitize_dbid "$app")
+db_name=$(ynh_app_setting_get "$app" db_name)
+if [ -z "$db_name" ]; then
+	db_name="${app}_production"
+	ynh_app_setting_set "$app" db_name "$db_name"
+fi
 db_pwd=$(ynh_app_setting_get "$app" db_pwd)
 
 ynh_psql_test_if_first_run
diff --git a/scripts/upgrade b/scripts/upgrade
index 53e1828..d50b729 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers
 
 # See comments in install script
 app=$YNH_APP_INSTANCE_NAME
-db_name=$app
+db_name=$(ynh_app_setting_get "$app" db_name)
 
 # Retrieve app settings
 domain=$(ynh_app_setting_get "$app" domain)
@@ -31,7 +31,7 @@ path_url="/"
 
 # If db_name doesn't exist, create it
 if [ -z "$db_name" ]; then
-	db_name=$(ynh_sanitize_dbid "$app")
+	db_name="${app}_production"
 	ynh_app_setting_set "$app" db_name "$db_name"
 fi
 
-- 
cgit v1.2.3-70-g09d2