From e20a51f0eef5ec1dc8a03ccd3d76350566f8b995 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 27 Feb 2021 21:06:28 +0100 Subject: [PATCH 01/11] Apply last example_ynh --- README.md | 5 ++--- README_fr.md | 13 ++++++------- check_process | 9 ++++----- issue_template.md | 35 ++++++++++++++++++++++------------- manifest.json | 4 ++-- pull_request_template.md | 4 +--- scripts/install | 23 ++++++++++++----------- scripts/restore | 1 + scripts/upgrade | 36 +++++------------------------------- 9 files changed, 55 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index dbb4ce6..6ed245f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Drupal 7 for YunoHost [![Integration level](https://dash.yunohost.org/integration/drupal7.svg)](https://dash.yunohost.org/appci/app/drupal7) ![](https://ci-apps.yunohost.org/ci/badges/drupal7.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/drupal7.maintain.svg) -[![Install Drupal 7 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=drupal7) +[![Install Drupal 7 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=drupal7) *[Lire ce readme en français.](./README_fr.md)* @@ -40,8 +40,7 @@ LDAP module can be installed --- -Developer info ----------------- +## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/drupal7_ynh/tree/testing). diff --git a/README_fr.md b/README_fr.md index 959ea2c..5ca57fc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,11 +1,11 @@ # Drupal 7 pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/drupal7.svg)](https://dash.yunohost.org/appci/app/drupal7) ![](https://ci-apps.yunohost.org/ci/badges/drupal7.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/drupal7.maintain.svg) -[![Installer Drupal 7 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=drupal7) +[![Installer drupal7 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=drupal7) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Drupal 7 rapidement et simplement sur un serveur Yunohost. +> *Ce package vous permet d'installer drupal7 rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* ## Vue d'ensemble @@ -29,19 +29,18 @@ Le module d'authentification LDAP peut être installé #### Architectures supportées -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/drupal7%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/drupal7/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/drupal7%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/drupal7/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/drupal7%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/drupal7/) ## Liens - * Signaler un bug: https://github.com/YunoHost-Apps/drupal7_ynh/issues - * Site de l'application: https://www.drupal.org + * Signaler un bug : https://github.com/YunoHost-Apps/drupal7_ynh/issues + * Site de l'application : https://www.drupal.org * Site web YunoHost: https://yunohost.org/ --- -Informations pour les développeurs ----------------- +## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/drupal7_ynh/tree/testing). diff --git a/check_process b/check_process index 4c603f4..1e94fbb 100644 --- a/check_process +++ b/check_process @@ -19,13 +19,12 @@ # upgrade=1 from_commit=89bf310b8ac87a61e5974508f2b41fbb32823e95 backup_restore=1 multi_instance=1 - # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. - # incorrect_path=1 port_already_use=0 change_url=1 -;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email=yalh@yahoo.com Notification=all +;;; Upgrade options + ; commit=89bf310b8ac87a61e5974508f2b41fbb32823e95 + name=Drupal 7 + diff --git a/issue_template.md b/issue_template.md index 559bd65..f049f2f 100644 --- a/issue_template.md +++ b/issue_template.md @@ -1,32 +1,34 @@ --- name: Bug report -about: Create a report to help us debug, it would be nice to fill the template as much as you can to help us, help you and help us all. +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. --- **How to post a meaningful bug report** 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change url...), you are on the right place!* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - *Otherwise, the issue may be due to Drupal 7 itself. Refer to its documentation or repository for help.* - - *If you have a doubt, post here, we will figure it out together.* + - *When in doubt, post here and we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- -**Describe the bug** +### Describe the bug + *A clear and concise description of what the bug is.* -**Versions** +### Context + - Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* - YunoHost version: x.x.x - I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - If yes, please explain: - Using, or trying to install package version/branch: - If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* -**To Reproduce** -*Steps to reproduce the behavior.* +### Steps to reproduce + - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh sudo yunohost app install drupal7 @@ -34,13 +36,20 @@ about: Create a report to help us debug, it would be nice to fill the template a - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* 1. *Go to '...'* - 2. *Click on '....'* - 3. *Scroll down to '....'* + 2. *Click on '...'* + 3. *Scroll down to '...'* 4. *See error* -**Expected behavior** +### Expected behavior + *A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* -**Logs** -*After a failed command, YunoHost makes the log available to you, but also to others, thanks to `yunohost log display [log name] --share`. The actual command, with the correct log name, is displayed at the end of the failed attempt in the CLI. Execute it and copy here the share link it outputs.* +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + *If applicable and useful, add screenshots to help explain your problem.* diff --git a/manifest.json b/manifest.json index 9e1cee1..053e32b 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,7 @@ "name": "yalh76" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 4.1.3" }, "multi_instance": true, "services": [ @@ -46,7 +46,7 @@ "type": "user", "ask": { "en": "Choose an admin user", - "fr": "Choisissez l’administrateur" + "fr": "Choisissez l'administrateur" }, "example": "johndoe" }, diff --git a/pull_request_template.md b/pull_request_template.md index a5a719b..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -13,6 +13,4 @@ ## Package_check results --- -*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* - -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/drupal7_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/drupal7_ynh%20PR-NUM-%20(USERNAME)/) +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/install b/scripts/install index c0ede39..1b37071 100644 --- a/scripts/install +++ b/scripts/install @@ -77,6 +77,14 @@ db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name +#================================================= +# CREATE FINAL PATH +#================================================= +ynh_script_progression --message="Creating final path..." + +ynh_app_setting_set --app=$app --key=final_path --value=$final_path +mkdir -p "$final_path/$app" + #================================================= # NGINX CONFIGURATION #================================================= @@ -93,14 +101,6 @@ ynh_script_progression --message="Configuring system user..." # Create a system user ynh_system_user_create --username=$app --home_dir="$final_path" -#================================================= -# CREATE FINAL PATH -#================================================= -ynh_script_progression --message="Creating final path..." - -ynh_app_setting_set --app=$app --key=final_path --value=$final_path -mkdir -p "$final_path/$app" - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -199,13 +199,14 @@ chown -R $app: $final_path #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." +ynh_script_progression --message="Configuring permissions..." # Make app public if necessary if [ $is_public -eq 1 ] then - # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" + # Everyone can access the app. + # The "main" permission is automatically created before the install script. + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/restore b/scripts/restore index 8824c5a..5888e8e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -86,6 +86,7 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated php-fpm config ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index 2f9da2f..97b2e36 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,7 +20,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) -is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) db_name=$(ynh_app_setting_get --app=$app --key=db_name) @@ -38,25 +37,11 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." -# Fix is_public as a boolean value -if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=1 - is_public=1 -elif [ "$is_public" = "No" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=0 - is_public=0 -fi +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all -# If db_name doesn't exist, create it -if [ -z "$db_name" ]; then - db_name=$(ynh_sanitize_dbid --db_name=$app) - ynh_app_setting_set --app=$app --key=db_name --value=$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=$app --key=final_path --value=$final_path + ynh_app_setting_delete --app=$app --key=is_public fi #================================================= @@ -105,6 +90,7 @@ ynh_script_progression --message="Upgrading php-fpm configuration..." # Create a dedicated php-fpm config ynh_add_fpm_config --package="$extra_php_dependencies" +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # SPECIFIC UPGRADE @@ -165,18 +151,6 @@ ynh_script_progression --message="Securing files and directories..." # Set permissions on app files chown -R $app: $final_path -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." - -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # unprotected_uris allows SSO credentials to be passed anyway - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" -fi - #================================================= # RELOAD NGINX #================================================= From dbbb8e7e3985a06ce73f586aad34f89f70dfb3d4 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 27 Feb 2021 21:09:33 +0100 Subject: [PATCH 02/11] Upgrade to 7.78 --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6ed245f..3d01ed2 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Free and open-source content management framework. -**Shipped version:** 7.73 +**Shipped version:** 7.78 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 5ca57fc..101fa67 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Framework de gestion de contenu libre et open-source. -**Version incluse:** 7.73 +**Version incluse:** 7.78 ## Captures d'écran diff --git a/manifest.json b/manifest.json index 053e32b..a69f7a1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Old version of a content management framework written in PHP", "fr": "Ancienne version d'un système de gestion de contenu écrit en PHP" }, - "version": "7.73~ynh1", + "version": "7.78~ynh1", "url": "https://www.drupal.org", "license": "GPL-2.0-or-later", "maintainer": { From f0b4d34314fe026b81a69e232aaf46d709dc0ebd Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 27 Feb 2021 21:11:03 +0100 Subject: [PATCH 03/11] Update check_process --- check_process | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 1e94fbb..6066771 100644 --- a/check_process +++ b/check_process @@ -15,8 +15,10 @@ setup_private=1 setup_public=1 upgrade=1 - # 7 + # 7.0~ynh1 # upgrade=1 from_commit=89bf310b8ac87a61e5974508f2b41fbb32823e95 + # 7.73~ynh1 + # upgrade=1 from_commit=6c565bad2d6083eac25eaee126d9eb32595d94b4 backup_restore=1 multi_instance=1 port_already_use=0 @@ -26,5 +28,6 @@ Email=yalh@yahoo.com Notification=all ;;; Upgrade options ; commit=89bf310b8ac87a61e5974508f2b41fbb32823e95 - name=Drupal 7 - + name=7.0~ynh1 + ; commit=6c565bad2d6083eac25eaee126d9eb32595d94b4 + name=7.73~ynh1 From 9f9564ef41273a242e678b69e856fd601f8b2b11 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 27 Feb 2021 21:18:39 +0100 Subject: [PATCH 04/11] ynh_add_config --- scripts/change_url | 9 ++------- scripts/install | 16 +++------------- scripts/upgrade | 7 +------ 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index c8bbf59..8b5c115 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -96,6 +96,7 @@ then mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf # Store file checksum for the new config file location ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" + domain="$new_domain" fi #================================================= @@ -105,13 +106,7 @@ fi #================================================= ynh_script_progression --message="Updating Drush alias..." -drush_aliasconfig="$final_path/.drush/$app.aliases.drushrc.php" -cp -f "../conf/yoursite.aliases.drushrc.php" "$drush_aliasconfig" - -ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="$drush_aliasconfig" -ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$drush_aliasconfig" -ynh_replace_string --match_string="__DOMAIN__" --replace_string="$new_domain" --target_file="$drush_aliasconfig" -ynh_replace_string --match_string="__PATH_URL__" --replace_string="$new_path" --target_file="$drush_aliasconfig" +ynh_add_config --template="../conf/yoursite.aliases.drushrc.php" --destination="$final_path/.drush/$app.aliases.drushrc.php" #================================================= # GENERIC FINALISATION diff --git a/scripts/install b/scripts/install index 1b37071..ed689eb 100644 --- a/scripts/install +++ b/scripts/install @@ -118,13 +118,8 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) ynh_script_progression --message="Creating Drush alias..." mkdir -p "$final_path/.drush" -drush_aliasconfig="$final_path/.drush/$app.aliases.drushrc.php" -cp -f "../conf/yoursite.aliases.drushrc.php" "$drush_aliasconfig" -ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="$drush_aliasconfig" -ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$drush_aliasconfig" -ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$drush_aliasconfig" -ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="$drush_aliasconfig" +ynh_add_config --template="../conf/yoursite.aliases.drushrc.php" --destination="$final_path/.drush/$app.aliases.drushrc.php" #================================================= # INSTALL COMPOSER @@ -133,9 +128,7 @@ ynh_script_progression --message="Installing Composer..." mkdir -p "$final_path/.composer" -cp -f "../conf/composer.json" "$final_path/.composer/composer.json" - -ynh_install_composer --phpversion="$phpversion" --workdir="$final_path/.composer" +ynh_add_config --template="../conf/composer.json" --destination="$final_path/.composer/composer.json" export PATH="$final_path/.composer/vendor/bin:$PATH" @@ -173,10 +166,7 @@ update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION} #================================================= ynh_script_progression --message="Setuping the cron file..." -cp ../conf/cron /etc/cron.d/$app - -ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="/etc/cron.d/$app" -ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="/etc/cron.d/$app" +ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" #================================================= # STORE THE CONFIG FILE CHECKSUM diff --git a/scripts/upgrade b/scripts/upgrade index 97b2e36..d400919 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -134,12 +134,7 @@ ynh_store_file_checksum --file="$final_path/$app/sites/default/settings.php" #================================================= ynh_script_progression --message="Setuping the cron file" -cp -f ../conf/cron /etc/cron.d/$app - -ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="/etc/cron.d/$app" -ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="/etc/cron.d/$app" - -ynh_systemd_action --service_name=cron --action=reload +ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" #================================================= # GENERIC FINALIZATION From 0173de01ad9b6068a6f3dbb5539ed4535e765823 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 28 Feb 2021 09:54:07 +0100 Subject: [PATCH 05/11] Update manifest.json --- manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.json b/manifest.json index a69f7a1..991b442 100644 --- a/manifest.json +++ b/manifest.json @@ -18,6 +18,7 @@ "multi_instance": true, "services": [ "nginx", + "php7.3-fpm", "mysql" ], "arguments": { From 6771a76e36013bc8a0f938b792241e190a69350f Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 28 Feb 2021 09:54:40 +0100 Subject: [PATCH 06/11] Update upgrade --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index d400919..3f36ef7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,7 +23,6 @@ admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK VERSION From 1ba6f41db27a74d051645473df5a234cbf58aa86 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 28 Feb 2021 09:55:22 +0100 Subject: [PATCH 07/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d01ed2..340a181 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Free and open-source content management framework. ## YunoHost specific features -#### Multi-users support +#### Multi-user support LDAP module can be installed From 3fdf7824c496aac816559bb95721d288e80e848e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 28 Feb 2021 11:17:38 +0100 Subject: [PATCH 08/11] Update change_url --- scripts/change_url | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/change_url b/scripts/change_url index 8b5c115..3ecc370 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -97,6 +97,7 @@ then # Store file checksum for the new config file location ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" domain="$new_domain" + path_url="$new_path" fi #================================================= From 4886fd0d4fff9e7f44f0b05a90ed10742827f726 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 28 Feb 2021 18:14:32 +0100 Subject: [PATCH 09/11] YunoHost 4.2 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 991b442..020f831 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,7 @@ "name": "yalh76" }, "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.2" }, "multi_instance": true, "services": [ From 868272f6dfc0a0ccac75982b224628564f10123e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 2 Mar 2021 08:19:11 +0100 Subject: [PATCH 10/11] YunoHost 4.1.7.3 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 020f831..62c6aca 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,7 @@ "name": "yalh76" }, "requirements": { - "yunohost": ">= 4.2" + "yunohost": ">= 4.1.7.3" }, "multi_instance": true, "services": [ From f6efa7a3ee747f752ffbbf32f548f6d8f7e06a37 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 4 Mar 2021 01:25:38 +0100 Subject: [PATCH 11/11] Fix install --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index ed689eb..5cbb994 100644 --- a/scripts/install +++ b/scripts/install @@ -130,6 +130,8 @@ mkdir -p "$final_path/.composer" ynh_add_config --template="../conf/composer.json" --destination="$final_path/.composer/composer.json" +ynh_install_composer --phpversion="$phpversion" --workdir="$final_path/.composer" + export PATH="$final_path/.composer/vendor/bin:$PATH" #=================================================