Просмотр исходного кода

Merge branch 'Mickael-Martin-master-patch-99362' into 'master'

Update install cp --remove-destination "$confServerPath" /usr/share/zabbix/conf/zabbix.conf.php

See merge request Mickael-Martin/zabbix_ynh!48
Mickael-Martin 5 лет назад
Родитель
Сommit
4a72777c3c
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      scripts/install

+ 1 - 1
scripts/install

@@ -284,7 +284,7 @@ systemctl reload nginx
 ynh_script_progression -m "Generate zabbix config files" -w 5
 
 confServerPath=$(find /var/cache/yunohost/ -name "usr_share_zabbix_conf_zabbix.conf.php")
-cp "$confServerPath" /usr/share/zabbix/conf/zabbix.conf.php
+cp --remove-destination "$confServerPath" /usr/share/zabbix/conf/zabbix.conf.php
 ynh_replace_string --match_string="db_name" --replace_string="$db_name" --target_file=/usr/share/zabbix/conf/zabbix.conf.php
 ynh_replace_string --match_string="db_user" --replace_string="$db_user" --target_file=/usr/share/zabbix/conf/zabbix.conf.php
 ynh_replace_string --match_string="db_pwd" --replace_string="$db_pwd" --target_file=/usr/share/zabbix/conf/zabbix.conf.php