Browse Source

fix cleanup

HgO 1 year ago
parent
commit
8f6da7c103
2 changed files with 3 additions and 12 deletions
  1. 2 8
      scripts/remove
  2. 1 4
      scripts/upgrade

+ 2 - 8
scripts/remove

@@ -64,14 +64,8 @@ do
 done
 
 # Remove confs
-ynh_secure_remove --file="/etc/dnsmasq.$app/dhcpdv6.conf.tpl"
-ynh_secure_remove --file="/etc/dnsmasq.$app/dhcpdv6.conf"
-
-ynh_secure_remove --file="/etc/dnsmasq.$app/dhcpdv4.conf.tpl"
-ynh_secure_remove --file="/etc/dnsmasq.$app/dhcpdv4.conf"
-
-ynh_secure_remove --file="/etc/hostapd/$app/hostapd.conf.tpl"
-ynh_secure_remove --file="/etc/hostapd/$app/hostapd.conf"
+ynh_secure_remove --file="/etc/dnsmasq.$app/"
+ynh_secure_remove --file="/etc/hostapd/$app/"
 
 #=================================================
 # CLOSE A PORT

+ 1 - 4
scripts/upgrade

@@ -123,10 +123,7 @@ fi
 ynh_secure_remove --file="/etc/hostapd/hostapd.conf"
 ynh_secure_remove --file="/etc/hostapd/hostapd.base.conf"
 ynh_secure_remove --file="/etc/hostapd/hostapd.accesspoint.conf"
-
-for FILE in $(ls /etc/dnsmasq.dhcpd/*.conf 2>/dev/null); do
-    ynh_secure_remove --file="$FILE"
-done
+ynh_secure_remove --file="/etc/dnsmasq.dhcpd/"
 
 # Old stuff prior to 2.x