YunoHost-Apps/grav_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/grav_ynh.git synced 2024-09-03 19:16:01 +02:00
Code Issues Activity Actions 1

Merge pull request #22 from YunoHost-Apps/testing

Browse source 
upgrade to 1.5.10
This commit is contained in:
Jean-Baptiste 2019-10-24 08:05:49 +02:00 committed by GitHub
commit 74b90fd5cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 39 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
* http://getgrav.org/ * http://getgrav.org/
* https://github.com/getgrav/grav * https://github.com/getgrav/grav
Provided version: **1.5.3** Provided version: **1.5.10**
## Installation ## Installation

6
check_process
View file

@ -17,9 +17,10 @@
setup_public=1 setup_public=1
upgrade=1 upgrade=1
upgrade=1 from_commit=ec151614e4c41f2012bb983d08faf6eda233d5be upgrade=1 from_commit=ec151614e4c41f2012bb983d08faf6eda233d5be
upgrade=1 from_commit=22290f672847342fd187a56d39b68393b1e0fd5a
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1
incorrect_path=1 incorrect_path=0
port_already_use=0 port_already_use=0
change_url=1 change_url=1
;;; Levels ;;; Levels
@ -41,4 +42,7 @@ Notification=all
;;; Upgrade options ;;; Upgrade options
; commit=ec151614e4c41f2012bb983d08faf6eda233d5be ; commit=ec151614e4c41f2012bb983d08faf6eda233d5be
name=Version 1.3.1 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& manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr_FR&is_public=PUBLIC&

4
conf/app-upgrade.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.3/grav-update-v1.5.3.zip SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.10/grav-update-v1.5.10.zip
SOURCE_SUM=F1FA0D345FB117E483F0EAB25A6F0A5BB60358368786A3E7E3DC357CB60277E9 SOURCE_SUM=1A2AE5D8613BD6B6EA4FF2C1897A435D3E14C59AADCC148B0F5959FC4BBBF349
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.3/grav-admin-v1.5.3.zip SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.10/grav-admin-v1.5.10.zip
SOURCE_SUM=055F6F248AA74C68436B6D639D9340D333136044E5946FC6D62271AD2B3B319B SOURCE_SUM=FACA5369326EB1577A5EBEA3A81C46E77B3CD8565C404261E819256A8A5E0293
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

1
conf/nginx.conf
View file

@ -17,7 +17,6 @@ location __PATH__/ {
add_header X-Content-Type-Options nosniff; add_header X-Content-Type-Options nosniff;
add_header X-Frame-Options "SAMEORIGIN"; add_header X-Frame-Options "SAMEORIGIN";
add_header X-XSS-Protection "1; mode=block"; add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none;
add_header X-Download-Options noopen; add_header X-Download-Options noopen;
add_header X-Permitted-Cross-Domain-Policies none; add_header X-Permitted-Cross-Domain-Policies none;

5
conf/php-fpm.conf
View file

@ -389,4 +389,7 @@ catch_workers_output = yes
;php_flag[display_errors] = off ;php_flag[display_errors] = off
;php_admin_value[error_log] = /var/log/fpm-php.www.log ;php_admin_value[error_log] = /var/log/fpm-php.www.log
;php_admin_flag[log_errors] = on ;php_admin_flag[log_errors] = on
;php_admin_value[memory_limit] = 32M ;php_admin_value[memory_limit] = 32M
;php_admin_value[upload_max_filesize] =30M
;php_admin_value[post_max_size] =30M

3
conf/php-fpm.ini
View file

@ -1,3 +0,0 @@
upload_max_filesize=30M
post_max_size=30M
; max_execution_time=60

3
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Grav - Grav is a modern open source flat-file CMS", "en": "Grav - Grav is a modern open source flat-file CMS",
"fr": "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.10~ynh1",
"url": "https://www.getgrav.org/", "url": "https://www.getgrav.org/",
"license": "MIT-0", "license": "MIT-0",
"maintainer": [ "maintainer": [
@ -75,6 +75,7 @@
}, },
{ {
"name": "language", "name": "language",
"type": "string",
"ask": { "ask": {
"en": "Choose the application language", "en": "Choose the application language",
"fr": "Choisissez la langue de l'application" "fr": "Choisissez la langue de l'application"

1
scripts/backup
View file

@ -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/pool.d/$app.conf"
ynh_backup "/etc/php/7.0/fpm/conf.d/20-$app.ini"

2
scripts/install
View file

@ -105,7 +105,7 @@ chown -R "$app": "$final_path"
#================================================= #=================================================
# Make app public if necessary # Make app public if necessary
if [ $is_public -eq "1" ] if [ "$is_public" -eq "1" ]
then then
# unprotected_uris allows SSO credentials to be passed anyway. # unprotected_uris allows SSO credentials to be passed anyway.
ynh_app_setting_set "$app" unprotected_uris "/" ynh_app_setting_set "$app" unprotected_uris "/"

11
scripts/restore
View file

@ -27,17 +27,17 @@ ynh_abort_if_errors
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get $app domain) domain=$(ynh_app_setting_get "$app" domain)
path_url=$(ynh_app_setting_get $app path) path_url=$(ynh_app_setting_get "$app" path)
final_path=$(ynh_app_setting_get $app final_path) final_path=$(ynh_app_setting_get "$app" final_path)
#================================================= #=================================================
# CHECK IF THE APP CAN BE RESTORED # 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}" || 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 " || ynh_die "There is already a directory: $final_path "
@ -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/pool.d/$app.conf"
ynh_restore_file "/etc/php/7.0/fpm/conf.d/20-$app.ini"
#================================================= #=================================================

34
scripts/upgrade
View file

@ -15,12 +15,12 @@ source /usr/share/yunohost/helpers
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get $app domain) domain=$(ynh_app_setting_get "$app" domain)
path_url=$(ynh_app_setting_get $app path) path_url=$(ynh_app_setting_get "$app" path)
admin=$(ynh_app_setting_get $app admin) admin=$(ynh_app_setting_get "$app" admin)
is_public=$(ynh_app_setting_get $app is_public) is_public=$(ynh_app_setting_get "$app" is_public)
final_path=$(ynh_app_setting_get $app final_path) final_path=$(ynh_app_setting_get "$app" final_path)
language=$(ynh_app_setting_get $app language) language=$(ynh_app_setting_get "$app" language)
#================================================= #=================================================
# ENSURE DOWNWARD COMPATIBILITY # ENSURE DOWNWARD COMPATIBILITY
@ -28,23 +28,23 @@ language=$(ynh_app_setting_get $app language)
# Fix is_public as a boolean value # Fix is_public as a boolean value
if [ "$is_public" = "Yes" ]; then if [ "$is_public" = "Yes" ]; then
ynh_app_setting_set $app is_public 1 ynh_app_setting_set "$app" is_public 1
is_public=1 is_public=1
elif [ "$is_public" = "No" ]; then elif [ "$is_public" = "No" ]; then
ynh_app_setting_set $app is_public 0 ynh_app_setting_set "$app" is_public 0
is_public=0 is_public=0
fi fi
# If db_name doesn't exist, create it # If db_name doesn't exist, create it
if [ -z $db_name ]; then if [ -z "$db_name" ]; then
db_name=$(ynh_sanitize_dbid $app) db_name=$(ynh_sanitize_dbid "$app")
ynh_app_setting_set $app db_name $db_name ynh_app_setting_set "$app" db_name "$db_name"
fi fi
# If final_path doesn't exist, create it # If final_path doesn't exist, create it
if [ -z $final_path ]; then if [ -z "$final_path" ]; then
final_path=/var/www/$app final_path="/var/www/$app"
ynh_app_setting_set $app final_path $final_path ynh_app_setting_set "$app" final_path "$final_path"
fi fi
#================================================= #=================================================
@ -65,7 +65,7 @@ ynh_abort_if_errors
#================================================= #=================================================
# Normalize the URL path syntax # Normalize the URL path syntax
path_url=$(ynh_normalize_url_path $path_url) path_url=$(ynh_normalize_url_path "$path_url")
#================================================= #=================================================
# STANDARD UPGRADE STEPS # STANDARD UPGRADE STEPS
@ -114,7 +114,7 @@ chown -R "$app": "$final_path"
#================================================= #=================================================
# Make app public if necessary # Make app public if necessary
if [ $is_public -eq "1" ] if [ "$is_public" -eq "1" ]
then then
# unprotected_uris allows SSO credentials to be passed anyway. # unprotected_uris allows SSO credentials to be passed anyway.
ynh_app_setting_set "$app" unprotected_uris "/" ynh_app_setting_set "$app" unprotected_uris "/"
@ -126,4 +126,4 @@ fi
# RELOAD NGINX # RELOAD NGINX
#================================================= #=================================================
systemctl reload nginx systemctl reload nginx