From 2f363dbc2545f04cc709561a7645b82a737519c8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 18 Apr 2021 11:34:37 +0200 Subject: [PATCH] Add ynh_add_config --- README.md | 4 ++-- scripts/install | 8 +++++--- scripts/upgrade | 12 +++++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index fd4a536..68eba47 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,8 @@ In addition to Piwigo core features, the following are made available with this #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/piwigo%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/piwigo/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/piwigo%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/piwigo/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/piwigo.svg)](https://ci-apps.yunohost.org/ci/apps/piwigo/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/piwigo.svg)](https://ci-apps-arm.yunohost.org/ci/apps/piwigo/) ## Limitations diff --git a/scripts/install b/scripts/install index 63de718..06bda40 100644 --- a/scripts/install +++ b/scripts/install @@ -175,16 +175,18 @@ ynh_local_curl "/install.php?language=$applanguage" "install=true" "dbuser=$db_n ynh_script_progression --message="Configuring Piwigo..." # Change local config -cp ../conf/config.inc.php $final_path/local/config/ +#cp ../conf/config.inc.php $final_path/local/config/ # Calculate and store the config file checksum -ynh_store_file_checksum --file="$final_path/local/config/config.inc.php" +#ynh_store_file_checksum --file="$final_path/local/config/config.inc.php" + +ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/local/config/config.inc.php" # Setup database in local/config/database.inc.php ynh_add_config --template="../conf/database.inc.php" --destination="$final_path/local/config/database.inc.php" # Calculate and store the database config file checksum -ynh_store_file_checksum --file="$final_path/local/config/database.inc.php" +#ynh_store_file_checksum --file="$final_path/local/config/database.inc.php" #================================================= # ADD LDAP PLUGIN diff --git a/scripts/upgrade b/scripts/upgrade index d840c9a..658b732 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -215,21 +215,23 @@ ynh_local_curl "/upgrade.php?language=$applanguage&now=true" "language=$applangu ynh_script_progression --message="Configuring Piwigo..." # Make a backup of the original config file if modified -ynh_backup_if_checksum_is_different --file="$final_path/local/config/config.inc.php" +#ynh_backup_if_checksum_is_different --file="$final_path/local/config/config.inc.php" # Change local config -cp ../conf/config.inc.php $final_path/local/config/ +#cp ../conf/config.inc.php $final_path/local/config/ # Calculate and store the config file checksum -ynh_store_file_checksum --file="$final_path/local/config/config.inc.php" +#ynh_store_file_checksum --file="$final_path/local/config/config.inc.php" + +ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/local/config/config.inc.php" # Make a backup of the original database config file if modified -ynh_backup_if_checksum_is_different --file="$final_path/local/config/database.inc.php" +#ynh_backup_if_checksum_is_different --file="$final_path/local/config/database.inc.php" ynh_add_config --template="../conf/database.inc.php" --destination="$final_path/local/config/database.inc.php" # Calculate and store the database config file checksum -ynh_store_file_checksum --file="$final_path/local/config/database.inc.php" +#ynh_store_file_checksum --file="$final_path/local/config/database.inc.php" #================================================= # CONFIGURE LDAP PLUGIN