From 00d5e30a119f3d154abfe280cb17020bf4e332fb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 14 Oct 2020 14:30:12 +0200 Subject: [PATCH] fix --- README.md | 4 ++-- README_fr.md | 4 ++-- conf/app.src | 1 - conf/nginx.conf | 2 -- scripts/remove | 8 +++----- scripts/restore | 8 ++++---- scripts/upgrade | 16 ++++++---------- 7 files changed, 17 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index c1a9690..ee46d38 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview -Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader and aggregator. +Bludit is a web application to build your own website or blog in seconds; it's completely free and open source. Bludit is a Flat-File CMS, which (in this case) means that Bludit uses files in the JSON format to store the content. You don't need to install or configure a database; you only need a web server with PHP support. **Shipped version:** 3.13.1 @@ -20,7 +20,7 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader an ## Demo -* [YunoHost demo](https://demo.yunohost.org/ttrss/) +* [YunoHost demo](https://demo.bludit.com/) ## Configuration diff --git a/README_fr.md b/README_fr.md index 91a546e..af9656f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -10,7 +10,7 @@ Si vous n’avez pas YunoHost, consultez [le guide](https://yunohost.org/#/insta ## Vue d’ensemble -Tiny Tiny RSS est un lecteur et agrégateur de flux d'actualités (RSS/Atom) en ligne gratuit et open source. +Bludit est une application Web pour créer votre propre site Web ou blog en quelques secondes; c'est totalement gratuit et open source. Bludit est un CMS Flat-File, ce qui (dans ce cas) signifie que Bludit utilise des fichiers au format JSON pour stocker le contenu. Vous n'avez pas besoin d'installer ou de configurer une base de données; vous n'avez besoin que d'un serveur Web prenant en charge PHP. **Version incluse :** 3.13.1 @@ -20,7 +20,7 @@ Tiny Tiny RSS est un lecteur et agrégateur de flux d'actualités (RSS/Atom) en ## Démo -* [YunoHost demo](https://demo.yunohost.org/ttrss/) +* [YunoHost demo](https://demo.bludit.com/) ## Configuration diff --git a/conf/app.src b/conf/app.src index 0d686d0..4f7bd6c 100644 --- a/conf/app.src +++ b/conf/app.src @@ -4,4 +4,3 @@ SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= - diff --git a/conf/nginx.conf b/conf/nginx.conf index 37de41d..556b622 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,7 +9,6 @@ location __PATH__/ { rewrite ^ https://$server_name$request_uri? permanent; } -### Example PHP configuration (remove it if not used) index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file @@ -26,7 +25,6 @@ location __PATH__/ { fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; } -### End of PHP configuration part # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; diff --git a/scripts/remove b/scripts/remove index 38ccc6d..b1fa704 100644 --- a/scripts/remove +++ b/scripts/remove @@ -44,15 +44,13 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=3 # Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# GENERIC FINALIZATION #================================================= # REMOVE DEDICATED USER #================================================= -# ynh_script_progression --message="Removing the dedicated system user..." --weight=1 +ynh_script_progression --message="Removing the dedicated system user..." --weight=1 -# # Delete a system user -# ynh_system_user_delete --username=$app +# Delete a system user +ynh_system_user_delete --username=$app #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 7c14e1d..70fd41e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -56,17 +56,17 @@ ynh_restore_file --origin_path="$final_path" #================================================= # RECREATE THE DEDICATED USER #================================================= -# ynh_script_progression --message="Recreating the dedicated system user..." --weight=3 +ynh_script_progression --message="Recreating the dedicated system user..." --weight=3 -# # Create the dedicated user (if not existing) -# ynh_system_user_create --username=$app +# Create the dedicated user (if not existing) +ynh_system_user_create --username=$app #================================================= # RESTORE USER RIGHTS #================================================= # Set permissions to app files -chown -R root: $final_path +chown -R $app: $final_path #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index c90a119..35e143d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -64,10 +64,10 @@ ynh_add_nginx_config #================================================= # CREATE DEDICATED USER #================================================= -# ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 -# # Create a dedicated user (if not existing) -# ynh_system_user_create --username=$app +# Create a dedicated user (if not existing) +ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION @@ -80,12 +80,12 @@ ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependenc #================================================= # SPECIFIC UPGRADE #================================================= -# CONFIGURE TTRSS +# UPGRADING BLUDIT #================================================= if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Reconfiguring ttrss..." --weight=2 + ynh_script_progression --message="Upgrading Bludit..." --weight=2 # Replace the old ttrss by the new one ynh_secure_remove --file=$final_path @@ -94,17 +94,13 @@ then ynh_setup_source --dest_dir=$final_path fi -#================================================= -# GENERIC FINALIZATION #================================================= # SECURE FILES AND DIRECTORIES #================================================= # Set permissions to app files -chown -R root: $final_path +chown -R $app: $final_path -#================================================= -# GENERIC FINALIZATION #================================================= # RELOAD NGINX #=================================================