From 81bbb127a018557bbb5a0cf734587975b24d641f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 15:42:11 +0100 Subject: [PATCH 01/28] Update check_process --- check_process | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 5307796..801237e 100644 --- a/check_process +++ b/check_process @@ -1,9 +1,9 @@ ;; Test complet ; Manifest - domain="sub.domain.tld" (DOMAIN) - path="/" (PATH) + domain="sub.domain.tld" + path="/" backend="domain.tld" - is_public=1 (true|false) + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=0 From 1c9bbc58216f2d59e215348377a094e1403d5396 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 10 Jan 2023 14:42:15 +0000 Subject: [PATCH 02/28] Auto-update README --- README.md | 25 ++++++++++++++----------- README_fr.md | 31 +++++++++++++++++++------------ 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 9081193..a044f27 100755 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # SoapboxFE for YunoHost -[![Integration level](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![Working status](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) [![Install SoapboxFE with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=soapbox) *[Lire ce readme en français.](./README_fr.md)* @@ -20,11 +20,9 @@ SoapboxFE is an alternative frontend for Pleroma. **Shipped version:** 1.3.0~ynh1 - - ## Screenshots -![](./doc/screenshots/screenshot.jpg) +![Screenshot of SoapboxFE](./doc/screenshots/screenshot.jpg) ## Disclaimers / important information @@ -47,23 +45,28 @@ screen -d screen -r ``` +## :red_circle: Antifeatures + +- **Package not maintained**: This YunoHost package is not maintained and needs adoption. + ## Documentation and resources -* Official app website: https://soapbox.pub/ -* Official admin documentation: https://docs.soapbox.pub/ -* Upstream app code repository: https://gitlab.com/soapbox-pub/soapbox-fe -* YunoHost documentation for this app: https://yunohost.org/app_soapbox -* Report a bug: https://github.com/YunoHost-Apps/soapbox_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/soapbox_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/soapbox_ynh/tree/testing --debug or sudo yunohost app upgrade soapbox -u https://github.com/YunoHost-Apps/soapbox_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 17dc83e..b5f92a6 100755 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # SoapboxFE pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) [![Installer SoapboxFE avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=soapbox) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer SoapboxFE rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -16,11 +20,9 @@ SoapboxFE is an alternative frontend for Pleroma. **Version incluse :** 1.3.0~ynh1 - - ## Captures d'écran -![](./doc/screenshots/screenshot.jpg) +![Capture d'écran de SoapboxFE](./doc/screenshots/screenshot.jpg) ## Avertissements / informations importantes @@ -43,23 +45,28 @@ screen -d screen -r ``` +## :red_circle: Fonctions indésirables + +- **Package not maintained**: This YunoHost package is not maintained and needs adoption. + ## Documentations et ressources -* Site officiel de l'app : https://soapbox.pub/ -* Documentation officielle de l'admin : https://docs.soapbox.pub/ -* Dépôt de code officiel de l'app : https://gitlab.com/soapbox-pub/soapbox-fe -* Documentation YunoHost pour cette app : https://yunohost.org/app_soapbox -* Signaler un bug : https://github.com/YunoHost-Apps/soapbox_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/soapbox_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/soapbox_ynh/tree/testing --debug ou sudo yunohost app upgrade soapbox -u https://github.com/YunoHost-Apps/soapbox_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 00e9ce94891379305fe1a9656cd5155c218afac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 15:51:22 +0100 Subject: [PATCH 03/28] 3.0.0 --- conf/app.src | 4 ++-- conf/nginx.conf | 5 +++-- manifest.json | 2 +- scripts/install | 45 ++++++++++++++++++++------------------------- scripts/upgrade | 17 ++++++++++++++++- 5 files changed, 42 insertions(+), 31 deletions(-) diff --git a/conf/app.src b/conf/app.src index 3333aba..7f9ead3 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/1396593082/artifacts/download -SOURCE_SUM=7349194c32136d0876987eef1e8d235b87a17e58b68c769e3f18ac97be4564c3 +SOURCE_URL=https://gitlab.com/soapbox-pub/soapbox/-/archive/v3.0.0/soapbox-v3.0.0.zip +SOURCE_SUM=b53d80f9c6f1ff865aecbd2df8e4e007f3bdb4dad70c81c72294d83645631fc9 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 06a5032..1062391 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,5 @@ -location / { +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { # Path to source alias __FINALPATH__/static/; @@ -31,7 +32,7 @@ location / { proxy_pass $scheme://127.0.0.1$request_uri; # proxy_redirect $scheme://__DOMAIN__$request_uri $scheme://soapbox.g0v.moe$request_uri; - proxy_set_header Host example.com; + proxy_set_header Host __BACKEND__; proxy_set_header X-Real-IP $remote_addr; # doesn't work with some browsers diff --git a/manifest.json b/manifest.json index bf244e2..76d1560 100755 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "name": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": false, "services": [ diff --git a/scripts/install b/scripts/install index a1163b9..e035fff 100755 --- a/scripts/install +++ b/scripts/install @@ -20,11 +20,11 @@ ynh_abort_if_errors #================================================= domain=$YNH_APP_ARG_DOMAIN +path_url="/" backend=$YNH_APP_ARG_BACKEND -app=$YNH_APP_INSTANCE_NAME is_public=$YNH_APP_ARG_IS_PUBLIC -final_path=/var/www/$app -path_url=/ + +app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS @@ -44,17 +44,31 @@ ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=backend --value=$backend -ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=final_path --value=$final_path + +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." --weight=1 + +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # STANDARD MODIFICATIONS #================================================= # SETUP SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --time --weight=1 +ynh_script_progression --message="Setting up source files..." --weight=1 + +ynh_app_setting_set --app=$app --key=final_path --value=$final_path + +ynh_setup_source --dest_dir="$final_path" + +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" -ynh_setup_source --dest_dir="$final_path/static" #================================================= # NGINX CONFIGURATION #================================================= @@ -64,25 +78,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 ynh_add_nginx_config ynh_replace_string --match_string="example.com" --replace_string="$backend" --target_file="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." - -ynh_system_user_create --username=$app --home_dir="$final_path" - -#================================================= -# SPECIFIC SETUP -#================================================= -# MODIFY CONFIG FILE -#================================================= - -mkdir -p "$final_path" - -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 48b47fb..8034523 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -77,13 +77,28 @@ then ynh_script_progression --message="Upgrading source files..." # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path/static" --keep="$$final_path/static/instance/" + ynh_setup_source --dest_dir="$final_path" --keep="static/instance/" fi chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + +#================================================= +# RELOAD NGINX +#================================================= +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 + +ynh_systemd_action --service_name=nginx --action=reload + #================================================= # END OF SCRIPT #================================================= From 6bb9cbd62839dd3cd7998a61c2674e636edeece5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 10 Jan 2023 14:51:26 +0000 Subject: [PATCH 04/28] Auto-update README --- README.md | 25 ++++++++++++++----------- README_fr.md | 31 +++++++++++++++++++------------ 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 9081193..a044f27 100755 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # SoapboxFE for YunoHost -[![Integration level](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![Working status](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) [![Install SoapboxFE with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=soapbox) *[Lire ce readme en français.](./README_fr.md)* @@ -20,11 +20,9 @@ SoapboxFE is an alternative frontend for Pleroma. **Shipped version:** 1.3.0~ynh1 - - ## Screenshots -![](./doc/screenshots/screenshot.jpg) +![Screenshot of SoapboxFE](./doc/screenshots/screenshot.jpg) ## Disclaimers / important information @@ -47,23 +45,28 @@ screen -d screen -r ``` +## :red_circle: Antifeatures + +- **Package not maintained**: This YunoHost package is not maintained and needs adoption. + ## Documentation and resources -* Official app website: https://soapbox.pub/ -* Official admin documentation: https://docs.soapbox.pub/ -* Upstream app code repository: https://gitlab.com/soapbox-pub/soapbox-fe -* YunoHost documentation for this app: https://yunohost.org/app_soapbox -* Report a bug: https://github.com/YunoHost-Apps/soapbox_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/soapbox_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/soapbox_ynh/tree/testing --debug or sudo yunohost app upgrade soapbox -u https://github.com/YunoHost-Apps/soapbox_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 17dc83e..b5f92a6 100755 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # SoapboxFE pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) [![Installer SoapboxFE avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=soapbox) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer SoapboxFE rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -16,11 +20,9 @@ SoapboxFE is an alternative frontend for Pleroma. **Version incluse :** 1.3.0~ynh1 - - ## Captures d'écran -![](./doc/screenshots/screenshot.jpg) +![Capture d'écran de SoapboxFE](./doc/screenshots/screenshot.jpg) ## Avertissements / informations importantes @@ -43,23 +45,28 @@ screen -d screen -r ``` +## :red_circle: Fonctions indésirables + +- **Package not maintained**: This YunoHost package is not maintained and needs adoption. + ## Documentations et ressources -* Site officiel de l'app : https://soapbox.pub/ -* Documentation officielle de l'admin : https://docs.soapbox.pub/ -* Dépôt de code officiel de l'app : https://gitlab.com/soapbox-pub/soapbox-fe -* Documentation YunoHost pour cette app : https://yunohost.org/app_soapbox -* Signaler un bug : https://github.com/YunoHost-Apps/soapbox_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/soapbox_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/soapbox_ynh/tree/testing --debug ou sudo yunohost app upgrade soapbox -u https://github.com/YunoHost-Apps/soapbox_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 74cbe0b943a5168a415676a02068571aeb047b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 15:53:20 +0100 Subject: [PATCH 05/28] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 76d1560..9f89bf8 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Alternative frontend for pleroma", "fr": "Alternative frontend for pleroma" }, - "version": "1.3.0~ynh1", + "version": "3.0.0~ynh1", "url": "https://soapbox.pub/", "upstream": { "license": "AGPL-3.0", From ca67c53dc3c3db8823a40821dbc20b17207856e1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 10 Jan 2023 14:53:34 +0000 Subject: [PATCH 06/28] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a044f27..d995dd5 100755 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in SoapboxFE is an alternative frontend for Pleroma. -**Shipped version:** 1.3.0~ynh1 +**Shipped version:** 3.0.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index b5f92a6..3bcf37b 100755 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour SoapboxFE is an alternative frontend for Pleroma. -**Version incluse :** 1.3.0~ynh1 +**Version incluse :** 3.0.0~ynh1 ## Captures d'écran From 00bfb1c24ef707e5d70871e18c416f784841d83e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 15:54:19 +0100 Subject: [PATCH 07/28] Update install --- scripts/install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index e035fff..2071194 100755 --- a/scripts/install +++ b/scripts/install @@ -46,7 +46,6 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=backend --value=$backend ynh_app_setting_set --app=$app --key=final_path --value=$final_path - #================================================= # CREATE DEDICATED USER #================================================= @@ -76,7 +75,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config -ynh_replace_string --match_string="example.com" --replace_string="$backend" --target_file="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # GENERIC FINALIZATION @@ -97,6 +95,7 @@ fi ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload + #================================================= # END OF SCRIPT #================================================= From 03af552c86b79e2540cfe32633c99638ee2f8bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 15:55:30 +0100 Subject: [PATCH 08/28] Update manifest.json --- manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 9f89bf8..5ad519a 100755 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "soapbox", "packaging_format": 1, "description": { - "en": "Alternative frontend for pleroma", - "fr": "Alternative frontend for pleroma" + "en": "Alternative frontend for Pleroma", + "fr": "Interface alternative pour Pleroma" }, "version": "3.0.0~ynh1", "url": "https://soapbox.pub/", @@ -39,7 +39,7 @@ "name": "backend", "type": "domain", "ask": { - "en": "The root domain of pleroma instance installed", + "en": "The root domain of Pleroma instance installed", "fr": "The root domain of pleroma instance installed" } }, From 1a271cdc9b3c3f2ea60c97b628fef339a4ffa145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:03:01 +0100 Subject: [PATCH 09/28] Update app.src --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 7f9ead3..f657a95 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://gitlab.com/soapbox-pub/soapbox/-/archive/v3.0.0/soapbox-v3.0.0.zip -SOURCE_SUM=b53d80f9c6f1ff865aecbd2df8e4e007f3bdb4dad70c81c72294d83645631fc9 +SOURCE_URL=https://gitlab.com/soapbox-pub/soapbox/-/jobs/artifacts/v3.0.0/download?job=build-production +SOURCE_SUM=ea62f2f9c27b391d156b1fe7c4e4384ac1b45c7f01af6b0e5337b9a8f18d8ac2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_EXTRACT=true From ed998e98c6af18d04c444cad28a3ab2bdf18b120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:07:48 +0100 Subject: [PATCH 10/28] Update app.src --- conf/app.src | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/app.src b/conf/app.src index f657a95..b971326 100755 --- a/conf/app.src +++ b/conf/app.src @@ -2,4 +2,5 @@ SOURCE_URL=https://gitlab.com/soapbox-pub/soapbox/-/jobs/artifacts/v3.0.0/downlo SOURCE_SUM=ea62f2f9c27b391d156b1fe7c4e4384ac1b45c7f01af6b0e5337b9a8f18d8ac2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip +SOURCE_IN_SUBDIR=false SOURCE_EXTRACT=true From b5ee699f2779f64a60c18097048de35dc775b8b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:10:38 +0100 Subject: [PATCH 11/28] Fix --- conf/app.src | 2 +- conf/nginx.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index b971326..2b0462a 100755 --- a/conf/app.src +++ b/conf/app.src @@ -2,5 +2,5 @@ SOURCE_URL=https://gitlab.com/soapbox-pub/soapbox/-/jobs/artifacts/v3.0.0/downlo SOURCE_SUM=ea62f2f9c27b391d156b1fe7c4e4384ac1b45c7f01af6b0e5337b9a8f18d8ac2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip -SOURCE_IN_SUBDIR=false +SOURCE_IN_SUBDIR=true SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 1062391..e430cbd 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/static/; + alias __FINALPATH__/; # Default indexes and catch-all index index.html; From 43f74415541c350a5897ec1d397550b64a887134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:15:44 +0100 Subject: [PATCH 12/28] Fix --- doc/DISCLAIMER.md | 2 +- manifest.json | 4 ++-- scripts/install | 6 +++--- scripts/remove | 4 ++-- scripts/restore | 6 +++--- scripts/upgrade | 3 ++- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 17ee9e8..497d1ab 100755 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,6 +1,6 @@ ### Important points to read before installing -- [Pleroma (Yunohost ver.)](https://github.com/YunoHost-Apps/pleroma_ynh) must be installed locally before you install SoapboxFE +- [Pleroma (YunoHost ver.)](https://github.com/YunoHost-Apps/pleroma_ynh) must be installed locally before you install SoapboxFE - SoapboxFE must be installed under a Pleroma domain (i.e soapboxfe.your-pleroma-instance-domain.net) - AdminFE under SoapboxFE returns 404 diff --git a/manifest.json b/manifest.json index 5ad519a..0eda829 100755 --- a/manifest.json +++ b/manifest.json @@ -32,7 +32,7 @@ "type": "domain", "ask": { "en": "Subdomain for SoapboxFE installation, i.e: soapbox.your-pleroma.instance.com", - "fr": "Subdomain for SoapboxFE installation, i.e: soapbox.your-pleroma.instance.com" + "fr": "Sous-domaine pour l'installation de SoapboxFE, par exemple : soapbox.your-pleroma.instance.com" } }, { @@ -40,7 +40,7 @@ "type": "domain", "ask": { "en": "The root domain of Pleroma instance installed", - "fr": "The root domain of pleroma instance installed" + "fr": "Le domaine racine de l'instance pleroma installée" } }, { diff --git a/scripts/install b/scripts/install index 2071194..adcc4af 100755 --- a/scripts/install +++ b/scripts/install @@ -40,7 +40,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." +ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=backend --value=$backend @@ -81,7 +81,7 @@ ynh_add_nginx_config #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring permissions..." +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary if [ $is_public -eq 1 ] @@ -92,7 +92,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." +ynh_script_progression --message="Reloading NGINX web server..." --weight=2 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 077f2fe..52ef7ab 100755 --- a/scripts/remove +++ b/scripts/remove @@ -24,7 +24,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." +ynh_script_progression --message="Removing app main directory..." --weight=2 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -42,7 +42,7 @@ ynh_remove_nginx_config #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user..." +ynh_script_progression --message="Removing the dedicated system user..." --weight=2 # Delete a system user ynh_system_user_delete --username=$app diff --git a/scripts/restore b/scripts/restore index c8cfc6b..aa1a91c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -31,8 +31,6 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -41,6 +39,7 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -68,7 +67,8 @@ chown -R $app:www-data "$final_path" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading NGINX web server" +ynh_script_progression --message="Reloading NGINX web server" --weight=2 + ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 8034523..1d339db 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,12 +72,13 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= + if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="static/instance/" + ynh_setup_source --dest_dir="$final_path" --keep="instance" fi chmod 750 "$final_path" From d601088913d52754b84201fc98807c3f15dedf9f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 10 Jan 2023 15:15:49 +0000 Subject: [PATCH 13/28] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d995dd5..bcf9203 100755 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ SoapboxFE is an alternative frontend for Pleroma. ### Important points to read before installing -- [Pleroma (Yunohost ver.)](https://github.com/YunoHost-Apps/pleroma_ynh) must be installed locally before you install SoapboxFE +- [Pleroma (YunoHost ver.)](https://github.com/YunoHost-Apps/pleroma_ynh) must be installed locally before you install SoapboxFE - SoapboxFE must be installed under a Pleroma domain (i.e soapboxfe.your-pleroma-instance-domain.net) - AdminFE under SoapboxFE returns 404 diff --git a/README_fr.md b/README_fr.md index 3bcf37b..08e69f6 100755 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ SoapboxFE is an alternative frontend for Pleroma. ### Important points to read before installing -- [Pleroma (Yunohost ver.)](https://github.com/YunoHost-Apps/pleroma_ynh) must be installed locally before you install SoapboxFE +- [Pleroma (YunoHost ver.)](https://github.com/YunoHost-Apps/pleroma_ynh) must be installed locally before you install SoapboxFE - SoapboxFE must be installed under a Pleroma domain (i.e soapboxfe.your-pleroma-instance-domain.net) - AdminFE under SoapboxFE returns 404 From 5b894ac17dc53ce2b53b8be642ebeb5d94e522db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 16:16:31 +0100 Subject: [PATCH 14/28] Update DESCRIPTION.md --- doc/DESCRIPTION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 086f46b..936f1ee 100755 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -SoapboxFE is an alternative frontend for Pleroma. +Soapbox is customizable open-source software that puts the power of social media in the hands of the people. Feature-rich and hyper-focused on providing a user experience to rival Big Tech, Soapbox is already home to some of the biggest alternative social platforms. From 6697fdbe810db9128794c88d9e1304cc577724d8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 10 Jan 2023 15:16:41 +0000 Subject: [PATCH 15/28] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bcf9203..6cee18d 100755 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -SoapboxFE is an alternative frontend for Pleroma. +Soapbox is customizable open-source software that puts the power of social media in the hands of the people. Feature-rich and hyper-focused on providing a user experience to rival Big Tech, Soapbox is already home to some of the biggest alternative social platforms. **Shipped version:** 3.0.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 08e69f6..fd11c7e 100755 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -SoapboxFE is an alternative frontend for Pleroma. +Soapbox is customizable open-source software that puts the power of social media in the hands of the people. Feature-rich and hyper-focused on providing a user experience to rival Big Tech, Soapbox is already home to some of the biggest alternative social platforms. **Version incluse :** 3.0.0~ynh1 From 3d18bc996d38ea8f939f7e8781e89b663afe6d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 17:23:07 +0100 Subject: [PATCH 16/28] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 0eda829..7778232 100755 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name": "SoapboxFE", + "name": "Soapbox", "id": "soapbox", "packaging_format": 1, "description": { From c944a065482f6746e59b3f50c9cfdd7502fc6f5d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 10 Jan 2023 16:23:11 +0000 Subject: [PATCH 17/28] Auto-update README --- README.md | 8 ++++---- README_fr.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6cee18d..6c8cd69 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app It shall NOT be edited by hand. --> -# SoapboxFE for YunoHost +# Soapbox for YunoHost [![Integration level](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![Working status](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) -[![Install SoapboxFE with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=soapbox) +[![Install Soapbox with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=soapbox) *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install SoapboxFE quickly and simply on a YunoHost server. +> *This package allows you to install Soapbox quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview @@ -22,7 +22,7 @@ Soapbox is customizable open-source software that puts the power of social media ## Screenshots -![Screenshot of SoapboxFE](./doc/screenshots/screenshot.jpg) +![Screenshot of Soapbox](./doc/screenshots/screenshot.jpg) ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index fd11c7e..464e483 100644 --- a/README_fr.md +++ b/README_fr.md @@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app It shall NOT be edited by hand. --> -# SoapboxFE pour YunoHost +# Soapbox pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) -[![Installer SoapboxFE avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=soapbox) +[![Installer Soapbox avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=soapbox) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer SoapboxFE rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer Soapbox rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* ## Vue d'ensemble @@ -22,7 +22,7 @@ Soapbox is customizable open-source software that puts the power of social media ## Captures d'écran -![Capture d'écran de SoapboxFE](./doc/screenshots/screenshot.jpg) +![Capture d'écran de Soapbox](./doc/screenshots/screenshot.jpg) ## Avertissements / informations importantes From 8b6b84109a504a92631cb013ecc0ff3b7bdc3402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 21:19:58 +0100 Subject: [PATCH 18/28] Update manifest.json --- manifest.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index 7778232..ec0a12e 100755 --- a/manifest.json +++ b/manifest.json @@ -29,11 +29,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "ask": { - "en": "Subdomain for SoapboxFE installation, i.e: soapbox.your-pleroma.instance.com", - "fr": "Sous-domaine pour l'installation de SoapboxFE, par exemple : soapbox.your-pleroma.instance.com" - } + "type": "domain" }, { "name": "backend", From ddff8720b74d4b5f30839e2212736525c324c73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 21:21:28 +0100 Subject: [PATCH 19/28] Create change_url --- scripts/change_url | 105 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 scripts/change_url diff --git a/scripts/change_url b/scripts/change_url new file mode 100644 index 0000000..ff06606 --- /dev/null +++ b/scripts/change_url @@ -0,0 +1,105 @@ +#!/bin/bash + +#================================================= +# GENERIC STARTING +#================================================= +# IMPORT GENERIC HELPERS +#================================================= + +source _common.sh +source /usr/share/yunohost/helpers + +#================================================= +# RETRIEVE ARGUMENTS +#================================================= + +old_domain=$YNH_APP_OLD_DOMAIN +old_path=$YNH_APP_OLD_PATH + +new_domain=$YNH_APP_NEW_DOMAIN +new_path=$YNH_APP_NEW_PATH + +app=$YNH_APP_INSTANCE_NAME + +#================================================= +# LOAD SETTINGS +#================================================= +ynh_script_progression --message="Loading installation settings..." --weight=1 + +# Needed for helper "ynh_add_nginx_config" +final_path=$(ynh_app_setting_get --app=$app --key=final_path) + +#================================================= +# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. + ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" + + # Restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +#================================================= +# CHECK WHICH PARTS SHOULD BE CHANGED +#================================================= + +change_domain=0 +if [ "$old_domain" != "$new_domain" ] +then + change_domain=1 +fi + +change_path=0 +if [ "$old_path" != "$new_path" ] +then + change_path=1 +fi + +#================================================= +# MODIFY URL IN NGINX CONF +#================================================= +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 + +nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf + +# Change the path in the NGINX config file +if [ $change_path -eq 1 ] +then + # Make a backup of the original NGINX config file if modified + ynh_backup_if_checksum_is_different --file="$nginx_conf_path" + # Set global variables for NGINX helper + domain="$old_domain" + path_url="$new_path" + # Create a dedicated NGINX config + ynh_add_nginx_config +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" + 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" +fi + +#================================================= +# RELOAD NGINX +#================================================= +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 + +ynh_systemd_action --service_name=nginx --action=reload + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_script_progression --message="Change of URL completed for $app" --last From 781c3dbf3a1677d242d813b1fc19f28b68932901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 21:22:46 +0100 Subject: [PATCH 20/28] Update check_process --- check_process | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/check_process b/check_process index 801237e..0a56d22 100644 --- a/check_process +++ b/check_process @@ -1,25 +1,29 @@ ;; Test complet ; Manifest - domain="sub.domain.tld" - path="/" - backend="domain.tld" + domain="domain.tld" + path="/path" is_public=1 + language="fr" + admin="john" + password="1Strong-Password" + port="666" ; Checks pkg_linter=1 - setup_sub_dir=0 + setup_sub_dir=1 setup_root=1 setup_nourl=0 setup_private=1 setup_public=1 upgrade=1 + #upgrade=1 from_commit=CommitHash backup_restore=1 - multi_instance=0 + multi_instance=1 port_already_use=0 - change_url=0 - ; Checks - setup_sub_dir=1 - upgrade=1 - backup_restore=1 + change_url=1 ;;; Options Email= -Notification=change +Notification=none +;;; Upgrade options + ; commit=CommitHash + name=Name and date of the commit. + manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666& From 6f37896e130a08a0d75102c6eac18b9e4d0596a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 28 May 2023 20:10:25 +0200 Subject: [PATCH 21/28] Update check_process --- check_process | 1 + 1 file changed, 1 insertion(+) diff --git a/check_process b/check_process index 0a56d22..3e065d6 100644 --- a/check_process +++ b/check_process @@ -7,6 +7,7 @@ admin="john" password="1Strong-Password" port="666" + backend="domain.tld" ; Checks pkg_linter=1 setup_sub_dir=1 From 345da7827b7e823578de93f77cf9d4696b918452 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 28 May 2023 18:12:52 +0000 Subject: [PATCH 22/28] Auto-update README --- README.md | 7 ++----- README_fr.md | 25 +++++++++++-------------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 6c8cd69..42be5b8 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Soapbox for YunoHost -[![Integration level](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![Working status](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![Working status](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) + [![Install Soapbox with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=soapbox) *[Lire ce readme en français.](./README_fr.md)* @@ -45,10 +46,6 @@ screen -d screen -r ``` -## :red_circle: Antifeatures - -- **Package not maintained**: This YunoHost package is not maintained and needs adoption. - ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index 464e483..0c27b5f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,24 +5,25 @@ It shall NOT be edited by hand. # Soapbox pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/soapbox.svg)](https://dash.yunohost.org/appci/app/soapbox) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/soapbox.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/soapbox.maintain.svg) + [![Installer Soapbox avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=soapbox) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Soapbox rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Soapbox rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble Soapbox is customizable open-source software that puts the power of social media in the hands of the people. Feature-rich and hyper-focused on providing a user experience to rival Big Tech, Soapbox is already home to some of the biggest alternative social platforms. **Version incluse :** 3.0.0~ynh1 -## Captures d'écran +## Captures d’écran -![Capture d'écran de Soapbox](./doc/screenshots/screenshot.jpg) +![Capture d’écran de Soapbox](./doc/screenshots/screenshot.jpg) ## Avertissements / informations importantes @@ -45,15 +46,11 @@ screen -d screen -r ``` -## :red_circle: Fonctions indésirables - -- **Package not maintained**: This YunoHost package is not maintained and needs adoption. - ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -69,4 +66,4 @@ ou sudo yunohost app upgrade soapbox -u https://github.com/YunoHost-Apps/soapbox_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From a5a824b071b99cc3eba039357b17f0d63004c2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 4 Jul 2023 08:11:59 +0200 Subject: [PATCH 23/28] Update check_process Co-authored-by: Alexandre Aubin --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 3e065d6..b49aefc 100644 --- a/check_process +++ b/check_process @@ -10,7 +10,7 @@ backend="domain.tld" ; Checks pkg_linter=1 - setup_sub_dir=1 + setup_sub_dir=0 setup_root=1 setup_nourl=0 setup_private=1 From 0bd082ce9e581800f91ec50c3d66e82f772ee1f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 4 Jul 2023 08:12:11 +0200 Subject: [PATCH 24/28] Update check_process Co-authored-by: Alexandre Aubin --- check_process | 5 ----- 1 file changed, 5 deletions(-) diff --git a/check_process b/check_process index b49aefc..ac653bd 100644 --- a/check_process +++ b/check_process @@ -23,8 +23,3 @@ change_url=1 ;;; Options Email= -Notification=none -;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666& From b32aebe830d6b48000f8e3b128cccec615f72dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 4 Jul 2023 08:12:24 +0200 Subject: [PATCH 25/28] Update scripts/change_url Co-authored-by: Alexandre Aubin --- scripts/change_url | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/change_url b/scripts/change_url index ff06606..2b95402 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -28,6 +28,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) +backend=$(ynh_app_setting_get --app=$app --key=backend) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP From 18356861e2e82877b9b991dbfe41854a9a579dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Jul 2023 18:48:03 +0200 Subject: [PATCH 26/28] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index ac653bd..5153249 100644 --- a/check_process +++ b/check_process @@ -18,7 +18,7 @@ upgrade=1 #upgrade=1 from_commit=CommitHash backup_restore=1 - multi_instance=1 + multi_instance=0 port_already_use=0 change_url=1 ;;; Options From 587ba92bd16123b688ce3984104f03c2b98e0424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Jul 2023 18:49:53 +0200 Subject: [PATCH 27/28] 3.2.0 --- conf/app.src | 4 ++-- manifest.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 2b0462a..858cf19 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://gitlab.com/soapbox-pub/soapbox/-/jobs/artifacts/v3.0.0/download?job=build-production -SOURCE_SUM=ea62f2f9c27b391d156b1fe7c4e4384ac1b45c7f01af6b0e5337b9a8f18d8ac2 +SOURCE_URL=https://gitlab.com/soapbox-pub/soapbox/-/jobs/artifacts/v3.2.0/download?job=build-production +SOURCE_SUM=01d5ba24aec990828b67c5fe37d49378e1ea986354761717c82f63b103d36bda SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index ec0a12e..6d02fc4 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Alternative frontend for Pleroma", "fr": "Interface alternative pour Pleroma" }, - "version": "3.0.0~ynh1", + "version": "3.2.0~ynh1", "url": "https://soapbox.pub/", "upstream": { "license": "AGPL-3.0", @@ -19,7 +19,7 @@ "name": "" }, "requirements": { - "yunohost": ">= 11.0.9" + "yunohost": ">= 11.1.21" }, "multi_instance": false, "services": [ From 24ac1f3811113734ff7b3de5c04ce964f7d2efa3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 9 Jul 2023 16:49:57 +0000 Subject: [PATCH 28/28] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 42be5b8..463ffa0 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Soapbox is customizable open-source software that puts the power of social media in the hands of the people. Feature-rich and hyper-focused on providing a user experience to rival Big Tech, Soapbox is already home to some of the biggest alternative social platforms. -**Shipped version:** 3.0.0~ynh1 +**Shipped version:** 3.2.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 0c27b5f..ba80149 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Soapbox is customizable open-source software that puts the power of social media in the hands of the people. Feature-rich and hyper-focused on providing a user experience to rival Big Tech, Soapbox is already home to some of the biggest alternative social platforms. -**Version incluse :** 3.0.0~ynh1 +**Version incluse :** 3.2.0~ynh1 ## Captures d’écran