diff --git a/README_fr.md b/README_fr.md index 7df6766..3dd5d76 100644 --- a/README_fr.md +++ b/README_fr.md @@ -56,7 +56,7 @@ Bludit est une application Web pour créer votre propre site Web ou blog en quel ## Developers infos -Merci de faire vos pull request sur la [testing branch](https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing). +Merci de faire vos pull request sur la [testing branch](https://github.com/YunoHost-Apps/bludit_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. ``` diff --git a/check_process b/check_process index d417240..4dab04f 100644 --- a/check_process +++ b/check_process @@ -2,6 +2,7 @@ ; Manifest domain="domain.tld" (DOMAIN) path="/path" (PATH) + is_public=1 (PUBLIC|public=1|private=0) ; Checks pkg_linter=1 setup_sub_dir=1 @@ -21,4 +22,6 @@ Email= Notification=none ;;; Upgrade options - manifest_arg=domain=DOMAIN&path=PATH + ; commit=CommitHash + name=Name and date of the commit. + manifest_arg=domain=DOMAIN&path=PATH&is_public=1& diff --git a/conf/nginx.conf b/conf/nginx.conf index 39fd7e0..3f4c23c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -24,7 +24,6 @@ location __PATH__/ { location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; - fastcgi_index index.php; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; diff --git a/scripts/_common.sh b/scripts/_common.sh index 39c90c4..a3e80ec 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,6 +8,14 @@ YNH_PHP_VERSION="7.3" extra_php_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom" +#================================================= +# PERSONAL HELPERS +#================================================= + #================================================= # EXPERIMENTAL HELPERS #================================================= + +#================================================= +# FUTURE OFFICIAL HELPERS +#================================================= diff --git a/scripts/backup b/scripts/backup index ef6396e..88a8aa0 100644 --- a/scripts/backup +++ b/scripts/backup @@ -11,7 +11,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -# Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= diff --git a/scripts/change_url b/scripts/change_url index 550c0a9..09545ca 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 final_path=$(ynh_app_setting_get --app=$app --key=final_path) diff --git a/scripts/remove b/scripts/remove index b1fa704..f10acda 100644 --- a/scripts/remove +++ b/scripts/remove @@ -25,7 +25,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Removing Bludit main directory..." --weight=4 -# Remove the app directory securely +# Remove Bludit directory securely ynh_secure_remove --file="$final_path" #================================================= diff --git a/scripts/restore b/scripts/restore index d576a98..8c4d6e0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -18,7 +18,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading settings..." --weight=1 +ynh_script_progression --message="Loading settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -70,7 +70,7 @@ chown -R $app: $final_path #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=50 +ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 35e143d..6f1179f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -31,7 +31,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=2 +ynh_script_progression --message="Ensuring downward compatibility..." --weight=2 # If final_path doesn't exist, create it if [ -z "$final_path" ]; then @@ -42,9 +42,9 @@ fi #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up Bludit before upgrading (may take a while)..." --weight=7 +ynh_script_progression --message="Backing up Bludit before upgrading..." --weight=7 -# Backup the current version of the app +# Backup the current version of Bludit ynh_backup_before_upgrade ynh_clean_setup () { # restore it if the upgrade fails @@ -87,7 +87,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading Bludit..." --weight=2 - # Replace the old ttrss by the new one + # Replace the old Bludit by the new one ynh_secure_remove --file=$final_path # Download, check integrity, uncompress and patch the source from app.src