From 1705ccb9610a821be4dc27ec1d4b28d9a9358c40 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sun, 17 Feb 2019 22:14:19 +0100 Subject: [PATCH 1/7] Remove X-Robots-Tag header --- conf/nginx.conf | 1 - manifest.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 78ad0cb..069cb83 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -17,7 +17,6 @@ location __PATH__/ { add_header X-Content-Type-Options nosniff; add_header X-Frame-Options "SAMEORIGIN"; add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; add_header X-Download-Options noopen; add_header X-Permitted-Cross-Domain-Policies none; diff --git a/manifest.json b/manifest.json index 6813fcf..ac2bff3 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Grav - Grav is a modern open source flat-file CMS", "fr": "Grav - Grav is a modern open source flat-file CMS" }, - "version": "1.5.3~ynh2", + "version": "1.5.3~ynh3", "url": "https://www.getgrav.org/", "license": "MIT-0", "maintainer": [ From cd8bd09c0eec45e6cd4e39dd8e07a163d59b16d2 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sun, 17 Feb 2019 22:20:38 +0100 Subject: [PATCH 2/7] remove php-fpm.ini and set type=string for language --- conf/php-fpm.conf | 5 ++++- conf/php-fpm.ini | 3 --- manifest.json | 3 ++- scripts/backup | 1 - scripts/restore | 1 - 5 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 conf/php-fpm.ini diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 6134990..9b801b2 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -389,4 +389,7 @@ catch_workers_output = yes ;php_flag[display_errors] = off ;php_admin_value[error_log] = /var/log/fpm-php.www.log ;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M \ No newline at end of file +;php_admin_value[memory_limit] = 32M + +;php_admin_value[upload_max_filesize] =30M +;php_admin_value[post_max_size] =30M \ No newline at end of file diff --git a/conf/php-fpm.ini b/conf/php-fpm.ini deleted file mode 100644 index 55e2ba7..0000000 --- a/conf/php-fpm.ini +++ /dev/null @@ -1,3 +0,0 @@ -upload_max_filesize=30M -post_max_size=30M -; max_execution_time=60 \ No newline at end of file diff --git a/manifest.json b/manifest.json index ac2bff3..76c494e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Grav - Grav is a modern open source flat-file CMS", "fr": "Grav - Grav is a modern open source flat-file CMS" }, - "version": "1.5.3~ynh3", + "version": "1.5.3~ynh4", "url": "https://www.getgrav.org/", "license": "MIT-0", "maintainer": [ @@ -75,6 +75,7 @@ }, { "name": "language", + "type": "string", "ask": { "en": "Choose the application language", "fr": "Choisissez la langue de l'application" diff --git a/scripts/backup b/scripts/backup index 40cd8e3..30daf38 100644 --- a/scripts/backup +++ b/scripts/backup @@ -45,4 +45,3 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= ynh_backup "/etc/php/7.0/fpm/pool.d/$app.conf" -ynh_backup "/etc/php/7.0/fpm/conf.d/20-$app.ini" diff --git a/scripts/restore b/scripts/restore index a414c9e..d482e68 100644 --- a/scripts/restore +++ b/scripts/restore @@ -73,7 +73,6 @@ chown -R "$app": "$final_path" #================================================= ynh_restore_file "/etc/php/7.0/fpm/pool.d/$app.conf" -ynh_restore_file "/etc/php/7.0/fpm/conf.d/20-$app.ini" #================================================= From 43bacab543a2cd663a0ed8908938638bef1b55af Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sun, 17 Feb 2019 22:41:24 +0100 Subject: [PATCH 3/7] upgrade to 1.5.8 --- README.md | 2 +- check_process | 6 +++++- conf/app-upgrade.src | 4 ++-- conf/app.src | 4 ++-- manifest.json | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2c5c807..bedea49 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 * http://getgrav.org/ * https://github.com/getgrav/grav -Provided version: **1.5.3** +Provided version: **1.5.8** ## Installation diff --git a/check_process b/check_process index cb05f53..792b884 100644 --- a/check_process +++ b/check_process @@ -17,9 +17,10 @@ setup_public=1 upgrade=1 upgrade=1 from_commit=ec151614e4c41f2012bb983d08faf6eda233d5be + upgrade=1 from_commit=22290f672847342fd187a56d39b68393b1e0fd5a backup_restore=1 multi_instance=1 - incorrect_path=1 + incorrect_path=0 port_already_use=0 change_url=1 ;;; Levels @@ -41,4 +42,7 @@ Notification=all ;;; Upgrade options ; commit=ec151614e4c41f2012bb983d08faf6eda233d5be name=Version 1.3.1 + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr_FR&is_public=PUBLIC& + ; commit=22290f672847342fd187a56d39b68393b1e0fd5a + name=Version 1.5.3 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr_FR&is_public=PUBLIC& \ No newline at end of file diff --git a/conf/app-upgrade.src b/conf/app-upgrade.src index 52723bc..08e7669 100644 --- a/conf/app-upgrade.src +++ b/conf/app-upgrade.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.3/grav-update-v1.5.3.zip -SOURCE_SUM=F1FA0D345FB117E483F0EAB25A6F0A5BB60358368786A3E7E3DC357CB60277E9 +SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.8/grav-update-v1.5.8.zip +SOURCE_SUM=a58138a759ac11d4e2c6dd3f2dd83c41062047231767e53cae1d4b3a18096df6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/app.src b/conf/app.src index d787f96..39f1449 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.3/grav-admin-v1.5.3.zip -SOURCE_SUM=055F6F248AA74C68436B6D639D9340D333136044E5946FC6D62271AD2B3B319B +SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.8/grav-admin-v1.5.8.zip +SOURCE_SUM=3b0210bf8639c1d75b046e4a9b364b216b41c449c8b5ac74fd71c098d25cb9bb SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 76c494e..ada0bfd 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Grav - Grav is a modern open source flat-file CMS", "fr": "Grav - Grav is a modern open source flat-file CMS" }, - "version": "1.5.3~ynh4", + "version": "1.5.8~ynh1", "url": "https://www.getgrav.org/", "license": "MIT-0", "maintainer": [ From 923906e9d2917b833237088a31b00167292176ff Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sun, 17 Feb 2019 22:41:58 +0100 Subject: [PATCH 4/7] fix basic shellcheck warnings (doublequotes) --- scripts/install | 2 +- scripts/restore | 10 +++++----- scripts/upgrade | 34 +++++++++++++++++----------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/scripts/install b/scripts/install index ba5309c..63528c1 100644 --- a/scripts/install +++ b/scripts/install @@ -105,7 +105,7 @@ chown -R "$app": "$final_path" #================================================= # Make app public if necessary -if [ $is_public -eq "1" ] +if [ "$is_public" -eq "1" ] then # unprotected_uris allows SSO credentials to be passed anyway. ynh_app_setting_set "$app" unprotected_uris "/" diff --git a/scripts/restore b/scripts/restore index d482e68..7c3facd 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,17 +27,17 @@ ynh_abort_if_errors app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get $app domain) -path_url=$(ynh_app_setting_get $app path) -final_path=$(ynh_app_setting_get $app final_path) +domain=$(ynh_app_setting_get "$app" domain) +path_url=$(ynh_app_setting_get "$app" path) +final_path=$(ynh_app_setting_get "$app" final_path) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -ynh_webpath_available $domain $path_url \ +ynh_webpath_available "$domain" "$path_url" \ || ynh_die "Path not available: ${domain}${path_url}" -test ! -d $final_path \ +test ! -d "$final_path" \ || ynh_die "There is already a directory: $final_path " diff --git a/scripts/upgrade b/scripts/upgrade index 747f5a3..2725ef7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,12 +15,12 @@ source /usr/share/yunohost/helpers app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get $app domain) -path_url=$(ynh_app_setting_get $app path) -admin=$(ynh_app_setting_get $app admin) -is_public=$(ynh_app_setting_get $app is_public) -final_path=$(ynh_app_setting_get $app final_path) -language=$(ynh_app_setting_get $app language) +domain=$(ynh_app_setting_get "$app" domain) +path_url=$(ynh_app_setting_get "$app" path) +admin=$(ynh_app_setting_get "$app" admin) +is_public=$(ynh_app_setting_get "$app" is_public) +final_path=$(ynh_app_setting_get "$app" final_path) +language=$(ynh_app_setting_get "$app" language) #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -28,23 +28,23 @@ language=$(ynh_app_setting_get $app language) # Fix is_public as a boolean value if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set $app is_public 1 + ynh_app_setting_set "$app" is_public 1 is_public=1 elif [ "$is_public" = "No" ]; then - ynh_app_setting_set $app is_public 0 + ynh_app_setting_set "$app" is_public 0 is_public=0 fi # If db_name doesn't exist, create it -if [ -z $db_name ]; then - db_name=$(ynh_sanitize_dbid $app) - ynh_app_setting_set $app db_name $db_name +if [ -z "$db_name" ]; then + db_name=$(ynh_sanitize_dbid "$app") + ynh_app_setting_set "$app" db_name "$db_name" fi # If final_path doesn't exist, create it -if [ -z $final_path ]; then - final_path=/var/www/$app - ynh_app_setting_set $app final_path $final_path +if [ -z "$final_path" ]; then + final_path="/var/www/$app" + ynh_app_setting_set "$app" final_path "$final_path" fi #================================================= @@ -65,7 +65,7 @@ ynh_abort_if_errors #================================================= # Normalize the URL path syntax -path_url=$(ynh_normalize_url_path $path_url) +path_url=$(ynh_normalize_url_path "$path_url") #================================================= # STANDARD UPGRADE STEPS @@ -114,7 +114,7 @@ chown -R "$app": "$final_path" #================================================= # Make app public if necessary -if [ $is_public -eq "1" ] +if [ "$is_public" -eq "1" ] then # unprotected_uris allows SSO credentials to be passed anyway. ynh_app_setting_set "$app" unprotected_uris "/" @@ -126,4 +126,4 @@ fi # RELOAD NGINX #================================================= -systemctl reload nginx +systemctl reload nginx \ No newline at end of file From 4436f5598aa7e64b538f3eecfa8b8e76b692edde Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 2 Apr 2019 16:50:42 +0200 Subject: [PATCH 5/7] Spelling correction --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 6813fcf..e376d05 100644 --- a/manifest.json +++ b/manifest.json @@ -15,7 +15,7 @@ "email": "jean-baptiste@holcroft.fr" }, { - "name": "tituspijean", + "name": "Titus PiJean", "email": "tituspijean@outlook.com" }], "previous_maintainers": [ From c2139447dbf1ee5e6530b39d8a85a0de5a069dba Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 20 Oct 2019 11:49:14 +0200 Subject: [PATCH 6/7] [upg] Upgrade to Grav 1.5.10 --- README.md | 2 +- conf/app-upgrade.src | 4 ++-- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bedea49..0e2d1aa 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 * http://getgrav.org/ * https://github.com/getgrav/grav -Provided version: **1.5.8** +Provided version: **1.5.10** ## Installation diff --git a/conf/app-upgrade.src b/conf/app-upgrade.src index 08e7669..5243985 100644 --- a/conf/app-upgrade.src +++ b/conf/app-upgrade.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.8/grav-update-v1.5.8.zip -SOURCE_SUM=a58138a759ac11d4e2c6dd3f2dd83c41062047231767e53cae1d4b3a18096df6 +SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.10/grav-update-v1.5.10.zip +SOURCE_SUM=1A2AE5D8613BD6B6EA4FF2C1897A435D3E14C59AADCC148B0F5959FC4BBBF349 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/app.src b/conf/app.src index 39f1449..f767860 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.8/grav-admin-v1.5.8.zip -SOURCE_SUM=3b0210bf8639c1d75b046e4a9b364b216b41c449c8b5ac74fd71c098d25cb9bb +SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.10/grav-admin-v1.5.10.zip +SOURCE_SUM=FACA5369326EB1577A5EBEA3A81C46E77B3CD8565C404261E819256A8A5E0293 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 2618082..2e5c2a2 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Grav - Grav is a modern open source flat-file CMS", "fr": "Grav - Grav is a modern open source flat-file CMS" }, - "version": "1.5.8~ynh1", + "version": "1.5.10~ynh1", "url": "https://www.getgrav.org/", "license": "MIT-0", "maintainer": [ From c5a1daa635b7570c312fb6c88736ed8a16d0b283 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 20 Oct 2019 12:03:52 +0200 Subject: [PATCH 7/7] [fix] maintainer spelling Use the same spelling in all apps. --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 2e5c2a2..d02284d 100644 --- a/manifest.json +++ b/manifest.json @@ -15,7 +15,7 @@ "email": "jean-baptiste@holcroft.fr" }, { - "name": "Titus PiJean", + "name": "tituspijean", "email": "tituspijean@outlook.com" }], "previous_maintainers": [