1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/roundcube_ynh.git synced 2024-09-03 20:16:28 +02:00

Revert "Add_config"

This reverts commit 51efcc2604.
This commit is contained in:
ericgaspar 2021-08-18 19:20:42 +02:00
parent 80d82e205e
commit 38c348291d
No known key found for this signature in database
GPG key ID: 574F281483054D44
2 changed files with 27 additions and 8 deletions

View file

@ -124,11 +124,16 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name
#================================================= #=================================================
# CONFIGURE ROUNDCUBE # CONFIGURE ROUNDCUBE
#================================================= #=================================================
ynh_script_progression --message="Configuring Roundcube..." --weight=2 ynh_script_progression --message="Configuring Roundcube..."
file="__FILE__" rc_conf="$final_path/config/config.inc.php"
deskey=$(ynh_string_random --length=24)
ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" cp ../conf/config.inc.php "$rc_conf"
ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf"
ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf"
ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf"
ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf"
#================================================= #=================================================
# INSTALL ADDITIONAL PLUGINS # INSTALL ADDITIONAL PLUGINS
@ -209,6 +214,9 @@ ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&
(cd "$final_path" (cd "$final_path"
/usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh)
# Store the config file checksum into the app settings
ynh_store_file_checksum --file="$final_path/config/config.inc.php"
chmod 400 "$final_path/config/config.inc.php" chmod 400 "$final_path/config/config.inc.php"
chown $app:$app "$final_path/config/config.inc.php" chown $app:$app "$final_path/config/config.inc.php"

View file

@ -152,11 +152,19 @@ ynh_add_fpm_config --package="$extra_php_dependencies"
if [ "$upgrade_type" == "UPGRADE_APP" ] if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
ynh_script_progression --message="Reconfiguring Roundcube..." --weight=3 ynh_script_progression --message="Reconfiguring Roundcube..."
file="__FILE__" rc_conf="$final_path/config/config.inc.php"
deskey=$(ynh_string_random --length=24)
ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" # Verify the checksum and backup the file if it's different
ynh_backup_if_checksum_is_different "$rc_conf"
cp ../conf/config.inc.php "$rc_conf"
ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf"
ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf"
ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf"
ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf"
#================================================= #=================================================
# UPDATE DEPENDENCIES WITH COMPOSER # UPDATE DEPENDENCIES WITH COMPOSER
@ -254,6 +262,9 @@ then
(cd "$final_path" (cd "$final_path"
/usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh)
# Store the config file checksum into the app settings
ynh_store_file_checksum --file="$final_path/config/config.inc.php"
chmod 400 "$final_path/config/config.inc.php" chmod 400 "$final_path/config/config.inc.php"
chown $app:$app "$final_path/config/config.inc.php" chown $app:$app "$final_path/config/config.inc.php"