mirror of
https://github.com/YunoHost-Apps/headscale_ynh.git
synced 2024-09-03 19:25:53 +02:00
Do not override resolvconf, use dnsmasq
This commit is contained in:
parent
7bc540d6a4
commit
ebc156f1a7
6 changed files with 37 additions and 0 deletions
4
conf/dnsmasq
Normal file
4
conf/dnsmasq
Normal file
|
@ -0,0 +1,4 @@
|
|||
# Created by __APP__
|
||||
# We assume that only one tailscale installation exists on the server, replace `tailscale0` below if needed
|
||||
interface=tailscale0
|
||||
server=/__BASE_DOMAIN__/100.100.100.100
|
|
@ -41,6 +41,12 @@ ynh_backup --src_path="/etc/logrotate.d/$app"
|
|||
|
||||
ynh_backup --src_path="/etc/systemd/system/$app.service"
|
||||
|
||||
#=================================================
|
||||
# BACKUP DNSMASQ CONFIG
|
||||
#=================================================
|
||||
|
||||
ynh_backup --src_path="/etc/dnsmasq.d/$app"
|
||||
|
||||
#=================================================
|
||||
# BACKUP THE DATABASE
|
||||
#=================================================
|
||||
|
|
|
@ -75,6 +75,10 @@ ynh_add_config --template="config.yaml" --destination="$install_dir/config.yaml"
|
|||
chmod 600 "$install_dir/config.yaml"
|
||||
chown $app:$app "$install_dir/config.yaml"
|
||||
|
||||
# Add dnsmasq configuration to avoid overriding resolvconf
|
||||
ynh_add_config --template="dnsmasq" --destination="/etc/dnsmasq.d/$app"
|
||||
ynh_systemd_action --service_name="dnsmasq" --action="reload"
|
||||
|
||||
#=================================================
|
||||
# SETUP SYSTEMD
|
||||
#=================================================
|
||||
|
|
|
@ -73,6 +73,10 @@ ynh_script_progression --message="Removing various files..." --weight=1
|
|||
# Remove the log files
|
||||
ynh_secure_remove --file="/var/log/$app"
|
||||
|
||||
# Remove dnsmasq configuration
|
||||
ynh_secure_remove --file="/etc/dnsmasq.d/$app"
|
||||
ynh_systemd_action --service_name=dnsmasq --action="reload"
|
||||
|
||||
#=================================================
|
||||
# GENERIC FINALIZATION
|
||||
#=================================================
|
||||
|
|
|
@ -46,6 +46,14 @@ ynh_script_progression --message="Restoring the logrotate configuration..." --we
|
|||
|
||||
ynh_restore_file --origin_path="/etc/logrotate.d/$app"
|
||||
|
||||
#=================================================
|
||||
# RESTORE THE DNSMASQ CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Restoring the dnsmasq configuration..." --weight=1
|
||||
|
||||
ynh_restore_file --origin_path="/etc/dnsmasq.d/$app"
|
||||
ynh_systemd_action --service_name="dnsmasq" --action="reload"
|
||||
|
||||
#=================================================
|
||||
# INTEGRATE SERVICE IN YUNOHOST
|
||||
#=================================================
|
||||
|
|
|
@ -13,6 +13,17 @@ upgrade_type=$(ynh_check_app_version_changed)
|
|||
|
||||
#=================================================
|
||||
# STANDARD UPGRADE STEPS
|
||||
#=================================================
|
||||
# ENSURE DOWNWARD COMPATIBILITY
|
||||
#=================================================
|
||||
ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
|
||||
|
||||
if [ ! -f "/etc/dnsmasq.d/$app" ]; then
|
||||
# Add dnsmasq configuration to avoid overriding resolvconf
|
||||
ynh_add_config --template="dnsmasq" --destination="/etc/dnsmasq.d/$app"
|
||||
ynh_systemd_action --service_name="dnsmasq" --action="reload"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
# STOP SYSTEMD SERVICE
|
||||
#=================================================
|
||||
|
|
Loading…
Reference in a new issue