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 }} 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 @@ 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 7fbedc0..1c226dc 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,10 +6,12 @@ # 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-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 @@ -34,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"