diff --git a/README.md b/README.md index c97ff17..f470b7b 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in A modern open source flat-file CMS -**Shipped version:** 1.7.21~ynh1 +**Shipped version:** 1.7.24~ynh1 **Demo:** https://getgrav.org/downloads/themes diff --git a/README_fr.md b/README_fr.md index 7b4ca7b..4c69f2c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Un CMS moderne basé sur des fichiers plats -**Version incluse :** 1.7.21~ynh1 +**Version incluse :** 1.7.24~ynh1 **Démo :** https://getgrav.org/downloads/themes diff --git a/check_process b/check_process index aa5bf60..743a33e 100644 --- a/check_process +++ b/check_process @@ -27,6 +27,7 @@ setup_public=1 upgrade=1 # upgrade=1 from_commit=7d16d0560c588ad4adcde5b44ae4329f9e40f7c7 + upgrade=1 from_commit=412306ac0a7c3f6f02aff162b65eb4b1f4484b2a backup_restore=1 multi_instance=1 port_already_use=0 (66) @@ -38,5 +39,8 @@ Email=tituspijean@outlook.com Notification=none ;;; Upgrade options # ; commit=7d16d0560c588ad4adcde5b44ae4329f9e40f7c7 -# name=Upgrade to v1.7.17 +# name=v1.7.17 # manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr_FR&is_public=1& + ; commit=412306ac0a7c3f6f02aff162b65eb4b1f4484b2a + name=v1.7.21 + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr_FR&is_public=1& diff --git a/conf/app-upgrade.src b/conf/app-upgrade.src index ee077f0..4b4f7e1 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.7.21/grav-update-v1.7.21.zip -SOURCE_SUM=0d198310631f522c02c76d0635b930e93d4b419ddd6708187514b1572fe56363 +SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.7.24/grav-update-v1.7.24.zip +SOURCE_SUM=5a4b543ff62fed497a0e0c429389cd730df1cc59327567df02c3dff834af069a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/app.src b/conf/app.src index 9e2e26c..cbf2029 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.7.21/grav-admin-v1.7.21.zip -SOURCE_SUM=ec11419294d8f0f30a3b0ed6c5c8de0eba94ec0f5e93f4b5e3d9c9e487142b18 +SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.7.24/grav-admin-v1.7.24.zip +SOURCE_SUM=6ee7e6d0008dbbad448718ecd2d714173a1f4e17698805621e1cd1a6e802eb75 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index c0a6052..1e96557 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A modern open source flat-file CMS", "fr": "Un CMS moderne basé sur des fichiers plats" }, - "version": "1.7.21~ynh1", + "version": "1.7.24~ynh1", "url": "https://www.getgrav.org/", "upstream": { "license": "MIT", diff --git a/scripts/upgrade b/scripts/upgrade index da87e9a..08c490e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -138,6 +138,21 @@ fi #================================================= # SPECIFIC UPGRADE +#================================================= +# UPGRADE LDAP PLUGIN +#================================================= +ynh_script_progression --message="Installing and configuring LDAP plugin..." --weight=3 + +# Download LDAP source +ynh_setup_source --dest_dir="$final_path/user/plugins/login-ldap" --source_id="ldap" + +exec_as $app mkdir -p "$final_path/user/config/plugins/login-ldap" +exec_as $app touch "$final_path/user/accounts/admin.yaml" + +ynh_add_config --template="../conf/login-ldap.yaml" --destination="$final_path/user/config/plugins/login-ldap.yaml" +chown $app:$app "$final_path/user/config/plugins/login-ldap.yaml" +chmod 640 "$final_path/user/config/plugins/login-ldap.yaml" + #================================================= # SECURE FILES AND DIRECTORIES #================================================= @@ -158,21 +173,6 @@ pushd "$final_path" ynh_exec_warn_less yes N | ynh_exec_warn_less exec_as $app php${YNH_PHP_VERSION} bin/gpm update --all-yes --no-interaction || ynh_print_warn --message="Automatic plugin upgrade has failed, you can upgrade them from your Grav admin panel." popd -#================================================= -# INSTALL LDAP PLUGIN -#================================================= -ynh_script_progression --message="Installing and configuring LDAP plugin..." --weight=3 - -pushd "$final_path" - exec_as $app php${YNH_PHP_VERSION} bin/gpm install login-ldap --no-interaction -popd -exec_as $app mkdir -p "$final_path/user/config/plugins/login-ldap" -exec_as $app touch "$final_path/user/accounts/admin.yaml" - -ynh_add_config --template="../conf/login-ldap.yaml" --destination="$final_path/user/config/plugins/login-ldap.yaml" -chown $app:$app "$final_path/user/config/plugins/login-ldap.yaml" -chmod 640 "$final_path/user/config/plugins/login-ldap.yaml" - #================================================= # CREATE A CRON TASK #=================================================