From 37bb13ad2113bfab467abdecff662e488f2107b6 Mon Sep 17 00:00:00 2001 From: ewilly Date: Wed, 6 Dec 2023 20:35:30 +0100 Subject: [PATCH 1/8] Fix #137 --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 33cbc89..185da83 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "AdGuard Home" description.en = "Network-wide ads & trackers blocking DNS server" description.fr = "Serveur DNS, bloqueur de publicités et trackers" -version = "0.107.41~ynh2" +version = "0.107.41~ynh3" maintainers = ["ddataa"] @@ -74,7 +74,7 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - api.url = "/re:__DOMAIN__/dns-query" + api.url = "re:__DOMAIN__/dns-query" api.allowed = "visitors" api.auth_header = false api.show_tile = false From 069ae59f748e24ad8c3f842895f66dffa030450f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 7 Dec 2023 17:15:16 +0100 Subject: [PATCH 2/8] Upgrade to v0.107.42 --- manifest.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.toml b/manifest.toml index 33cbc89..3b2e439 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "AdGuard Home" description.en = "Network-wide ads & trackers blocking DNS server" description.fr = "Serveur DNS, bloqueur de publicités et trackers" -version = "0.107.41~ynh2" +version = "0.107.42~ynh1" maintainers = ["ddataa"] @@ -52,12 +52,12 @@ ram.runtime = "50M" [resources] [resources.sources.main] in_subdir = "2" - arm64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.41/AdGuardHome_linux_arm64.tar.gz" - arm64.sha256 = "e23f5164a832c8647e0035b03189dc9c72821e9216ee5a5f8057739b8d072539" - amd64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.41/AdGuardHome_linux_amd64.tar.gz" - amd64.sha256 = "9e171202103ff57bd4ddebc280cbc71eb7a33f5b1ba23170f462b3dfcdca93f5" - armhf.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.41/AdGuardHome_linux_armv7.tar.gz" - armhf.sha256 = "0ded3fcc63b009d7934730fd31e698b700153e6ac7dc205f5aa7352810a309d7" + arm64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.42/AdGuardHome_linux_arm64.tar.gz" + arm64.sha256 = "48d1e518d1327e37bc542ca2b9242de91f0840bb4f4f37070f9d5990c9a90466" + amd64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.42/AdGuardHome_linux_amd64.tar.gz" + amd64.sha256 = "204d0476f9dedb7bc7186c87fbf271c8cf952372372c0e5966e6ea932efe6d9d" + armhf.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.42/AdGuardHome_linux_armv7.tar.gz" + armhf.sha256 = "8f088cde491e5b154105002655d29bf4afd2467c4449f3cead10391f4399608c" autoupdate.strategy = "latest_github_release" autoupdate.asset.amd64 = "^AdGuardHome_linux_amd64.tar.gz$" From 2b6bd14b38e0a6f5c1970cb5414168d321b742cd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 7 Dec 2023 16:15:20 +0000 Subject: [PATCH 3/8] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0ad82d5..2fe3efe 100644 --- a/README.md +++ b/README.md @@ -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.41~ynh2 +**Shipped version:** 0.107.42~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index bf18e83..e24d3b7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -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.41~ynh2 +**Version incluse :** 0.107.42~ynh1 ## Captures d’écran From 264654984cc21fb80147b69440f9beb8bf37986e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 7 Dec 2023 19:06:21 +0000 Subject: [PATCH 4/8] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0ad82d5..e627eb8 100644 --- a/README.md +++ b/README.md @@ -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.41~ynh2 +**Shipped version:** 0.107.41~ynh3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index bf18e83..d7e8d30 100644 --- a/README_fr.md +++ b/README_fr.md @@ -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.41~ynh2 +**Version incluse :** 0.107.41~ynh3 ## Captures d’écran From 20f3fb50af5503520e691e3f1b9c0cde08f41b28 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 7 Dec 2023 19:07:22 +0000 Subject: [PATCH 5/8] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index addc02e..2fe3efe 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,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.42~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 43e54ab..e24d3b7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,6 +20,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.42~ynh1 ## Captures d’écran From 4a96b9e1c01ea66e4cbc7d1fc74b3d1957e9f8aa Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 7 Dec 2023 20:19:59 +0100 Subject: [PATCH 6/8] fix manifest errors (CI linter) --- manifest.toml | 102 +++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/manifest.toml b/manifest.toml index 1472cd4..d7c25de 100644 --- a/manifest.toml +++ b/manifest.toml @@ -1,84 +1,84 @@ packaging_format = 2 -id = "adguardhome" -name = "AdGuard Home" description.en = "Network-wide ads & trackers blocking DNS server" description.fr = "Serveur DNS, bloqueur de publicités et trackers" +id = "adguardhome" +name = "AdGuard Home" version = "0.107.42~ynh1" maintainers = ["ddataa"] [upstream] -license = "GPL-3.0" -website = "https://adguard.com/adguard-home.html" admindoc = "https://github.com/AdguardTeam/AdGuardHome/wiki" -userdoc = "https://kb.adguard.com/en" code = "https://github.com/AdguardTeam/AdGuardHome" +license = "GPL-3.0" +userdoc = "https://kb.adguard.com/en" +website = "https://adguard.com/adguard-home.html" [integration] -yunohost = ">= 11.2" architectures = "all" -multi_instance = false -ldap = false -sso = false disk = "50M" +ldap = false +multi_instance = false ram.build = "50M" ram.runtime = "50M" +sso = false +yunohost = ">= 11.2" [install] - [install.domain] - type = "domain" +[install.domain] +type = "domain" - [install.path] - type = "path" - default = "/adguard" +[install.path] +default = "/adguard" +type = "path" - [install.init_main_permission] - type = "group" - default = "visitors" +[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)" - type = "boolean" - default = true +[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] - in_subdir = "2" - arm64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.42/AdGuardHome_linux_arm64.tar.gz" - arm64.sha256 = "48d1e518d1327e37bc542ca2b9242de91f0840bb4f4f37070f9d5990c9a90466" - amd64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.42/AdGuardHome_linux_amd64.tar.gz" - amd64.sha256 = "204d0476f9dedb7bc7186c87fbf271c8cf952372372c0e5966e6ea932efe6d9d" - armhf.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.42/AdGuardHome_linux_armv7.tar.gz" - armhf.sha256 = "8f088cde491e5b154105002655d29bf4afd2467c4449f3cead10391f4399608c" +[resources.sources.main] +amd64.sha256 = "204d0476f9dedb7bc7186c87fbf271c8cf952372372c0e5966e6ea932efe6d9d" +amd64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.42/AdGuardHome_linux_amd64.tar.gz" +arm64.sha256 = "48d1e518d1327e37bc542ca2b9242de91f0840bb4f4f37070f9d5990c9a90466" +arm64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.42/AdGuardHome_linux_arm64.tar.gz" +armhf.sha256 = "8f088cde491e5b154105002655d29bf4afd2467c4449f3cead10391f4399608c" +armhf.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.42/AdGuardHome_linux_armv7.tar.gz" +in_subdir = true - 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.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 - adguard.exposed = "Both" +[resources.ports] +adguard.default = 53 +adguard.exposed = "Both" - [resources.system_user] +[resources.system_user] - [resources.install_dir] +[resources.install_dir] - [resources.permissions] - main.url = "/" - api.url = "re:__DOMAIN__/dns-query" - api.allowed = "visitors" - api.auth_header = false - api.show_tile = false - api.protected = true +[resources.permissions] +api.allowed = "visitors" +api.auth_header = false +api.protected = true +api.show_tile = false +api.url = "/dns-query" +main.url = "/" - [resources.apt] - packages ="python3-bcrypt, python3-yaml" +[resources.apt] +packages = "python3-bcrypt, python3-yaml" From b1ab1822a7a8a1c05abf1d764b2e80b7d92831de Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 7 Dec 2023 20:24:28 +0100 Subject: [PATCH 7/8] fix in_subdir --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index d7c25de..405d317 100644 --- a/manifest.toml +++ b/manifest.toml @@ -57,7 +57,7 @@ arm64.sha256 = "48d1e518d1327e37bc542ca2b9242de91f0840bb4f4f37070f9d5990c9a90466 arm64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.42/AdGuardHome_linux_arm64.tar.gz" armhf.sha256 = "8f088cde491e5b154105002655d29bf4afd2467c4449f3cead10391f4399608c" armhf.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.42/AdGuardHome_linux_armv7.tar.gz" -in_subdir = true +in_subdir = false autoupdate.asset.amd64 = "^AdGuardHome_linux_amd64.tar.gz$" autoupdate.asset.arm64 = "^AdGuardHome_linux_arm64.tar.gz$" From 764e745d99f555cb02bc03d9436d1cb5b41823e4 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 7 Dec 2023 20:30:33 +0100 Subject: [PATCH 8/8] fix in_subdir ; okay my bad --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 405d317..0b58aa7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -57,7 +57,7 @@ arm64.sha256 = "48d1e518d1327e37bc542ca2b9242de91f0840bb4f4f37070f9d5990c9a90466 arm64.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.42/AdGuardHome_linux_arm64.tar.gz" armhf.sha256 = "8f088cde491e5b154105002655d29bf4afd2467c4449f3cead10391f4399608c" armhf.url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.42/AdGuardHome_linux_armv7.tar.gz" -in_subdir = false +in_subdir = 2 autoupdate.asset.amd64 = "^AdGuardHome_linux_amd64.tar.gz$" autoupdate.asset.arm64 = "^AdGuardHome_linux_arm64.tar.gz$"