YunoHost-Apps/zabbix_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/zabbix_ynh.git synced 2024-09-03 20:36:14 +02:00
Code Issues Activity Actions

Merge branch 'delete-rmfr' into 'master'

Browse source 
Delete rm command to ynh_secure_remove

See merge request Mickael-Martin/zabbix_ynh!45
This commit is contained in:
Mickael-Martin 2020-11-26 13:33:19 +01:00
commit 34d4a69870
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/install
View file

@ -97,7 +97,7 @@ ynh_app_setting_set "$app" language "$language"
### - And the section "UPGRADE DEPENDENCIES" in the upgrade script ### - And the section "UPGRADE DEPENDENCIES" in the upgrade script
ynh_script_progression --message="Remove Zabbix if already installed" -w 1 ynh_script_progression --message="Remove Zabbix if already installed" -w 1
apt-get purge zabbix* -y apt-get purge zabbix* -y
rm -fr /var/cache/apt/archives/zabbix-server-mysql* ynh_secure_remove /var/cache/apt/archives/zabbix-server-mysql*
ynh_script_progression --message="Install Zabbix repository" -w 3 ynh_script_progression --message="Install Zabbix repository" -w 3
install_zabbix_repo install_zabbix_repo
@ -111,7 +111,7 @@ ynh_replace_string --match_string="# fr_FR.UTF-8 UTF-8" --replace_string="fr_FR.
locale-gen locale-gen
ln -s /usr/share/zabbix "$final_path" ln -s /usr/share/zabbix "$final_path"
rm "$final_path/conf/zabbix.conf.php" ynh_secure_remove "$final_path/conf/zabbix.conf.php"
#================================================= #=================================================
# CREATE A MYSQL DATABASE # CREATE A MYSQL DATABASE

4
scripts/restore
View file

@ -33,7 +33,7 @@ final_path="/var/www/zabbix"
### If the app uses nginx as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app". ### If the app uses nginx as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app".
### If the app provides an internal web server (or uses another application server such as uwsgi), the final path should be "/opt/yunohost/$app" ### If the app provides an internal web server (or uses another application server such as uwsgi), the final path should be "/opt/yunohost/$app"
rm -fr $final_path ynh_secure_remove $final_path
#================================================= #=================================================
# STORE SETTINGS FROM MANIFEST # STORE SETTINGS FROM MANIFEST
@ -64,7 +64,7 @@ ynh_replace_string --match_string="# fr_FR.UTF-8 UTF-8" --replace_string="fr_FR.
locale-gen locale-gen
ln -s /usr/share/zabbix /var/www/zabbix ln -s /usr/share/zabbix /var/www/zabbix
rm $final_path/conf/zabbix.conf.php ynh_secure_remove $final_path/conf/zabbix.conf.php
ynh_app_setting_set $app final_path $final_path ynh_app_setting_set $app final_path $final_path

4
scripts/upgrade
View file

@ -154,11 +154,11 @@ then
ynh_print_info "Update zabbix via apt package" ynh_print_info "Update zabbix via apt package"
ynh_install_app_dependencies libapr1 libaprutil1 libaprutil1-dbd-sqlite3 libaprutil1-ldap liblua5.2-0 ttf-dejavu-core php7.0-bcmath patch smistrip unzip wget fping libcap2-bin libiksemel3 libopenipmi0 libpam-cap libsnmp-base libsnmp30 snmptrapd snmpd libjs-prototype jq zabbix-server-mysql zabbix-agent zabbix-frontend-php ynh_install_app_dependencies libapr1 libaprutil1 libaprutil1-dbd-sqlite3 libaprutil1-ldap liblua5.2-0 ttf-dejavu-core php7.0-bcmath patch smistrip unzip wget fping libcap2-bin libiksemel3 libopenipmi0 libpam-cap libsnmp-base libsnmp30 snmptrapd snmpd libjs-prototype jq zabbix-server-mysql zabbix-agent zabbix-frontend-php
rm /usr/share/zabbix/conf/zabbix.conf.php ynh_secure_remove /usr/share/zabbix/conf/zabbix.conf.php
cp -rpf /tmp/zabbix /etc/ cp -rpf /tmp/zabbix /etc/
cp -pf /tmp/zabbix.conf.php /usr/share/zabbix/conf/ cp -pf /tmp/zabbix.conf.php /usr/share/zabbix/conf/
rm -fr /tmp/zabbix* ynh_secure_remove /tmp/zabbix*
#If needed. #If needed.
yunohost service add snmpd -d "Management of SNMP Daemon" yunohost service add snmpd -d "Management of SNMP Daemon"