From 02b0461bbc585965bf22f0d672783b2a3d694bb8 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 16 May 2024 09:24:20 +0200 Subject: [PATCH] reset port_https because it's not relevant --- conf/AdGuardHome.yaml | 2 +- manifest.toml | 1 - scripts/upgrade | 5 +++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/conf/AdGuardHome.yaml b/conf/AdGuardHome.yaml index c121c05..54e8b30 100644 --- a/conf/AdGuardHome.yaml +++ b/conf/AdGuardHome.yaml @@ -75,7 +75,7 @@ tls: enabled: __DNS_OVER_HTTPS__ server_name: "__DOMAIN__" force_https: false - port_https: __PORT_INTERNAL_HTTPS__ + port_https: 0 port_dns_over_tls: __PORT_DNS_OVER_TLS__ port_dns_over_quic: __PORT_DNS_OVER_QUIC__ port_dnscrypt: 0 diff --git a/manifest.toml b/manifest.toml index 061c021..25e5ca8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -81,7 +81,6 @@ dns_over_tls.fixed = true dns_over_quic.default = 784 dns_over_quic.exposed = "UDP" dns_over_quic.fixed = true -internal_https.default = 13120 # dummy port because the app settings requiring it # AGH also uses port 53 but we can't put it here as dnsmasq uses it by default # and the ynh core would assign us another port, however, on installation we # edit dnsmasq's configuration to allow AGH to use port 53 on non-localhost IPs diff --git a/scripts/upgrade b/scripts/upgrade index 7362a7a..77a0627 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -29,6 +29,11 @@ ynh_systemd_action --service_name="$app" --action="stop" #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 +# to remove some time in the future (DoH PR during testing phase residual) +if ! grep -q "port_https: 0"; then + ynh_write_var_in_file --file="$install_dir/AdGuardHome.yaml" --key="port_https" --value="0" +fi + if [ -z "${expose_port_53:-}" ] || [ "${expose_port_53:-}" = false ]; then # if 'expose_port_53' doesn't exist or is false expose_port_53="false"