From 3ef7d26ed2b1c7ee907eb4664d33a0514363dc22 Mon Sep 17 00:00:00 2001 From: Amo Date: Tue, 25 May 2021 03:05:19 +0530 Subject: [PATCH 1/7] [autopatch] Autopatch to migrate to new permission system --- scripts/restore | 2 -- scripts/upgrade | 16 ++++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/restore b/scripts/restore index 5f8af87..fce850a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -125,8 +125,6 @@ ynh_restore_file "/etc/fail2ban/jail.d/$app.conf" ynh_restore_file "/etc/fail2ban/filter.d/$app.conf" ynh_systemd_action --action=restart --service_name=fail2ban -# Make app public -ynh_app_setting_set $app skipped_uris "/" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 9d03e17..7d3f75f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,6 +48,16 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# Migrate legacy permissions to new system +#================================================= +if ynh_legacy_permissions_exists +then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -222,12 +232,6 @@ elif [ $database -eq 2 ]; then ynh_install_app_dependencies $pkg_dependencies fi -#================================================= -# SETUP SSOWAT -#================================================= -# As Osada is social network and have its own permission there is no need to keep Osada behind SSO -ynh_script_progression --message="Upgrading SSOwat configuration..." -ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" #================================================= # RELOAD NGINX From ec90c07d5e505e334a6c7bbc20c6bfbf8e770c69 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 6 Nov 2021 11:06:49 +0100 Subject: [PATCH 2/7] Cleaning up --- check_process | 8 ++++++-- scripts/upgrade | 21 +++++++-------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/check_process b/check_process index 1f698ae..aa00f58 100755 --- a/check_process +++ b/check_process @@ -11,10 +11,14 @@ setup_private=0 setup_public=1 upgrade=1 - #upgrade=1 from_commit= + upgrade=1 from_commit=81e4171acaa44520d0f527e6af445f4f33f2bca0 backup_restore=1 multi_instance=1 change_url=0 ;;; Options Email= -Notification= \ No newline at end of file +Notification=none +;;; Upgrade options + ; commit=81e4171acaa44520d0f527e6af445f4f33f2bca0 + name=Merge pull request #9 + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& diff --git a/scripts/upgrade b/scripts/upgrade index 83d0293..5144837 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,16 +40,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# Migrate legacy permissions to new system -#================================================= -if ynh_legacy_permissions_exists -then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -69,6 +59,13 @@ if [ -z "$db_name" ]; then ynh_app_setting_set --app=$app --key=db_name --value=$db_name fi +if ynh_legacy_permissions_exists +then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # CREATE DEDICATED USER #================================================= @@ -210,10 +207,6 @@ chmod 644 "/etc/cron.d/$app" ynh_script_progression --message="Upgrading dependencies..." if [ $database -eq 1 ]; then - #================================================= - # CHECK VERSION FOR SPECIFIC MYSQL UPDATE - #================================================= - # Check version and if this version was a fresh install push mysql query db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) From 565e91d20d227515dac55e6a27ab2f3c68e52c3d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 6 Nov 2021 22:13:14 +0100 Subject: [PATCH 3/7] Fix --- conf/app.src | 6 +-- conf/app_addons.src | 6 +-- conf/htconfig.sample.php | 103 +++++++++++++++++++++++++++++++++++++++ scripts/install | 70 ++++++++++---------------- 4 files changed, 133 insertions(+), 52 deletions(-) create mode 100644 conf/htconfig.sample.php diff --git a/conf/app.src b/conf/app.src index b8c853e..ca6dad1 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,4 @@ -SOURCE_URL=https://codeberg.org/zot/osada/archive/0c22781a2271170d0557881ac58a202148351c64.tar.gz -SOURCE_SUM=0cdd761aac0f1a382f6593868bd66d9919333fda4edeb1f2904d13a01febbeed +SOURCE_URL=https://codeberg.org/zot/osada/archive/88b1be4b340262a946b8e2548617cea3641b0a71.tar.gz +SOURCE_SUM=42f4c004e8d0dd78303aa0118b206be86b67ed9b6ba156c69b1e1e2d109de74b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR= -SOURCE_FILENAME= diff --git a/conf/app_addons.src b/conf/app_addons.src index ae6a797..89ce920 100755 --- a/conf/app_addons.src +++ b/conf/app_addons.src @@ -1,6 +1,4 @@ -SOURCE_URL=https://codeberg.org/zot/osada-addons/archive/0518974958ef5dbc81829a523753d4d4605bb0b4.tar.gz -SOURCE_SUM=103591cb295be106d163302a036f5942ba3802db853906defa2186ff599a0a5b +SOURCE_URL=https://codeberg.org/zot/osada-addons/archive/34788e835b87535404aee56d0aece885707565e9.tar.gz +SOURCE_SUM=2b0e268472c3c3c1ce14557fa86a7abd1d533554b541a056cd960291160f1328 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR= -SOURCE_FILENAME= diff --git a/conf/htconfig.sample.php b/conf/htconfig.sample.php new file mode 100644 index 0000000..69d2d4b --- /dev/null +++ b/conf/htconfig.sample.php @@ -0,0 +1,103 @@ +> $final_path/.htconfig.php - -ynh_store_file_checksum --file="$config" - #================================================= # NGINX CONFIGURATION #================================================= @@ -197,14 +187,6 @@ ynh_script_progression --message="Configuring NGINX web server..." # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring PHP-FPM..." - -# Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" - #================================================= # SET CRON JOB #================================================= From 6a676b5c374c519143ec501e5664ae0abe9ab3b3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 6 Nov 2021 23:30:21 +0100 Subject: [PATCH 4/7] Update install --- scripts/install | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index b06b4cd..a8d9196 100755 --- a/scripts/install +++ b/scripts/install @@ -144,6 +144,13 @@ ynh_script_progression --message="Configuring PHP-FPM..." ynh_add_fpm_config --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#================================================= +# CREATE A DATABASE VAR +#================================================= + +db_name=$(ynh_sanitize_dbid --db_name=$app) +db_user=$db_name + #================================================= # MODIFY A CONFIG FILE #================================================= @@ -160,8 +167,7 @@ chown $app:$app "$final_path/.htconfig.php" if [ $database -eq 1 ]; then ynh_script_progression --message="Creating a MySQL database..." - db_name=$(ynh_sanitize_dbid --db_name=$app) - db_user=$db_name + ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $final_path/install/schema_mysql.sql @@ -169,8 +175,7 @@ elif [ $database -eq 2 ]; then # Create postgresql database ynh_script_progression --message="Creating a postgresql database..." ynh_replace_string --match_string="db_type = 0;" --replace_string="db_type = 1;" --target_file="$final_path/.htconfig.php" - db_name=$(ynh_sanitize_dbid --db_name=$app) - db_user=$app + ynh_psql_test_if_first_run ynh_psql_setup_db --db_user=$db_user --db_name=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name From 5773ec4d6176edc670e6f80be19bc7fd653510d4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 6 Nov 2021 23:31:22 +0100 Subject: [PATCH 5/7] Update install --- scripts/install | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index a8d9196..a1232fd 100755 --- a/scripts/install +++ b/scripts/install @@ -150,6 +150,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) db_name=$(ynh_sanitize_dbid --db_name=$app) db_user=$db_name +ynh_app_setting_set --app=$app --key=db_name --value=$db_name #================================================= # MODIFY A CONFIG FILE @@ -167,15 +168,12 @@ chown $app:$app "$final_path/.htconfig.php" if [ $database -eq 1 ]; then ynh_script_progression --message="Creating a MySQL database..." - - ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $final_path/install/schema_mysql.sql elif [ $database -eq 2 ]; then # Create postgresql database ynh_script_progression --message="Creating a postgresql database..." ynh_replace_string --match_string="db_type = 0;" --replace_string="db_type = 1;" --target_file="$final_path/.htconfig.php" - ynh_psql_test_if_first_run ynh_psql_setup_db --db_user=$db_user --db_name=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name From af7016128b2ef8f58f526bc719dee4f22f83a1b7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 6 Nov 2021 23:33:48 +0100 Subject: [PATCH 6/7] Fix --- scripts/backup | 1 + scripts/install | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/backup b/scripts/backup index 8e6122b..bcb1aeb 100755 --- a/scripts/backup +++ b/scripts/backup @@ -20,6 +20,7 @@ ynh_abort_if_errors # LOAD SETTINGS #================================================= ynh_print_info --message="Loading installation settings..." + app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) diff --git a/scripts/install b/scripts/install index a1232fd..a175f5f 100755 --- a/scripts/install +++ b/scripts/install @@ -176,7 +176,6 @@ elif [ $database -eq 2 ]; then ynh_replace_string --match_string="db_type = 0;" --replace_string="db_type = 1;" --target_file="$final_path/.htconfig.php" ynh_psql_test_if_first_run ynh_psql_setup_db --db_user=$db_user --db_name=$db_name - ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_psql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $final_path/install/schema_postgres.sql else ynh_die --message="Some problem occured in creating the database, contact maintainer" From 26323e8913d1b9005619881ff54578c95374d71d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 7 Nov 2021 08:52:14 +0100 Subject: [PATCH 7/7] Update install --- scripts/install | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/install b/scripts/install index a175f5f..ea3ab9f 100755 --- a/scripts/install +++ b/scripts/install @@ -152,16 +152,6 @@ db_name=$(ynh_sanitize_dbid --db_name=$app) db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name -#================================================= -# MODIFY A CONFIG FILE -#================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 - -ynh_add_config --template="../conf/htconfig.sample.php" --destination="$final_path/.htconfig.php" - -chmod 600 "$final_path/.htconfig.php" -chown $app:$app "$final_path/.htconfig.php" - #================================================= # CREATE A DATABASE #================================================= @@ -181,6 +171,16 @@ else ynh_die --message="Some problem occured in creating the database, contact maintainer" fi +#================================================= +# MODIFY A CONFIG FILE +#================================================= +ynh_script_progression --message="Adding a configuration file..." --weight=1 + +ynh_add_config --template="../conf/htconfig.sample.php" --destination="$final_path/.htconfig.php" + +chmod 600 "$final_path/.htconfig.php" +chown $app:$app "$final_path/.htconfig.php" + #================================================= # NGINX CONFIGURATION #=================================================