From 20cf7c2b4f8c4eb90852e45946ee07919ac6ee5e Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 23 Feb 2023 23:39:06 +0100 Subject: [PATCH 1/7] [autopatch] Upgrade auto-updater --- .github/workflows/updater.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index fb72ba0..a56d7cb 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Run the updater script @@ -33,7 +33,7 @@ jobs: - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} From b31bd95f6d1f3731a82186b6547380d8a1c7bc10 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 2 Nov 2023 21:27:24 +0000 Subject: [PATCH 2/7] Auto-update README --- README.md | 5 +++-- README_fr.md | 23 ++++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index bbe8e4f..488ed1f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Horde for YunoHost -[![Integration level](https://dash.yunohost.org/integration/horde.svg)](https://dash.yunohost.org/appci/app/horde) ![Working status](https://ci-apps.yunohost.org/ci/badges/horde.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/horde.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/horde.svg)](https://dash.yunohost.org/appci/app/horde) ![Working status](https://ci-apps.yunohost.org/ci/badges/horde.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/horde.maintain.svg) + [![Install Horde with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=horde) *[Lire ce readme en français.](./README_fr.md)* @@ -84,7 +85,7 @@ For calendar, task and addressbook activeSync has been configured but not yet te * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 5a00632..0a51d34 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # Horde pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/horde.svg)](https://dash.yunohost.org/appci/app/horde) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/horde.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/horde.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/horde.svg)](https://dash.yunohost.org/appci/app/horde) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/horde.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/horde.maintain.svg) + [![Installer Horde avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=horde) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Horde rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Horde rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble A groupware (webmail, adressbook, calendar) witch use PHP @@ -22,9 +23,9 @@ A groupware (webmail, adressbook, calendar) witch use PHP **Démo :** http://demo.horde.org -## Captures d'écran +## Captures d’écran -![Capture d'écran de Horde](./doc/screenshots/screenshot.png) +![Capture d’écran de Horde](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes @@ -81,10 +82,10 @@ For calendar, task and addressbook activeSync has been configured but not yet te ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : -* Documentation YunoHost pour cette app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs @@ -99,4 +100,4 @@ ou sudo yunohost app upgrade horde -u https://github.com/YunoHost-Apps/horde_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From f5de0a667d5f000ce1d18562c30e8cdc3763f5e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 22:30:09 +0100 Subject: [PATCH 3/7] Update _common.sh --- scripts/_common.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 7fbedc0..d1dec6b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,9 @@ # PHP APP SPECIFIC #================================================= -php_dependencies="php$YNH_DEFAULT_PHP_VERSION-pear php$YNH_DEFAULT_PHP_VERSION-imagick php$YNH_DEFAULT_PHP_VERSION-tidy php$YNH_DEFAULT_PHP_VERSION-bcmath" +YNH_PHP_VERSION="7.4" + +php_dependencies="php$YNH_PHP_VERSION-pear php$YNH_PHP_VERSION-imagick php$YNH_PHP_VERSION-tidy php$YNH_PHP_VERSION-bcmath" # dependencies used by the app (must be on a single line) pkg_dependencies="expect $php_dependencies" From 80eed534ea338bcbfb099659f7d5f5c678af5505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 22:32:54 +0100 Subject: [PATCH 4/7] cleaning --- conf/horde_conf.php | 2 +- scripts/_common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/horde_conf.php b/conf/horde_conf.php index b4d1bdd..005a002 100644 --- a/conf/horde_conf.php +++ b/conf/horde_conf.php @@ -22,7 +22,7 @@ $conf['session']['max_time'] = 72000; $conf['cookie']['domain'] = $_SERVER['SERVER_NAME']; $conf['cookie']['path'] = '__PATH__'; $conf['sql']['username'] = '__DB_USER__'; -$conf['sql']['password'] = '__DB_PASSWORD__'; +$conf['sql']['password'] = '__DB_PWD__'; $conf['sql']['hostspec'] = 'localhost'; $conf['sql']['port'] = 3306; $conf['sql']['protocol'] = 'tcp'; diff --git a/scripts/_common.sh b/scripts/_common.sh index d1dec6b..419f832 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -36,7 +36,7 @@ config_horde() { ynh_replace_string --match_string __FINAL_PATH__ --replace_string "$final_path" --target_file "$final_path/horde/config/conf.php" ynh_replace_string --match_string __DB_NAME__ --replace_string "$db_name" --target_file "$final_path/horde/config/conf.php" ynh_replace_string --match_string __DB_USER__ --replace_string "$db_user" --target_file "$final_path/horde/config/conf.php" - ynh_replace_string --match_string __DB_PASSWORD__ --replace_string "$db_pwd" --target_file "$final_path/horde/config/conf.php" + ynh_replace_string --match_string __DB_PWD__ --replace_string "$db_pwd" --target_file "$final_path/horde/config/conf.php" ynh_replace_string --match_string __ADMIN_USER__ --replace_string "$admin" --target_file "$final_path/horde/config/conf.php" ynh_replace_string --match_string __SECRET_KEY__ --replace_string "$secret_key" --target_file "$final_path/horde/config/conf.php" From bc9f8cf45847b57246eda8853603071aa6d75185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 22:48:16 +0100 Subject: [PATCH 5/7] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 419f832..e0d1b2d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -11,7 +11,7 @@ YNH_PHP_VERSION="7.4" php_dependencies="php$YNH_PHP_VERSION-pear php$YNH_PHP_VERSION-imagick php$YNH_PHP_VERSION-tidy php$YNH_PHP_VERSION-bcmath" # dependencies used by the app (must be on a single line) -pkg_dependencies="expect $php_dependencies" +pkg_dependencies="expect php-pear $php_dependencies" #================================================= # PERSONAL HELPERS From 42dd7881c911f990a1875c289a5384c7538b4ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 27 Feb 2024 14:00:23 +0100 Subject: [PATCH 6/7] Fix: php-pear is not versionned --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index e0d1b2d..1c226dc 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,7 +8,7 @@ YNH_PHP_VERSION="7.4" -php_dependencies="php$YNH_PHP_VERSION-pear php$YNH_PHP_VERSION-imagick php$YNH_PHP_VERSION-tidy php$YNH_PHP_VERSION-bcmath" +php_dependencies="php-pear php$YNH_PHP_VERSION-imagick php$YNH_PHP_VERSION-tidy php$YNH_PHP_VERSION-bcmath" # dependencies used by the app (must be on a single line) pkg_dependencies="expect php-pear $php_dependencies" From baf4e768d8842691656a3ebc226055a6dc269ef1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 27 Feb 2024 13:00:32 +0000 Subject: [PATCH 7/7] Auto-update README --- README.md | 4 ++-- README_fr.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 488ed1f..a6fd795 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -100,4 +100,4 @@ or sudo yunohost app upgrade horde -u https://github.com/YunoHost-Apps/horde_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 0a51d34..c7fb971 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@