From 7f8213a32d4f2b41fccaeefa4358d66404193be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 19 Jul 2022 23:42:47 +0200 Subject: [PATCH 1/5] Add LFS support --- conf/app.ini | 2 ++ scripts/install | 2 ++ scripts/upgrade | 1 + 3 files changed, 5 insertions(+) diff --git a/conf/app.ini b/conf/app.ini index 542ab68..f7303e6 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -27,6 +27,8 @@ SSH_PORT = __SSH_PORT__ OFFLINE_MODE = false APP_DATA_PATH = __DATA_PATH__ LANDING_PAGE = explore +LFS_START_SERVER = true +LFS_JWT_SECRET = __LFS_KEY__ [mailer] ENABLED = true diff --git a/scripts/install b/scripts/install index fe5f017..349c281 100644 --- a/scripts/install +++ b/scripts/install @@ -43,6 +43,7 @@ fi ynh_script_progression --message="Defining db password and key..." db_password=$(ynh_string_random) key=$(ynh_string_random) +lfs_key=$(ynh_string_random) # Find available ports port=$(ynh_find_port --port 6000) @@ -52,6 +53,7 @@ ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app $app --key mysqlpwd --value $db_password ynh_app_setting_set --app $app --key adminusername --value $admin ynh_app_setting_set --app $app --key secret_key --value $key +ynh_app_setting_set --app $app --key lfs_key --value $lfs_key ynh_app_setting_set --app $app --key web_port --value $port #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 330bbcc..8162806 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,6 +21,7 @@ path_url=$(ynh_normalize_url_path --path_url $(ynh_app_setting_get --app $app -- db_password=$(ynh_app_setting_get --app $app --key mysqlpwd) admin=$(ynh_app_setting_get --app $app --key adminusername) key=$(ynh_app_setting_get --app $app --key secret_key) +lfs_key=$(ynh_app_setting_get --app $app --key lfs_key) port=$(ynh_app_setting_get --app $app --key web_port) upstream_version=$(ynh_app_setting_get --app $app --key upstream_version) From e26cff6a9a829451358c070303a884da1ea5d861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 19 Jul 2022 23:47:28 +0200 Subject: [PATCH 2/5] Update change_url --- scripts/change_url | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/change_url b/scripts/change_url index ed4dfc4..46a03f3 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -25,6 +25,7 @@ app=$YNH_APP_INSTANCE_NAME db_password=$(ynh_app_setting_get --app $app --key mysqlpwd) admin=$(ynh_app_setting_get --app $app --key adminusername) key=$(ynh_app_setting_get --app $app --key secret_key) +lfs_key=$(ynh_app_setting_get --app $app --key lfs_key) port=$(ynh_app_setting_get --app $app --key web_port) upstream_version=$(ynh_app_setting_get $app upstream_version) From 2f1f325a5bc8846c3a7267c0af5863ad7ba82ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Jul 2022 23:51:16 +0200 Subject: [PATCH 3/5] Update upgrade --- scripts/upgrade | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8162806..ef11498 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -11,11 +11,11 @@ source ./_common.sh # IMPORT GENERIC HELPERS source /usr/share/yunohost/helpers -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -# Retrieve app settings +#================================================= +# LOAD SETTINGS +#================================================= ynh_script_progression --message="Loading installation settings..." + domain=$(ynh_app_setting_get --app $app --key domain) path_url=$(ynh_normalize_url_path --path_url $(ynh_app_setting_get --app $app --key path)) db_password=$(ynh_app_setting_get --app $app --key mysqlpwd) @@ -28,12 +28,8 @@ upstream_version=$(ynh_app_setting_get --app $app --key upstream_version) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=10 +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." -# We stop the service before to set ynh_clean_setup -ynh_systemd_action --service_name=$app.service --action=stop - -# Backup the current version of the app if [ "0$(ynh_app_setting_get --app=$app --key=disable_backup_before_upgrade)" -ne 1 ] then ynh_backup_before_upgrade @@ -44,6 +40,28 @@ then } fi +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +#================================================= +# STOP SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Stopping a systemd service..." --weight=1 + +# We stop the service before to set ynh_clean_setup +ynh_systemd_action --service_name=$app --action="stop" + +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 + +# If lfs_key doesn't exist, create it +if [ -z "$lfs_key" ]; then + lfs_key=$(ynh_string_random) + ynh_app_setting_set --app=$app --key=lfs_key --value=$lfs_key +fi + #================================================= # MIGRATION FROM GOGS #================================================= From e7380aeebcc658908cf57046912fc2075297cb50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 22 Jul 2022 23:53:41 +0200 Subject: [PATCH 4/5] Update upgrade --- scripts/upgrade | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index ef11498..657fbe8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,14 +16,14 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Loading installation settings..." -domain=$(ynh_app_setting_get --app $app --key domain) +domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_normalize_url_path --path_url $(ynh_app_setting_get --app $app --key path)) -db_password=$(ynh_app_setting_get --app $app --key mysqlpwd) -admin=$(ynh_app_setting_get --app $app --key adminusername) -key=$(ynh_app_setting_get --app $app --key secret_key) -lfs_key=$(ynh_app_setting_get --app $app --key lfs_key) -port=$(ynh_app_setting_get --app $app --key web_port) -upstream_version=$(ynh_app_setting_get --app $app --key upstream_version) +db_password=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +admin=$(ynh_app_setting_get --app=$app --key=adminusername) +key=$(ynh_app_setting_get --app=$app --key=secret_key) +lfs_key=$(ynh_app_setting_get --app=$app --key=lfs_key) +port=$(ynh_app_setting_get --app=$app --key=web_port) +upstream_version=$(ynh_app_setting_get --app=$app --key=upstream_version) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP @@ -115,7 +115,6 @@ fi #================================================= # STANDARD UPGRADE STEPS #================================================= - ynh_script_progression --message="Configuring application..." # Clean template to fix issue : https://github.com/gogits/gogs/issues/4585 From d30547b10190276bb1e8f1fdb869f9f9ce72c276 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 24 Jul 2022 11:39:51 +0200 Subject: [PATCH 5/5] Update upgrade --- scripts/upgrade | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 657fbe8..5fc9d08 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,6 +25,14 @@ lfs_key=$(ynh_app_setting_get --app=$app --key=lfs_key) port=$(ynh_app_setting_get --app=$app --key=web_port) upstream_version=$(ynh_app_setting_get --app=$app --key=upstream_version) +#================================================= +# STOP SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Stopping a systemd service..." --weight=1 + +# We stop the service before to set ynh_clean_setup +ynh_systemd_action --service_name=$app --action="stop" + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -43,14 +51,6 @@ fi # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# STOP SYSTEMD SERVICE -#================================================= -ynh_script_progression --message="Stopping a systemd service..." --weight=1 - -# We stop the service before to set ynh_clean_setup -ynh_systemd_action --service_name=$app --action="stop" - #================================================= # ENSURE DOWNWARD COMPATIBILITY #=================================================