From 506fcc14c02f62478130f00cb861a2f4fa018c61 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 16 Nov 2021 00:50:35 +0100 Subject: [PATCH] Propagate renaming for hostapd conf templates --- scripts/backup | 3 ++- scripts/install | 2 +- scripts/remove | 2 +- scripts/upgrade | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/backup b/scripts/backup index eb44588..8284b04 100644 --- a/scripts/backup +++ b/scripts/backup @@ -40,10 +40,11 @@ ynh_print_info --message="Declaring files to be backed up..." # BACKUP THE APP MAIN DIR #================================================= -for FILE in $(ls /etc/hostapd/hostapd.conf{.tpl?,} 2>/dev/null) +for FILE in $(ls /etc/hostapd/hostapd.*.conf 2>/dev/null) do ynh_backup --src_path="$FILE" done + ynh_backup --src_path="/etc/dnsmasq.dhcpd/dhcpdv6.conf.tpl" ynh_backup --src_path="/etc/dnsmasq.dhcpd/dhcpdv4.conf.tpl" diff --git a/scripts/install b/scripts/install index d516f72..e9ab243 100644 --- a/scripts/install +++ b/scripts/install @@ -158,7 +158,7 @@ ynh_script_progression --message="Copying configuration files..." mkdir -pm 0755 /etc/dnsmasq.dhcpd/ chown root: /etc/dnsmasq.dhcpd/ -install -b -o root -g root -m 0644 ../conf/hostapd.conf.tpl? /etc/hostapd/ +install -b -o root -g root -m 0644 ../conf/hostapd.*.conf /etc/hostapd/ install -b -o root -g root -m 0644 ../conf/dnsmasq_dhcpdv6.conf.tpl /etc/dnsmasq.dhcpd/dhcpdv6.conf.tpl install -b -o root -g root -m 0644 ../conf/dnsmasq_dhcpdv4.conf.tpl /etc/dnsmasq.dhcpd/dhcpdv4.conf.tpl diff --git a/scripts/remove b/scripts/remove index 2238e07..4ccfd27 100644 --- a/scripts/remove +++ b/scripts/remove @@ -65,7 +65,7 @@ done # Remove confs ynh_secure_remove --file="/etc/dnsmasq.dhcpd/dhcpdv6.conf.tpl" ynh_secure_remove --file="/etc/dnsmasq.dhcpd/dhcpdv4.conf.tpl" -for FILE in $(ls /etc/hostapd/hostapd.conf{.tpl?,} 2>/dev/null) +for FILE in $(ls /etc/hostapd/hostapd.*.conf 2>/dev/null) do ynh_secure_remove --file="$FILE" done diff --git a/scripts/upgrade b/scripts/upgrade index d193da8..519721e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -134,7 +134,7 @@ ynh_script_progression --message="Copying configuration..." mkdir -pm 0755 /etc/dnsmasq.dhcpd/ chown root: /etc/dnsmasq.dhcpd/ -install -b -o root -g root -m 0644 ../conf/hostapd.conf.tpl? /etc/hostapd/ +install -b -o root -g root -m 0644 ../conf/hostapd.*.conf /etc/hostapd/ install -b -o root -g root -m 0644 ../conf/dnsmasq_dhcpdv6.conf.tpl /etc/dnsmasq.dhcpd/dhcpdv6.conf.tpl install -b -o root -g root -m 0644 ../conf/dnsmasq_dhcpdv4.conf.tpl /etc/dnsmasq.dhcpd/dhcpdv4.conf.tpl