diff --git a/README.md b/README.md index 1f212a5..6fb1bae 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ # concrete5_ynh -[![Integration level](https://dash.yunohost.org/integration/concrete5.svg)](https://ci-apps.yunohost.org/jenkins/job/concrete5%20%28Community%29/lastBuild/consoleFull) -[![Install concrete5 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=concrete5) -> *This package allow you to install concrete5 quickly and simply on a YunoHost server. +[![Integration level](https://dash.yunohost.org/integration/REPLACEBYYOURAPP.svg)](https://dash.yunohost.org/appci/app/REPLACEBYYOURAPP) +[![Install REPLACEBYYOURAPP with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=REPLACEBYYOURAPP) + +> *This package allow you to install REPLACEBYYOURAPP quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* ## Overview @@ -16,16 +17,7 @@ Features : * Marketing tools * **and more**... -## Etat : NOT WORKING - -Site officiel : https://www.concrete5.org/ - -**Shipped version:** 8.4.4 - - -## Licence - -LICENSE MIT +**Shipped version:** 8.4.5 ## Screenshots @@ -53,9 +45,9 @@ Can the app be used by multiple users? #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/jenkins/job/concrete5%20(Community)/badge/icon)](https://ci-apps.yunohost.org/jenkins/job/concrete5%20(Community)/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/jenkins/job/concrete5%20(Community)%20(%7EARM%7E)/badge/icon)](https://ci-apps-arm.yunohost.org/jenkins/job/concrete5%20(Community)%20(%7EARM%7E)/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/jenkins/job/concrete5%20(Community)/badge/icon)](https://ci-stretch.nohost.me/jenkins/job/concrete5%20(Community)/) +* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/REPLACEBYYOURAPP/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/REPLACEBYYOURAPP/) +* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/REPLACEBYYOURAPP%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/REPLACEBYYOURAPP/) ## Limitations @@ -70,8 +62,9 @@ https://yunohost.org/packaging_apps ## Links - * Report a bug: https://github.com/YunoHost-Apps/concrete5_ynh/issues + * Report a bug: https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/issues * App website: https://www.concrete5.org/ + * GitHub App website: https://github.com/concrete5/concrete5 * YunoHost website: https://yunohost.org/ --- @@ -80,12 +73,11 @@ Developers info ---------------- **Only if you want to use a testing branch for coding, instead of merging directly into master.** -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/concrete5_ynh/tree/testing). +Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/tree/testing). To try the testing branch, please proceed like that. ``` -sudo yunohost app install https://github.com/YunoHost-Apps/concrete5_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/tree/testing --debug or -sudo yunohost app upgrade concrete5 -u https://github.com/YunoHost-Apps/concrete5_ynh/tree/testing --debug +sudo yunohost app upgrade REPLACEBYYOURAPP -u https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/tree/testing --debug ``` - diff --git a/check_process b/check_process index 83a4573..cf1c349 100644 --- a/check_process +++ b/check_process @@ -25,7 +25,7 @@ multi_instance=1 incorrect_path=1 port_already_use=0 - change_url=0 + change_url=1 ;;; Levels Level 1=auto Level 2=auto diff --git a/conf/app.src b/conf/app.src index c9b7390..924e56a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://codeload.github.com/concrete5/concrete5/tar.gz/8.4.4 -SOURCE_SUM=7c862e4d3b2aed854fd86ee1a5d94222dd72f555d56828111db603005c1d1b6f +SOURCE_URL=https://github.com/concrete5/concrete5/archive/8.4.5.tar.gz +SOURCE_SUM=a8708e6d55dba3bcf6aeb2a377eaa851650cb8634343c7ce4e88045fd58d565e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index bd0bbe2..4844694 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Create a modern Website", "fr": "Créer un site web moderne avec un CMS moderne" }, - "version": "8.4.4~ynh1", + "version": "8.4.5~ynh1", "url": "www.concrete5.org", "license": "MIT", "maintainer": { diff --git a/scripts/change_url b/scripts/change_url index f71fc77..93a67da 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -24,6 +24,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= +ynh_print_info "Loading installation settings..." # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get $app final_path) @@ -62,6 +63,7 @@ fi #================================================= # MODIFY URL IN NGINX CONF #================================================= +ynh_print_info "Updating nginx web server configuration..." nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -98,5 +100,12 @@ fi #================================================= # RELOAD NGINX #================================================= +ynh_print_info "Reloading nginx web server..." systemctl reload nginx + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info "Change of URL completed for $app" diff --git a/scripts/install b/scripts/install index 7161bb1..77a5d34 100644 --- a/scripts/install +++ b/scripts/install @@ -68,7 +68,7 @@ ynh_webpath_register $app $domain $path_url ynh_print_info "Storing installation settings..." ynh_app_setting_set $app domain $domain -ynh_app_setting_set $app path_url $path_url +ynh_app_setting_set $app path $path_url ynh_app_setting_set $app admin $admin ynh_app_setting_set $app is_public $is_public ynh_app_setting_set $app language $language