diff --git a/conf/AdGuardHome.yaml b/conf/AdGuardHome.yaml index a37ec83..1a790a4 100644 --- a/conf/AdGuardHome.yaml +++ b/conf/AdGuardHome.yaml @@ -15,7 +15,7 @@ dns: bind_hosts: __IPV4_ADDR__ __IPV6_ADDR__ - port: __PORT_ADGUARD__ + port: 53 statistics_interval: 1 querylog_enabled: true querylog_file_enabled: true diff --git a/manifest.toml b/manifest.toml index 1113b16..cfcac52 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,9 +5,9 @@ description.fr = "Serveur DNS, bloqueur de publicités et trackers" id = "adguardhome" name = "AdGuard Home" -version = "0.107.44~ynh1" +version = "0.107.44~ynh2" -maintainers = ["ddataa"] +maintainers = [ "ddataa" ] [upstream] admindoc = "https://github.com/AdguardTeam/AdGuardHome/wiki" @@ -27,42 +27,42 @@ sso = false yunohost = ">= 11.2" [install] -[install.domain] -type = "domain" + [install.domain] + type = "domain" -[install.path] -default = "/adguard" -type = "path" + [install.path] + default = "/adguard" + type = "path" -[install.init_main_permission] -default = "visitors" -type = "group" + [install.init_main_permission] + default = "visitors" + type = "group" -[install.admin] -type = "user" + [install.admin] + type = "user" -[install.password] -type = "password" + [install.password] + type = "password" -[install.dns_over_https] -ask.en = "Should DNS-over-HTTPS be enabled? (If so, anyone who knows your adguard address can make a doh request to https://adguardomain.tld/dns-query)" -default = true -type = "boolean" + [install.dns_over_https] + ask.en = "Should DNS-over-HTTPS be enabled? (If so, anyone who knows your adguard address can make a doh request to https://adguardomain.tld/dns-query)" + default = true + type = "boolean" [resources] -[resources.sources.main] -amd64.sha256 = "bd19f93c47a8a893639e4ef28161e161708767c898cc10471ff3fefbc35a3a76" -amd64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.44/AdGuardHome_linux_amd64.tar.gz" -arm64.sha256 = "98b5a0c0645b6622dd638aaa818a8d7a3ac30cc8fbfa42aba7de36f20971d34e" -arm64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.44/AdGuardHome_linux_arm64.tar.gz" -armhf.sha256 = "49bf8be6745f18610daa5c0d9c71217b3699b451eeac3b1747b77b810600f835" -armhf.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.44/AdGuardHome_linux_armv7.tar.gz" -in_subdir = 2 + [resources.sources.main] + amd64.sha256 = "bd19f93c47a8a893639e4ef28161e161708767c898cc10471ff3fefbc35a3a76" + amd64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.44/AdGuardHome_linux_amd64.tar.gz" + arm64.sha256 = "98b5a0c0645b6622dd638aaa818a8d7a3ac30cc8fbfa42aba7de36f20971d34e" + arm64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.44/AdGuardHome_linux_arm64.tar.gz" + armhf.sha256 = "49bf8be6745f18610daa5c0d9c71217b3699b451eeac3b1747b77b810600f835" + armhf.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.44/AdGuardHome_linux_armv7.tar.gz" + in_subdir = 2 -autoupdate.asset.amd64 = "^AdGuardHome_linux_amd64.tar.gz$" -autoupdate.asset.arm64 = "^AdGuardHome_linux_arm64.tar.gz$" -autoupdate.asset.armhf = "^AdGuardHome_linux_armv7.tar.gz$" -autoupdate.strategy = "latest_github_release" + autoupdate.asset.amd64 = "^AdGuardHome_linux_amd64.tar.gz$" + autoupdate.asset.arm64 = "^AdGuardHome_linux_arm64.tar.gz$" + autoupdate.asset.armhf = "^AdGuardHome_linux_armv7.tar.gz$" + autoupdate.strategy = "latest_github_release" [resources.ports] adguard.default = 53 diff --git a/scripts/install b/scripts/install index 5c2e176..deaba82 100644 --- a/scripts/install +++ b/scripts/install @@ -119,7 +119,7 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config -yunohost service add $app --description="Ads & trackers blocking DNS server" --needs_exposed_ports $port_adguard +yunohost service add $app --description="Ads & trackers blocking DNS server" --needs_exposed_ports 53 #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 6070641..23dbc8d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -38,7 +38,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable "$app.service" --quiet -yunohost service add $app --description="Ads & trackers blocking DNS server" --needs_exposed_ports $port_adguard +yunohost service add $app --description="Ads & trackers blocking DNS server" --needs_exposed_ports 53 #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index d036e39..1aa3b20 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -141,10 +141,6 @@ if \"0.0.0.0\" in conf_file[\"dns\"][\"bind_hosts\"]: if \"$ipv6_addr\": conf_file[\"dns\"][\"bind_hosts\"].append(\"$ipv6_addr\") need_file_update = True - -if conf_file[\"dns\"][\"port\"] != $port_adguard: - conf_file[\"dns\"][\"port\"] = $port_adguard - need_file_update = True if need_file_update: with open(\"$install_dir/AdGuardHome.yaml\", 'w') as file: