From 8015e9a8da59f839a33e8520ff35ebfce5e5277b Mon Sep 17 00:00:00 2001 From: HgO Date: Sat, 17 Aug 2024 09:44:46 +0200 Subject: [PATCH] fix template paths --- scripts/install | 6 +++--- scripts/restore | 1 + scripts/upgrade | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 57b9110..24ab84f 100644 --- a/scripts/install +++ b/scripts/install @@ -113,9 +113,9 @@ touch /etc/hostapd/$app/allowed.csv ynh_add_config --template="../conf/ynh-hotspot" --destination="/usr/local/bin/$service_name" chmod 0755 "/usr/local/bin/$service_name" -ynh_add_config --template="../conf/captiveportal_fakedns" --destination="/usr/local/bin/captiveportal_fakedns" +ynh_add_config --template="../sources/captiveportal_fakedns" --destination="/usr/local/bin/captiveportal_fakedns" chmod 0755 "/usr/local/bin/captiveportal_fakedns" -ynh_add_config --template="../conf/captiveportal_allow" --destination="/usr/local/bin/captiveportal_allow" +ynh_add_config --template="../sources/captiveportal_allow" --destination="/usr/local/bin/captiveportal_allow" chmod 0755 "/usr/local/bin/captiveportal_allow" # Copy openvpn scripts @@ -154,7 +154,7 @@ ynh_add_systemd_config --service=$service_name ynh_add_systemd_config --service="hostapd@$app" --template="../conf/systemd_hostapd.service" yunohost service add $service_name --description "Creates a Wi-Fi access point" --test_status "systemctl is-active hostapd@$app" --need_lock -ynh_add_systemd_config --service="captiveportal_fakedns" --template="captiveportal_fakedns" +ynh_add_systemd_config --service="captiveportal_fakedns" --template="../conf/captiveportal_fakedns.service" yunohost service add captiveportal_fakedns --description "Captive portal dns service" --test_status "systemctl is-active captiveportal_fakedns" #================================================= diff --git a/scripts/restore b/scripts/restore index 6a60840..d3a612d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -43,6 +43,7 @@ ynh_script_progression --message="Restoring configurations ..." ynh_restore yunohost service add "$service_name" --description "Creates a Wi-Fi access point" --test_status "systemctl is-active hostapd@$app" --need_lock +yunohost service add captiveportal_fakedns --description "Captive portal dns service" --test_status "systemctl is-active captiveportal_fakedns" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index a6a2e61..d41a8f7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -181,9 +181,9 @@ fi ynh_add_config --template="../conf/ynh-hotspot" --destination="/usr/local/bin/$service_name" chmod 0755 "/usr/local/bin/$service_name" -ynh_add_config --template="../conf/captiveportal_fakedns" --destination="/usr/local/bin/captiveportal_fakedns" +ynh_add_config --template="../sources/captiveportal_fakedns" --destination="/usr/local/bin/captiveportal_fakedns" chmod 0755 "/usr/local/bin/captiveportal_fakedns" -ynh_add_config --template="../conf/captiveportal_allow" --destination="/usr/local/bin/captiveportal_allow" +ynh_add_config --template="../sources/captiveportal_allow" --destination="/usr/local/bin/captiveportal_allow" chmod 0755 "/usr/local/bin/captiveportal_allow" # Copy openvpn scripts @@ -207,7 +207,7 @@ ynh_add_systemd_config --service="hostapd@$app" --template="../conf/systemd_host yunohost service add $service_name --description "Creates a Wi-Fi access point" --test_status "systemctl is-active hostapd@$app" --need_lock -ynh_add_systemd_config --service="captiveportal_fakedns" --template="captiveportal_fakedns" +ynh_add_systemd_config --service="captiveportal_fakedns" --template="../conf/captiveportal_fakedns.service" yunohost service add captiveportal_fakedns --description "Captive portal dns service" --test_status "systemctl is-active captiveportal_fakedns" #=================================================