1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/adguardhome_ynh.git synced 2024-09-03 18:06:23 +02:00

Merge pull request #159 from YunoHost-Apps/testing

testing v0.107.44~ynh2
This commit is contained in:
OniriCorpe 2024-02-08 18:27:46 +01:00 committed by GitHub
commit 94f7968f11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 36 additions and 40 deletions

View file

@ -21,7 +21,7 @@ AdGuard Home is a network-wide software for blocking ads & tracking. After you s
It operates as a DNS server that re-routes tracking domains to a "black hole", thus preventing your devices from connecting to those servers. It's based on software we use for our public AdGuard DNS servers -- both share a lot of common code.
**Shipped version:** 0.107.44~ynh1
**Shipped version:** 0.107.44~ynh2
## Screenshots

View file

@ -21,7 +21,7 @@ AdGuard Home est un logiciel à l'échelle du réseau pour bloquer les publicit
Il fonctionne comme un serveur DNS qui redirige les domaines de pistage vers un "trou noir", empêchant ainsi vos appareils de se connecter à ces serveurs. Il est basé sur un logiciel que nous utilisons pour nos serveurs DNS publics AdGuard - les deux partagent beaucoup de code commun.
**Version incluse :** 0.107.44~ynh1
**Version incluse :** 0.107.44~ynh2
## Captures décran

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -76,7 +76,7 @@ ynh_add_nginx_config
# 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
#=================================================
# SPECIFIC 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: