From 06c99463dd86e85a9a01bf3ec991b5b2b2eb66c3 Mon Sep 17 00:00:00 2001 From: Plumf Date: Tue, 5 May 2020 23:49:23 +0200 Subject: [PATCH 1/5] Fix Rules Groups and users --- scripts/install | 14 +++++++------- scripts/upgrade | 25 +++++-------------------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/scripts/install b/scripts/install index 0bc7f6b..e135183 100755 --- a/scripts/install +++ b/scripts/install @@ -157,7 +157,7 @@ chown -R $app: $final_path # Set the app as temporarily public for curl call ynh_script_progression --message="Configuring SSOwat..." --weight=42 -ynh_app_setting_set --app=$app --key=skipped_uris --value="/" +ynh_permission_update --permission main --remove all_users --add visitors # Reload SSOwat config yunohost app ssowatconf @@ -176,7 +176,7 @@ ynh_local_curl "/?PagePrincipale&installAction=install" "config[default_language # Remove the public access if [ $is_public -eq 0 ] then - ynh_app_setting_delete --app=$app --key=skipped_uris + ynh_permission_update --permission main --remove visitors --add all_users fi #================================================= @@ -185,7 +185,7 @@ fi # SECURE FILES AND DIRECTORIES #================================================= -# Set permissions to app files +# Set permissions to app files chown -R root: $final_path chown -R $app $final_path/{cache,files,themes,tools,wakka.config.php} @@ -195,11 +195,11 @@ chown -R $app $final_path/{cache,files,themes,tools,wakka.config.php} ynh_script_progression --message="Configuring SSOwat..." --weight=47 # Make app public if necessary -if [ $is_public -eq 1 ] -then +#if [ $is_public -eq 1 ] +#then - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" -fi +# ynh_permission_update --permission main --add visitors +#fi #================================================= # RELOAD NGINX diff --git a/scripts/upgrade b/scripts/upgrade index 2bfa8e4..b7ffecf 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -121,22 +121,6 @@ ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=2 # Create a dedicated php-fpm config ynh_add_fpm_config -#================================================= -# SPECIFIC UPGRADE -#================================================= -# ... -#================================================= - -#================================================= -# STORE THE CONFIG FILE CHECKSUM -#================================================= - -### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script. -### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it. -#####ynh_backup_if_checksum_is_different --file="$final_path/CONFIG_FILE" -# Recalculate and store the checksum of the file for the next upgrade. -#####ynh_store_file_checksum --file="$final_path/CONFIG_FILE" - #================================================= # GENERIC FINALIZATION #================================================= @@ -145,6 +129,7 @@ ynh_add_fpm_config # Set permissions on app files chown -R root: $final_path +chown -R $app $final_path/{cache,files,themes,tools,wakka.config.php} #================================================= # SETUP SSOWAT @@ -152,11 +137,11 @@ chown -R root: $final_path ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=29 # Make app public if necessary -if [ $is_public -eq 1 ] -then +#if [ $is_public -eq 1 ] +#then # unprotected_uris allows SSO credentials to be passed anyway - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" -fi + #ynh_permission_update --permission main --remove all_users --add visitors +#fi #================================================= # RELOAD NGINX From b0e6a88739ad87474c1832b3a98251e451dde96b Mon Sep 17 00:00:00 2001 From: Plumf Date: Wed, 6 May 2020 10:35:58 +0200 Subject: [PATCH 2/5] Fix check_process --- check_process | 2 +- scripts/change_url | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/check_process b/check_process index ffd1a7c..9e0b364 100644 --- a/check_process +++ b/check_process @@ -27,7 +27,7 @@ upgrade=0 from_commit=65c382d138596fcb32b4c97c39398815a1dcd4e8 backup_restore=1 multi_instance=1 - port_already_use=0 (66) + port_already_use=1 (66) change_url=0 actions=0 config_panel=0 diff --git a/scripts/change_url b/scripts/change_url index 489f138..b594211 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -91,11 +91,11 @@ fi # Change the domain for nginx if [ $change_domain -eq 1 ] then - # Delete file checksum for the old conf file location - #ynh_delete_file_checksum --file="$nginx_conf_path" + # Delete file checksum for the old conf file location + ynh_delete_file_checksum --file="$nginx_conf_path" mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location - #ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" + # Store file checksum for the new config file location + ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi #================================================= From 26979267eefb10853b125eea6c599bfd4df16949 Mon Sep 17 00:00:00 2001 From: Plumf Date: Wed, 6 May 2020 10:36:48 +0200 Subject: [PATCH 3/5] Fix Manifest --- manifest.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manifest.json b/manifest.json index 531557f..912f23b 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "yeswiki", "packaging_format": 1, "description": { - "en": "$app is free software born from the cross-fertilization of the discussions and know-how of developers and facilitators of cooperative projects.", - "fr": "$app est un logiciel libre né du croisement des discussions et savoir-faire de développeurs et animateurs de projets coopératifs." + "en": "YesWiki is a wiki that is quick and easy to use, with a nice design and a French-speaking support community.", + "fr": "YesWiki est wiki facile et rapide à prendre en main, avec un design agréable et une communauté d'entraide francophone." }, "version": "1.0~ynh1", "url": "https://yeswiki.net/", @@ -12,7 +12,7 @@ "maintainer": { "name": "Plumf", "email": "plumf@open-plug.eu", - "url": "http://plumf.eu" + "url": "https://plumf.eu" }, "requirements": { "yunohost": ">= 3.7.0" @@ -62,8 +62,8 @@ }, "default": true, "help": { - "en": "If $app is made public anyone will be able to view the wiki", - "fr": "Si $app est rendu publique toute personne pourra consulter le wiki" + "en": "If YesWiki is made public anyone will be able to view the wiki", + "fr": "Si YesWiki est rendu publique toute personne pourra consulter le wiki" } }, @@ -74,7 +74,7 @@ "en": "Choose the application language", "fr": "Choisissez la langue de l'application" }, - "choices": ["fr", "en"], + "choices": ["fr", "en", "ca", "es", "nl", "pt"], "default": "fr" }, { From 8b24c70b866fb49e7c533c1c695d926434b7d56c Mon Sep 17 00:00:00 2001 From: Plumf Date: Wed, 6 May 2020 10:56:40 +0200 Subject: [PATCH 4/5] add ~ynh version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 912f23b..70d83c1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "YesWiki is a wiki that is quick and easy to use, with a nice design and a French-speaking support community.", "fr": "YesWiki est wiki facile et rapide à prendre en main, avec un design agréable et une communauté d'entraide francophone." }, - "version": "1.0~ynh1", + "version": "1.0~ynh2", "url": "https://yeswiki.net/", "license": "free", "maintainer": { From 6e08353cb1e933c89e2a0d3ececd37d71fdc734e Mon Sep 17 00:00:00 2001 From: Plumf Date: Wed, 6 May 2020 13:40:31 +0200 Subject: [PATCH 5/5] Add change url --- check_process | 2 +- scripts/change_url | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/check_process b/check_process index 9e0b364..067a029 100644 --- a/check_process +++ b/check_process @@ -28,7 +28,7 @@ backup_restore=1 multi_instance=1 port_already_use=1 (66) - change_url=0 + change_url=1 actions=0 config_panel=0 ;;; Levels diff --git a/scripts/change_url b/scripts/change_url index b594211..3efbe2b 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -91,10 +91,10 @@ fi # Change the domain for nginx if [ $change_domain -eq 1 ] then - # Delete file checksum for the old conf file location + # Delete file checksum for the old conf file location ynh_delete_file_checksum --file="$nginx_conf_path" mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location + # Store file checksum for the new config file location ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi @@ -104,6 +104,8 @@ fi # ... #================================================= +ynh_replace_string --match_string="https://$old_domain${old_path%/}" --replace_string="https://$new_domain${new_path%/}" --target_file="$final_path/wakka.config.php" + #================================================= # GENERIC FINALISATION #================================================= @@ -117,4 +119,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --last +ynh_script_progression --message="Change of URL completed for $app" --last