From e1331f7325d9c78ed87eec0efb47d3ad84fc974f Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Wed, 15 Feb 2023 19:26:42 +0000 Subject: [PATCH 01/35] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 1ca5f09..815880a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.23~ynh1", + "version": "0.107.23~ynh2", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From 1d211f00fda273fc83cec5fd0aeb8e787e5f4ce0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 15 Feb 2023 19:26:45 +0000 Subject: [PATCH 02/35] 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 c4e383d..1c004f3 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.23~ynh1 +**Shipped version:** 0.107.23~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 6f69dd6..06d3988 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.23~ynh1 +**Version incluse :** 0.107.23~ynh2 ## Captures d’écran From 1a6d2ef505d35b5f5e65be7f0d40502e6c466206 Mon Sep 17 00:00:00 2001 From: ewilly Date: Sun, 19 Feb 2023 17:42:37 +0100 Subject: [PATCH 03/35] Update nginx.conf Add support to remote user authentication --- conf/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6ee6940..ef1bc36 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,6 +9,7 @@ location __PATH__/ { proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Host $server_name; + proxy_set_header X-Remote-User $remote_user; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; From 56a2c8c98952b711381f0fa67002b6a8c39264e4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 13 Apr 2023 06:06:58 +0000 Subject: [PATCH 04/35] Upgrade to v0.107.28 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index c3c4070..512c163 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_linux_amd64.tar.gz -SOURCE_SUM=98d06ff05e012475c9f3abe748cfb4b1f1244b78c1f1370c84cfba449e738183 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_amd64.tar.gz +SOURCE_SUM=6979837abe7f6ead0be92a0f86ac89f086361731fe4d83470ef413660aebae3d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/arm64.src b/conf/arm64.src index e7340a1..133b7a5 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_linux_arm64.tar.gz -SOURCE_SUM=d89d3a46fa0a6498f7a918fa7e0e25f92eaca11fb9829082ba9709ef9820bc3f +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_arm64.tar.gz +SOURCE_SUM=136401c00d29ac9e01f1aead123f65064027ad851396cc1e38906942c2c1a3d3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/armhf.src b/conf/armhf.src index 90e65dc..1dbd1f0 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.27/AdGuardHome_linux_armv7.tar.gz -SOURCE_SUM=cb9fecbe03894b729b5092db823cbd54ea6883d5bbc46cb2c7de89b5d572ce39 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_armv7.tar.gz +SOURCE_SUM=1d4eae5127ddaf75243d7fa8ca31a530726471fa46051a6104d2ed046de82f36 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/manifest.json b/manifest.json index e05c378..a944471 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.27~ynh1", + "version": "0.107.28~ynh1", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From 53652ccd324676613e77b241fb5cacfd6cd05b16 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 13 Apr 2023 06:07:04 +0000 Subject: [PATCH 05/35] 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 ec4c303..c701950 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.27~ynh1 +**Shipped version:** 0.107.28~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 87f01e1..9439929 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.27~ynh1 +**Version incluse :** 0.107.28~ynh1 ## Captures d’écran From 91aa227c1585b2f7e8ba17dc73a2e367e3e30874 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 19 Apr 2023 06:07:21 +0000 Subject: [PATCH 06/35] Upgrade to v0.107.29 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 512c163..46e5dcd 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_amd64.tar.gz -SOURCE_SUM=6979837abe7f6ead0be92a0f86ac89f086361731fe4d83470ef413660aebae3d +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_amd64.tar.gz +SOURCE_SUM=33855f8d19eba98c4a73d9de2099dd2686bc0f8e114488cde48b44e0473a54a6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/arm64.src b/conf/arm64.src index 133b7a5..6597c00 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_arm64.tar.gz -SOURCE_SUM=136401c00d29ac9e01f1aead123f65064027ad851396cc1e38906942c2c1a3d3 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_arm64.tar.gz +SOURCE_SUM=eb37a4a4d9dfb2ce2bfd9fa0fd37b43bea03a42b242aedfd348f10d1eedb1cea SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/armhf.src b/conf/armhf.src index 1dbd1f0..220d5bb 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.28/AdGuardHome_linux_armv7.tar.gz -SOURCE_SUM=1d4eae5127ddaf75243d7fa8ca31a530726471fa46051a6104d2ed046de82f36 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_armv7.tar.gz +SOURCE_SUM=2f20f76ab1a69396165c1d856412cf70c02e92f06d9577c53d243f999049a210 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/manifest.json b/manifest.json index a944471..dd0f16a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.28~ynh1", + "version": "0.107.29~ynh1", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From 8819310f6bfcfa4cef24d6c15ddab1495cbda1f3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 19 Apr 2023 06:07:29 +0000 Subject: [PATCH 07/35] 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 c701950..9ac2063 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.28~ynh1 +**Shipped version:** 0.107.29~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 9439929..e04c2c0 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.28~ynh1 +**Version incluse :** 0.107.29~ynh1 ## Captures d’écran From 05858135b9ea41586370bdcf8fb81baaa3bb9489 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 9 Jun 2023 06:06:59 +0000 Subject: [PATCH 08/35] Upgrade to v0.107.31 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 46e5dcd..fff28f3 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_amd64.tar.gz -SOURCE_SUM=33855f8d19eba98c4a73d9de2099dd2686bc0f8e114488cde48b44e0473a54a6 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.31/AdGuardHome_linux_amd64.tar.gz +SOURCE_SUM=39d19c7009e5a34806401d08585417f4f2b3d3705e52378ac0abd38d8292e645 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/arm64.src b/conf/arm64.src index 6597c00..47c1359 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_arm64.tar.gz -SOURCE_SUM=eb37a4a4d9dfb2ce2bfd9fa0fd37b43bea03a42b242aedfd348f10d1eedb1cea +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.31/AdGuardHome_linux_arm64.tar.gz +SOURCE_SUM=10a5a5870824b2642fe4e5e67bfe151d51524443ac2363c69968fd02b06e90fc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/armhf.src b/conf/armhf.src index 220d5bb..51201b3 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.29/AdGuardHome_linux_armv7.tar.gz -SOURCE_SUM=2f20f76ab1a69396165c1d856412cf70c02e92f06d9577c53d243f999049a210 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.31/AdGuardHome_linux_armv7.tar.gz +SOURCE_SUM=a794873e9977dd0f091a6a910441490fce1572e7859925f06e9dd1b2c46c2488 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/manifest.json b/manifest.json index dd0f16a..6023850 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.29~ynh1", + "version": "0.107.31~ynh1", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From 1ada343111bf94b8d88a04a7fa04899b8a5bf48a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 9 Jun 2023 06:07:06 +0000 Subject: [PATCH 09/35] 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 9ac2063..ea35bc6 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.29~ynh1 +**Shipped version:** 0.107.31~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index e04c2c0..89e44c7 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.29~ynh1 +**Version incluse :** 0.107.31~ynh1 ## Captures d’écran From 62f8a195c9b01736576241c6411f6fc64700ce48 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 14 Jun 2023 06:06:52 +0000 Subject: [PATCH 10/35] Upgrade to v0.107.32 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index fff28f3..de4e22a 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.31/AdGuardHome_linux_amd64.tar.gz -SOURCE_SUM=39d19c7009e5a34806401d08585417f4f2b3d3705e52378ac0abd38d8292e645 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_amd64.tar.gz +SOURCE_SUM=601138c8beb711ed549a413ba486cb28e2cb8626390e9375b7c8bfa2f40e297a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/arm64.src b/conf/arm64.src index 47c1359..efbd2ad 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.31/AdGuardHome_linux_arm64.tar.gz -SOURCE_SUM=10a5a5870824b2642fe4e5e67bfe151d51524443ac2363c69968fd02b06e90fc +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_arm64.tar.gz +SOURCE_SUM=2e3e1e09c320a72d809461ca03fc51c597361d5de5972916c157935251d7bf22 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/armhf.src b/conf/armhf.src index 51201b3..a36ec9b 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.31/AdGuardHome_linux_armv7.tar.gz -SOURCE_SUM=a794873e9977dd0f091a6a910441490fce1572e7859925f06e9dd1b2c46c2488 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_armv7.tar.gz +SOURCE_SUM=5e2584c5965bb42765ff52a88b57532ac88b979c52c2923c2e21b18d7db24fe0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/manifest.json b/manifest.json index 6023850..6a25cc6 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.31~ynh1", + "version": "0.107.32~ynh1", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From 14824f698567532c0519ea95c04a6911f1113526 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 14 Jun 2023 06:06:59 +0000 Subject: [PATCH 11/35] 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 ea35bc6..7521f33 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.31~ynh1 +**Shipped version:** 0.107.32~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 89e44c7..1991f25 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.31~ynh1 +**Version incluse :** 0.107.32~ynh1 ## Captures d’écran From e61f0c3fefff97704d5f2fafd5bb409b3eb9e3a3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 4 Jul 2023 06:08:15 +0000 Subject: [PATCH 12/35] Upgrade to v0.107.33 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index de4e22a..8b183b4 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_amd64.tar.gz -SOURCE_SUM=601138c8beb711ed549a413ba486cb28e2cb8626390e9375b7c8bfa2f40e297a +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.33/AdGuardHome_linux_amd64.tar.gz +SOURCE_SUM=6722359d45b6aae9012ae48da0a5a18217850c180e878a4b10b4fa1d0daa245e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/arm64.src b/conf/arm64.src index efbd2ad..275b8c6 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_arm64.tar.gz -SOURCE_SUM=2e3e1e09c320a72d809461ca03fc51c597361d5de5972916c157935251d7bf22 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.33/AdGuardHome_linux_arm64.tar.gz +SOURCE_SUM=7c75975f8e2c0de41b7d603a27134a39362f4b4f0bbbe96c7d30b0f3434345af SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/armhf.src b/conf/armhf.src index a36ec9b..1984450 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_armv7.tar.gz -SOURCE_SUM=5e2584c5965bb42765ff52a88b57532ac88b979c52c2923c2e21b18d7db24fe0 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.33/AdGuardHome_linux_armv7.tar.gz +SOURCE_SUM=d011772c708077c6ed62bd5b66eeec76d765dd42f6690b84075782330e7bb023 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/manifest.json b/manifest.json index 6a25cc6..f18f2f0 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.32~ynh1", + "version": "0.107.33~ynh1", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From 571d8be0df772c9ee1ca692fc49e5fc74643b4b8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 4 Jul 2023 06:08:21 +0000 Subject: [PATCH 13/35] 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 7521f33..e6eb922 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.32~ynh1 +**Shipped version:** 0.107.33~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 1991f25..a09e453 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.32~ynh1 +**Version incluse :** 0.107.33~ynh1 ## Captures d’écran From 54ad46d33c00dcfb5c0ea42eb41d5e761d4b3d20 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 5 Jul 2023 00:44:16 +0200 Subject: [PATCH 14/35] [autopatch] Fix Host and X-Forwarded-For header spoofing --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6ee6940..0e8a7d8 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -19,7 +19,7 @@ location __PATH__/ { } location /dns-query { - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_redirect off; proxy_buffering on; From 643221960a6ff105f494829aab24fe555d22a6fc Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 13 Jul 2023 06:07:49 +0000 Subject: [PATCH 15/35] Upgrade to v0.107.34 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 8b183b4..fd0bec6 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.33/AdGuardHome_linux_amd64.tar.gz -SOURCE_SUM=6722359d45b6aae9012ae48da0a5a18217850c180e878a4b10b4fa1d0daa245e +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_amd64.tar.gz +SOURCE_SUM=a36126909f632408504b6e4908dd791816fe80614e88a4bff3b3d6da07b460d8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/arm64.src b/conf/arm64.src index 275b8c6..bf24189 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.33/AdGuardHome_linux_arm64.tar.gz -SOURCE_SUM=7c75975f8e2c0de41b7d603a27134a39362f4b4f0bbbe96c7d30b0f3434345af +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_arm64.tar.gz +SOURCE_SUM=62379c66257068adffd489f9b8a484e69176d58409369c44a4f2b469b35fde24 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/armhf.src b/conf/armhf.src index 1984450..0a8812a 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.33/AdGuardHome_linux_armv7.tar.gz -SOURCE_SUM=d011772c708077c6ed62bd5b66eeec76d765dd42f6690b84075782330e7bb023 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.34/AdGuardHome_linux_armv7.tar.gz +SOURCE_SUM=8bf8caaf4e68ed47977443eeb1340fd05790a004e5dfac9d0e0b60e70fe930ee SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/manifest.json b/manifest.json index f18f2f0..c493ccf 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.33~ynh1", + "version": "0.107.34~ynh1", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From 3fc5730707c62335fc4740ca5282129772d4957f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 13 Jul 2023 06:07:55 +0000 Subject: [PATCH 16/35] 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 e6eb922..bbeee5a 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.33~ynh1 +**Shipped version:** 0.107.34~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index a09e453..f7d5388 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.33~ynh1 +**Version incluse :** 0.107.34~ynh1 ## Captures d’écran From 23bc3b050606d0cbf69da0000d7a5800d8625e99 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 27 Jul 2023 06:07:05 +0000 Subject: [PATCH 17/35] Upgrade to v0.107.35 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 8b183b4..9893b86 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.33/AdGuardHome_linux_amd64.tar.gz -SOURCE_SUM=6722359d45b6aae9012ae48da0a5a18217850c180e878a4b10b4fa1d0daa245e +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_amd64.tar.gz +SOURCE_SUM=8daa4c7891130cfcb445ac493ace9d0e4b507d3675b0b0788e8b712d8661c5f7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/arm64.src b/conf/arm64.src index 275b8c6..7850e35 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.33/AdGuardHome_linux_arm64.tar.gz -SOURCE_SUM=7c75975f8e2c0de41b7d603a27134a39362f4b4f0bbbe96c7d30b0f3434345af +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_arm64.tar.gz +SOURCE_SUM=13532ca0cdd90da10f14bbd75adffed21bfc095bb6bfdc655f4aef878be68fa6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/armhf.src b/conf/armhf.src index 1984450..1a6e64c 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.33/AdGuardHome_linux_armv7.tar.gz -SOURCE_SUM=d011772c708077c6ed62bd5b66eeec76d765dd42f6690b84075782330e7bb023 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_armv7.tar.gz +SOURCE_SUM=02b4d31160f4c982d1ad7f23cad90cb4a58b6c47ebf743b88bbddd32303eb1d1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/manifest.json b/manifest.json index f18f2f0..d141fa5 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.33~ynh1", + "version": "0.107.35~ynh1", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From 6578256012ec4c24ad8884dd748625b7c4819e03 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 27 Jul 2023 06:07:14 +0000 Subject: [PATCH 18/35] 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 e6eb922..02f3acd 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.33~ynh1 +**Shipped version:** 0.107.35~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index a09e453..bfc4116 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.33~ynh1 +**Version incluse :** 0.107.35~ynh1 ## Captures d’écran From 435a32ddb51e58450851f6ee00e9f374d86a428a Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Fri, 28 Jul 2023 19:49:06 +0200 Subject: [PATCH 19/35] link to changelog added --- .github/workflows/updater.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index a56d7cb..61c811f 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -46,4 +46,5 @@ jobs: title: 'Upgrade to version ${{ env.VERSION }}' body: | Upgrade to v${{ env.VERSION }} + Changelog: https://github.com/${{ env.REPO }}/releases/tag/v${{ env.VERSION }} draft: false From b3e4241eead3a00f5cf5016685b81f1134919d17 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Fri, 28 Jul 2023 19:53:14 +0200 Subject: [PATCH 20/35] updating config file according to v0.107.34 --- conf/AdGuardHome.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/conf/AdGuardHome.yaml b/conf/AdGuardHome.yaml index d0d4c6e..bc54f6e 100644 --- a/conf/AdGuardHome.yaml +++ b/conf/AdGuardHome.yaml @@ -118,11 +118,12 @@ dhcp: ra_slaac_only: false ra_allow_slaac: false clients: [] -log_compress: false -log_localtime: false -log_max_backups: 0 -log_max_size: 100 -log_max_age: 3 -log_file: "" +log: + compress: false + localtime: false + max_backups: 0 + max_size: 100 + max_age: 3 + file: "" verbose: false schema_version: 10 \ No newline at end of file From 0b8c1bf51324e768ccb4039b8b240832f948ef45 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 2 Aug 2023 16:19:33 +0000 Subject: [PATCH 21/35] Upgrade to v0.107.36 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 9893b86..cd2968d 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_amd64.tar.gz -SOURCE_SUM=8daa4c7891130cfcb445ac493ace9d0e4b507d3675b0b0788e8b712d8661c5f7 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_amd64.tar.gz +SOURCE_SUM=b06eb8b75c7bd2e2a4f38e1d4f583d1b327e0e01eebfbb14101695aa812658ec SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/arm64.src b/conf/arm64.src index 7850e35..a7a21ba 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_arm64.tar.gz -SOURCE_SUM=13532ca0cdd90da10f14bbd75adffed21bfc095bb6bfdc655f4aef878be68fa6 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_arm64.tar.gz +SOURCE_SUM=ad449fa35b8919bc71d67fd570bcaae73aa20e8e20d1c682a5570bdae6544a41 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/armhf.src b/conf/armhf.src index 1a6e64c..e740458 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.35/AdGuardHome_linux_armv7.tar.gz -SOURCE_SUM=02b4d31160f4c982d1ad7f23cad90cb4a58b6c47ebf743b88bbddd32303eb1d1 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_armv7.tar.gz +SOURCE_SUM=9931ae7cc20a923d91ed0b8d58a48a32df4a7709597bd391b492b984869e1ff1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/manifest.json b/manifest.json index d141fa5..194feb8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.35~ynh1", + "version": "0.107.36~ynh1", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From 31f497c21ea3b96aed50843f0917902282947337 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 2 Aug 2023 16:19:39 +0000 Subject: [PATCH 22/35] 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 02f3acd..e72b54c 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.35~ynh1 +**Shipped version:** 0.107.36~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index bfc4116..5cda8ab 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.35~ynh1 +**Version incluse :** 0.107.36~ynh1 ## Captures d’écran From 9e9da6d333209e81d2a04cb0ae01cba53e837dfa Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Wed, 2 Aug 2023 18:27:58 +0200 Subject: [PATCH 23/35] various fixes and improvements --- .github/workflows/updater.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 84c5a51..227490a 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -14,11 +14,11 @@ #================================================= # Fetching information -current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') -repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') +current_version=$(jq -j '.version|split("~")[0]' manifest.json) +repo=$(jq -j '.upstream.code|split("https://github.com/")[1]' manifest.json) # Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) -assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) +assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'"$version"'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) # Later down the script, we assume the version has only digits and dots # Sometimes the release name starts with a "v", so let's filter it out. @@ -30,16 +30,16 @@ fi # Setting up the environment variables echo "Current version: $current_version" echo "Latest release from upstream: $version" -echo "VERSION=$version" >> $GITHUB_ENV +{ echo "VERSION=$version"; echo "REPO=$repo"; } >> "$GITHUB_ENV" # For the time being, let's assume the script will fail -echo "PROCEED=false" >> $GITHUB_ENV +echo "PROCEED=false" >> "$GITHUB_ENV" # Proceed only if the retrieved version is greater than the current one if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then echo "::warning ::No new version available" exit 0 # Proceed only if a PR for this new version does not already exist -elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then +elif git ls-remote -q --exit-code --heads https://github.com/"$GITHUB_REPOSITORY".git ci-auto-update-v"$version" ; then echo "::warning ::A branch already exists for this update" exit 0 fi @@ -78,18 +78,18 @@ case $asset_url in esac # If $src is not empty, let's process the asset -if [ ! -z "$src" ]; then +if [ -n "$src" ]; then # Create the temporary directory tempdir="$(mktemp -d)" # Download sources and calculate checksum filename=${asset_url##*/} -curl --silent -4 -L $asset_url -o "$tempdir/$filename" +curl --silent -4 -L "$asset_url" -o "$tempdir/$filename" checksum=$(sha256sum "$tempdir/$filename" | head -c 64) # Delete temporary directory -rm -rf $tempdir +rm -rf "$tempdir" # Get extension if [[ $filename == *.tar.gz ]]; then @@ -132,5 +132,5 @@ echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > # No need to update the README, yunohost-bot takes care of it # The Action will proceed only if the PROCEED environment variable is set to true -echo "PROCEED=true" >> $GITHUB_ENV +echo "PROCEED=true" >> "$GITHUB_ENV" exit 0 From 656453a48cc4961a0d08791ade4e79c715031c3c Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Tue, 15 Aug 2023 20:36:43 +0200 Subject: [PATCH 24/35] run the auto-update script from 'testing' branch --- .github/workflows/updater.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 61c811f..ad9b07e 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -17,6 +17,7 @@ jobs: uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} + ref: 'testing' - name: Run the updater script id: run_updater run: | From 6ebb2a2f774b5d32b468e197ba31fb6ab3963781 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 7 Sep 2023 15:55:07 +0000 Subject: [PATCH 25/35] Upgrade to v0.107.37 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index cd2968d..9304c7f 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_amd64.tar.gz -SOURCE_SUM=b06eb8b75c7bd2e2a4f38e1d4f583d1b327e0e01eebfbb14101695aa812658ec +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.37/AdGuardHome_linux_amd64.tar.gz +SOURCE_SUM=9aeb96f09e781451526f521d277e22cd9f28784113767e1823e445702d113ce3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/arm64.src b/conf/arm64.src index a7a21ba..912ed21 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_arm64.tar.gz -SOURCE_SUM=ad449fa35b8919bc71d67fd570bcaae73aa20e8e20d1c682a5570bdae6544a41 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.37/AdGuardHome_linux_arm64.tar.gz +SOURCE_SUM=d0a352bf77b9109c6cc93285fec0e060eeb4ab01cb4863b9be42a37a0c3c3997 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/armhf.src b/conf/armhf.src index e740458..1d35d81 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.36/AdGuardHome_linux_armv7.tar.gz -SOURCE_SUM=9931ae7cc20a923d91ed0b8d58a48a32df4a7709597bd391b492b984869e1ff1 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.37/AdGuardHome_linux_armv7.tar.gz +SOURCE_SUM=add136ab6dbf0a81136c3af7fa42660707ae577b1016d9cad2ce0bcc5c9e7cc7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/manifest.json b/manifest.json index 194feb8..816b53b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.36~ynh1", + "version": "0.107.37~ynh1", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From 62d98e4fa25dbc02f8c333a161b9a21392863ca6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 7 Sep 2023 15:55:12 +0000 Subject: [PATCH 26/35] 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 e72b54c..1eb93c9 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.36~ynh1 +**Shipped version:** 0.107.37~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 5cda8ab..c33184f 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.36~ynh1 +**Version incluse :** 0.107.37~ynh1 ## Captures d’écran From 5c7e58b6aa6405f38135a2abd7866246ef5403f4 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 7 Sep 2023 18:07:12 +0200 Subject: [PATCH 27/35] permit arch migration & quoting some variables for security reason --- scripts/backup | 4 +-- scripts/change_url | 10 ++++---- scripts/install | 52 +++++++++++++++++++------------------- scripts/remove | 16 ++++++------ scripts/restore | 44 +++++++++++++++++++++++--------- scripts/upgrade | 62 +++++++++++++++++++++++----------------------- 6 files changed, 104 insertions(+), 84 deletions(-) diff --git a/scripts/backup b/scripts/backup index 27063e5..7062e29 100644 --- a/scripts/backup +++ b/scripts/backup @@ -27,8 +27,8 @@ ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -domain=$(ynh_app_setting_get --app=$app --key=domain) +final_path=$(ynh_app_setting_get --app="$app" --key=final_path) +domain=$(ynh_app_setting_get --app="$app" --key=domain) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP diff --git a/scripts/change_url b/scripts/change_url index eca2bc2..42c3942 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -27,8 +27,8 @@ app=$YNH_APP_INSTANCE_NAME ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -port=$(ynh_app_setting_get --app=$app --key=port) +final_path=$(ynh_app_setting_get --app="$app" --key=final_path) +port=$(ynh_app_setting_get --app="$app" --key=port) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP @@ -70,7 +70,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" +ynh_systemd_action --service_name="$app" --action="stop" #================================================= # MODIFY URL IN NGINX CONF @@ -96,7 +96,7 @@ if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location ynh_delete_file_checksum --file="$nginx_conf_path" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf + mv "$nginx_conf_path" "/etc/nginx/conf.d/$new_domain.d/$app.conf" # Store file checksum for the new config file location ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi @@ -108,7 +108,7 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" +ynh_systemd_action --service_name="$app" --action="start" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index 126161b..29e323c 100644 --- a/scripts/install +++ b/scripts/install @@ -36,37 +36,37 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_script_progression --message="Validating installation parameters..." --weight=1 -final_path=/var/www/$app +final_path="/var/www/$app" test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +ynh_webpath_register --app="$app" --domain="$domain" --path_url="$path_url" #================================================= # STORE SETTINGS FROM MANIFEST #================================================= ynh_script_progression --message="Storing installation settings..." --weight=2 -ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=admin --value=$admin +ynh_app_setting_set --app="$app" --key=domain --value="$domain" +ynh_app_setting_set --app="$app" --key=path --value="$path_url" +ynh_app_setting_set --app="$app" --key=admin --value="$admin" if [ "$dns_over_https" == "1" ]; then dns_over_https="true" # DNS over TLS adguard_DoT_port=853 - ynh_app_setting_set --app=$app --key=adguard_DoT_port --value=$adguard_DoT_port + ynh_app_setting_set --app="$app" --key=adguard_DoT_port --value=$adguard_DoT_port ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $adguard_DoT_port ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $adguard_DoT_port # DNS over QUIC adguard_DoQ_port=784 - ynh_app_setting_set --app=$app --key=adguard_DoQ_port --value=$adguard_DoQ_port + ynh_app_setting_set --app="$app" --key=adguard_DoQ_port --value=$adguard_DoQ_port ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $adguard_DoQ_port else dns_over_https="false" fi -ynh_app_setting_set --app=$app --key=dns_over_https --value=$dns_over_https +ynh_app_setting_set --app="$app" --key=dns_over_https --value=$dns_over_https #================================================= # STANDARD MODIFICATIONS @@ -77,11 +77,11 @@ ynh_script_progression --message="Finding an available port..." --weight=1 # Find an available port port=$(ynh_find_port --port=3000) -ynh_app_setting_set --app=$app --key=port --value=$port +ynh_app_setting_set --app="$app" --key=port --value="$port" # Find an available port adguard_port=53 -ynh_app_setting_set --app=$app --key=adguard_port --value=$adguard_port +ynh_app_setting_set --app="$app" --key=adguard_port --value=$adguard_port # Disable the port 53 for upnp ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $adguard_port @@ -92,7 +92,7 @@ ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $adguard_port #================================================= ynh_script_progression --message="Installing dependencies..." --weight=1 -ynh_install_app_dependencies $pkg_dependencies +ynh_install_app_dependencies "$pkg_dependencies" #================================================= # CREATE DEDICATED USER @@ -100,22 +100,22 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Configuring system user..." --weight=1 # Create a system user -ynh_system_user_create --username=$app --home_dir="$final_path" --groups="ssl-cert" +ynh_system_user_create --username="$app" --home_dir="$final_path" --groups="ssl-cert" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=4 -ynh_app_setting_set --app=$app --key=final_path --value=$final_path +ynh_app_setting_set --app="$app" --key=final_path --value="$final_path" # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir=$final_path --source_id="$YNH_ARCH" +ynh_setup_source --dest_dir="$final_path" --source_id="$YNH_ARCH" chmod 750 "$final_path" chmod -R o-rwx "$final_path" -chown -R $app:$app "$final_path" +chown -R "$app":"$app" "$final_path" -setcap 'CAP_NET_BIND_SERVICE=+eip CAP_NET_RAW=+eip' $final_path/AdGuardHome +setcap 'CAP_NET_BIND_SERVICE=+eip CAP_NET_RAW=+eip' "$final_path"/AdGuardHome #================================================= # NGINX CONFIGURATION @@ -158,31 +158,31 @@ ipv4_route_output=$(echo "$(ip -4 route get 1.2.3.4 2> /dev/null)" | head -n1 | ipv6_route_output=$(echo "$(ip -6 route get ::1.2.3.4 2> /dev/null)" | head -n1) ipv4_addr="" -for i in $(seq "$(echo $ipv4_route_output | wc -w)" -1 1); do - ip=$(echo $ipv4_route_output | awk "{print \$$i}") - if ynh_validate_ip4 --ip_address=$ip; then +for i in $(seq "$(echo "$ipv4_route_output" | wc -w)" -1 1); do + ip=$(echo "$ipv4_route_output" | awk "{print \$$i}") + if ynh_validate_ip4 --ip_address="$ip"; then ipv4_addr="- $ip" break fi done ipv6_addr="" -for i in $(seq "$(echo $ipv6_route_output | wc -w)" -1 1); do - ip=$(echo $ipv6_route_output | awk "{print \$$i}") - if ynh_validate_ip6 --ip_address=$ip; then +for i in $(seq "$(echo "$ipv6_route_output" | wc -w)" -1 1); do + ip=$(echo "$ipv6_route_output" | awk "{print \$$i}") + if ynh_validate_ip6 --ip_address="$ip"; then ipv6_addr="- $ip" break fi done password=$(python3 -c "import bcrypt; print(bcrypt.hashpw(b\"$password\", bcrypt.gensalt(rounds=10)).decode())") -ynh_app_setting_set --app=$app --key=password --value=$password +ynh_app_setting_set --app="$app" --key=password --value="$password" # Main config File ynh_add_config --template="../conf/AdGuardHome.yaml" --destination="$final_path/AdGuardHome.yaml" chmod 600 "$final_path/AdGuardHome.yaml" -chown -R $app:$app "$final_path/AdGuardHome.yaml" +chown -R "$app":"$app" "$final_path/AdGuardHome.yaml" #================================================= # SETUP SYSTEMD @@ -199,7 +199,7 @@ ynh_add_systemd_config #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="Ads & trackers blocking DNS server" --needs_exposed_ports $adguard_port +yunohost service add "$app" --description="Ads & trackers blocking DNS server" --needs_exposed_ports $adguard_port #================================================= # START SYSTEMD SERVICE @@ -207,7 +207,7 @@ yunohost service add $app --description="Ads & trackers blocking DNS server" --n ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service -ynh_systemd_action --service_name=$app --action="restart" --log_path=systemd +ynh_systemd_action --service_name="$app" --action="restart" --log_path=systemd #================================================= # SETUP SSOWAT diff --git a/scripts/remove b/scripts/remove index 55b8349..307ae29 100644 --- a/scripts/remove +++ b/scripts/remove @@ -16,10 +16,10 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -port=$(ynh_app_setting_get --app=$app --key=port) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -adguard_port=$(ynh_app_setting_get --app=$app --key=adguard_port) +domain=$(ynh_app_setting_get --app="$app" --key=domain) +port=$(ynh_app_setting_get --app="$app" --key=port) +final_path=$(ynh_app_setting_get --app="$app" --key=final_path) +adguard_port=$(ynh_app_setting_get --app="$app" --key=adguard_port) #================================================= # STANDARD REMOVE @@ -28,10 +28,10 @@ adguard_port=$(ynh_app_setting_get --app=$app --key=adguard_port) #================================================= # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_exec_warn_less yunohost service status $app >/dev/null +if ynh_exec_warn_less yunohost service status "$app" >/dev/null then ynh_script_progression --message="Removing $app service integration..." --weight=1 - yunohost service remove $app + yunohost service remove "$app" fi #================================================= @@ -73,7 +73,7 @@ ynh_remove_app_dependencies if yunohost firewall list | grep -q "\- $adguard_port$" then ynh_script_progression --message="Closing port $adguard_port..." --weight=1 - ynh_exec_warn_less yunohost firewall disallow TCP $adguard_port + ynh_exec_warn_less yunohost firewall disallow TCP "$adguard_port" fi #================================================= @@ -82,7 +82,7 @@ fi ynh_script_progression --message="Removing the dedicated system user..." --weight=1 # Delete a system user -ynh_system_user_delete --username=$app +ynh_system_user_delete --username="$app" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 065e38d..a4f761d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,17 +27,17 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -adguard_port=$(ynh_app_setting_get --app=$app --key=adguard_port) +domain=$(ynh_app_setting_get --app="$app" --key=domain) +path_url=$(ynh_app_setting_get --app="$app" --key=path) +final_path=$(ynh_app_setting_get --app="$app" --key=final_path) +adguard_port=$(ynh_app_setting_get --app="$app" --key=adguard_port) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path \ +test ! -d "$final_path" \ || ynh_die --message="There is already a directory: $final_path " #================================================= @@ -48,7 +48,7 @@ test ! -d $final_path \ ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 # Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +ynh_system_user_create --username="$app" --home_dir="$final_path" #================================================= # RESTORE THE APP MAIN DIR @@ -60,14 +60,34 @@ ynh_restore_file --origin_path="$final_path" # this will be treated as a security issue. chmod 750 "$final_path" chmod -R o-rwx "$final_path" -chown -R $app:$app "$final_path" +chown -R "$app":"$app" "$final_path" -setcap 'CAP_NET_BIND_SERVICE=+eip CAP_NET_RAW=+eip' $final_path/AdGuardHome +setcap 'CAP_NET_BIND_SERVICE=+eip CAP_NET_RAW=+eip' "$final_path"/AdGuardHome ynh_restore_file --origin_path="/etc/dnsmasq.d/$app" systemctl restart dnsmasq +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= + +# compare if the system arch is different from the binary arch +# if so, download the correct binary +if [ "$(uname -m)" != "$(file "$final_path"/AdGuardHome | cut -d ',' -f 2 | tr -d ' ')" ] +then + ynh_script_progression --message="Upgrading source files..." --weight=1 + + # Download, check integrity, uncompress and patch the source from app.src + ynh_setup_source --dest_dir="$final_path" --source_id="$YNH_ARCH" +fi + +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R "$app":"$app" "$final_path" + +setcap 'CAP_NET_BIND_SERVICE=+eip CAP_NET_RAW=+eip' "$final_path"/AdGuardHome + #================================================= # SPECIFIC RESTORATION #================================================= @@ -76,7 +96,7 @@ systemctl restart dnsmasq ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_install_app_dependencies "$pkg_dependencies" #================================================= # RESTORE THE NGINX CONFIGURATION @@ -91,21 +111,21 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_script_progression --message="Restoring the systemd configuration..." --weight=1 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service --quiet +systemctl enable "$app.service" --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="Ads & trackers blocking DNS server" --needs_exposed_ports $adguard_port +yunohost service add "$app" --description="Ads & trackers blocking DNS server" --needs_exposed_ports "$adguard_port" #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" +ynh_systemd_action --service_name="$app" --action="restart" --log_path="systemd" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 0f075bb..1336821 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,14 +16,14 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -admin=$(ynh_app_setting_get --app=$app --key=admin) -password=$(ynh_app_setting_get --app=$app --key=password) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -port=$(ynh_app_setting_get --app=$app --key=port) -adguard_port=$(ynh_app_setting_get --app=$app --key=adguard_port) -dns_over_https=$(ynh_app_setting_get --app=$app --key=dns_over_https) +domain=$(ynh_app_setting_get --app="$app" --key=domain) +path_url=$(ynh_app_setting_get --app="$app" --key=path) +admin=$(ynh_app_setting_get --app="$app" --key=admin) +password=$(ynh_app_setting_get --app="$app" --key=password) +final_path=$(ynh_app_setting_get --app="$app" --key=final_path) +port=$(ynh_app_setting_get --app="$app" --key=port) +adguard_port=$(ynh_app_setting_get --app="$app" --key=adguard_port) +dns_over_https=$(ynh_app_setting_get --app="$app" --key=dns_over_https) #================================================= # CHECK VERSION @@ -54,11 +54,11 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" +ynh_systemd_action --service_name="$app" --action="stop" # Disable the port 53 for upnp -ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $adguard_port -ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $adguard_port +ynh_exec_warn_less yunohost firewall allow --no-upnp TCP "$adguard_port" +ynh_exec_warn_less yunohost firewall allow --no-upnp UDP "$adguard_port" #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -69,13 +69,13 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all - ynh_app_setting_delete --app=$app --key=is_public + ynh_app_setting_delete --app="$app" --key=is_public fi # The dns port should be 53 if [ "$adguard_port" -ne "53" ]; then adguard_port=53 - ynh_app_setting_set --app=$app --key=adguard_port --value=$adguard_port + ynh_app_setting_set --app="$app" --key=adguard_port --value="$adguard_port" fi # Create a permission if needed @@ -86,20 +86,20 @@ fi if [ -n "$dns_over_https" ] && [ "$dns_over_https" == "1" ]; then dns_over_https="true" - ynh_app_setting_set --app=$app --key=dns_over_https --value=$dns_over_https + ynh_app_setting_set --app="$app" --key=dns_over_https --value=$dns_over_https # DNS over TLS adguard_DoT_port=853 - ynh_app_setting_set --app=$app --key=adguard_DoT_port --value=$adguard_DoT_port + ynh_app_setting_set --app="$app" --key=adguard_DoT_port --value=$adguard_DoT_port ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $adguard_DoT_port ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $adguard_DoT_port # DNS over QUIC adguard_DoQ_port=784 - ynh_app_setting_set --app=$app --key=adguard_DoQ_port --value=$adguard_DoQ_port + ynh_app_setting_set --app="$app" --key=adguard_DoQ_port --value=$adguard_DoQ_port ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $adguard_DoQ_port elif [ -z "$dns_over_https" ] || [ "$dns_over_https" == "0" ]; then dns_over_https="false" - ynh_app_setting_set --app=$app --key=dns_over_https --value=$dns_over_https + ynh_app_setting_set --app="$app" --key=dns_over_https --value=$dns_over_https fi #================================================= @@ -108,7 +108,7 @@ fi ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" --groups="ssl-cert" +ynh_system_user_create --username="$app" --home_dir="$final_path" --groups="ssl-cert" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -119,21 +119,21 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir=$final_path --source_id="$YNH_ARCH" + ynh_setup_source --dest_dir="$final_path" --source_id="$YNH_ARCH" fi chmod 750 "$final_path" chmod -R o-rwx "$final_path" -chown -R $app:$app "$final_path" +chown -R "$app":"$app" "$final_path" -setcap 'CAP_NET_BIND_SERVICE=+eip CAP_NET_RAW=+eip' $final_path/AdGuardHome +setcap 'CAP_NET_BIND_SERVICE=+eip CAP_NET_RAW=+eip' "$final_path"/AdGuardHome #================================================= # UPGRADE DEPENDENCIES #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=1 -ynh_install_app_dependencies $pkg_dependencies +ynh_install_app_dependencies "$pkg_dependencies" #================================================= # NGINX CONFIGURATION @@ -175,18 +175,18 @@ ipv4_route_output=$(echo "$(ip -4 route get 1.2.3.4 2> /dev/null)" | head -n1) ipv6_route_output=$(echo "$(ip -6 route get ::1.2.3.4 2> /dev/null)" | head -n1) ipv4_addr="" -for i in $(seq "$(echo $ipv4_route_output | wc -w)" -1 1); do - ip=$(echo $ipv4_route_output | awk "{print \$$i}") - if ynh_validate_ip4 --ip_address=$ip; then +for i in $(seq "$(echo "$ipv4_route_output" | wc -w)" -1 1); do + ip=$(echo "$ipv4_route_output" | awk "{print \$$i}") + if ynh_validate_ip4 --ip_address="$ip"; then ipv4_addr="$ip" break fi done ipv6_addr="" -for i in $(seq "$(echo $ipv6_route_output | wc -w)" -1 1); do - ip=$(echo $ipv6_route_output | awk "{print \$$i}") - if ynh_validate_ip6 --ip_address=$ip; then +for i in $(seq "$(echo "$ipv6_route_output" | wc -w)" -1 1); do + ip=$(echo "$ipv6_route_output" | awk "{print \$$i}") + if ynh_validate_ip6 --ip_address="$ip"; then ipv6_addr="$ip" break fi @@ -217,7 +217,7 @@ if need_file_update: " chmod 600 "$final_path/AdGuardHome.yaml" -chown -R $app:$app "$final_path/AdGuardHome.yaml" +chown -R "$app":"$app" "$final_path/AdGuardHome.yaml" #================================================= # SETUP SYSTEMD @@ -232,14 +232,14 @@ ynh_add_systemd_config #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="Ads & trackers blocking DNS server" --needs_exposed_ports $adguard_port +yunohost service add "$app" --description="Ads & trackers blocking DNS server" --needs_exposed_ports "$adguard_port" #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" +ynh_systemd_action --service_name="$app" --action="restart" --log_path="systemd" #================================================= # RELOAD NGINX From ac38702732510ff6bad9c3837acdbf22fa8e0b50 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 7 Sep 2023 18:17:04 +0200 Subject: [PATCH 28/35] trying to fix "Unknown key 'services' found in config panel" --- config_panel.toml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index f57cd51..fd8de27 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -3,13 +3,14 @@ version = "1.0" [main] name = "Adguard configuration" - [main.options] - name = "Enable some features" +services = ["__APP__"] - [main.options.dns_over_https] - ask = "Enable DNS-over-HTTPS" - type = "boolean" - yes = "true" - no = "false" - bind = "allow_unencrypted_doh:__FINALPATH__/AdGuardHome.yaml" - services = [ '__APP__' ] \ No newline at end of file +[main.options] +name = "Enable some features" + +[main.options.dns_over_https] +ask = "Enable DNS-over-HTTPS" +bind = "allow_unencrypted_doh:__FINALPATH__/AdGuardHome.yaml" +no = "false" +type = "boolean" +yes = "true" From 38147bfcfa93e230ad5e34927fc856f5ef6afcae Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 12 Sep 2023 06:06:50 +0000 Subject: [PATCH 29/35] Upgrade to v0.107.38 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 9304c7f..64e479e 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.37/AdGuardHome_linux_amd64.tar.gz -SOURCE_SUM=9aeb96f09e781451526f521d277e22cd9f28784113767e1823e445702d113ce3 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.38/AdGuardHome_linux_amd64.tar.gz +SOURCE_SUM=0e45b77c8ea28365aaf8b88fed9b9ed10e9569e85d5e38f63c56e7915a53021f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/arm64.src b/conf/arm64.src index 912ed21..a7035c5 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.37/AdGuardHome_linux_arm64.tar.gz -SOURCE_SUM=d0a352bf77b9109c6cc93285fec0e060eeb4ab01cb4863b9be42a37a0c3c3997 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.38/AdGuardHome_linux_arm64.tar.gz +SOURCE_SUM=551dcc10f9d70f6efca0762f9b3011bb0672526ce2e2177b3d594c3b50e4e7d6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/armhf.src b/conf/armhf.src index 1d35d81..926ab07 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.37/AdGuardHome_linux_armv7.tar.gz -SOURCE_SUM=add136ab6dbf0a81136c3af7fa42660707ae577b1016d9cad2ce0bcc5c9e7cc7 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.38/AdGuardHome_linux_armv7.tar.gz +SOURCE_SUM=c49b9fa8cb60deb3d04d0a8fa4ea322aa830e470dc1ad649bc31f1c97361bdaa SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/manifest.json b/manifest.json index 816b53b..d4bc5de 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.37~ynh1", + "version": "0.107.38~ynh1", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From 45fd7f9cc3c30523d4afbc88baa5351000578629 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 12 Sep 2023 06:06:55 +0000 Subject: [PATCH 30/35] 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 1eb93c9..a4eefcd 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.37~ynh1 +**Shipped version:** 0.107.38~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index c33184f..f4f6042 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.37~ynh1 +**Version incluse :** 0.107.38~ynh1 ## Captures d’écran From 4e0b3d15a4ddb94cf959d57404ab1ce8c49f951e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 11 Oct 2023 17:38:21 +0000 Subject: [PATCH 31/35] Upgrade to v0.107.39 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 64e479e..831a95a 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.38/AdGuardHome_linux_amd64.tar.gz -SOURCE_SUM=0e45b77c8ea28365aaf8b88fed9b9ed10e9569e85d5e38f63c56e7915a53021f +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.39/AdGuardHome_linux_amd64.tar.gz +SOURCE_SUM=4d715426773fd15caccbfc8ec4517b4cfa2e4a78ee82c51ce1f92b34618e8e4c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/arm64.src b/conf/arm64.src index a7035c5..cbc7185 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.38/AdGuardHome_linux_arm64.tar.gz -SOURCE_SUM=551dcc10f9d70f6efca0762f9b3011bb0672526ce2e2177b3d594c3b50e4e7d6 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.39/AdGuardHome_linux_arm64.tar.gz +SOURCE_SUM=e909892f9cca99d6c81df42cd3cc216d8c38e0b7d2af4c56d907441e76aeb168 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/armhf.src b/conf/armhf.src index 926ab07..949ed84 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.38/AdGuardHome_linux_armv7.tar.gz -SOURCE_SUM=c49b9fa8cb60deb3d04d0a8fa4ea322aa830e470dc1ad649bc31f1c97361bdaa +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.39/AdGuardHome_linux_armv7.tar.gz +SOURCE_SUM=5f6a02e2901f3e49c9e6ba72f47d1817059b2de08992ce3fb5bf79509786e860 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/manifest.json b/manifest.json index d4bc5de..eef81b7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.38~ynh1", + "version": "0.107.39~ynh1", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From 4ad7b6c5752e70191d3a19473d7c4c7218a2ad13 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 11 Oct 2023 19:22:08 +0000 Subject: [PATCH 32/35] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a4eefcd..2f63af6 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.38~ynh1 +**Shipped version:** 0.107.39~ynh1 ## Screenshots @@ -33,7 +33,6 @@ It operates as a DNS server that re-routes tracking domains to a "black hole", t * Official user documentation: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index f4f6042..22b4118 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.38~ynh1 +**Version incluse :** 0.107.39~ynh1 ## Captures d’écran @@ -33,7 +33,6 @@ Il fonctionne comme un serveur DNS qui redirige les domaines de pistage vers un * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From bfc337621c380e31dbadef6ed582b4f706e6d971 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 18 Oct 2023 16:03:27 +0000 Subject: [PATCH 33/35] Upgrade to v0.107.40 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 831a95a..d0ae72c 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.39/AdGuardHome_linux_amd64.tar.gz -SOURCE_SUM=4d715426773fd15caccbfc8ec4517b4cfa2e4a78ee82c51ce1f92b34618e8e4c +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.40/AdGuardHome_linux_amd64.tar.gz +SOURCE_SUM=576b6d12eb3c4092ea316b7f03d1531b6d5292fa41908c4a393ef60b4a8d1192 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/arm64.src b/conf/arm64.src index cbc7185..b801682 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.39/AdGuardHome_linux_arm64.tar.gz -SOURCE_SUM=e909892f9cca99d6c81df42cd3cc216d8c38e0b7d2af4c56d907441e76aeb168 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.40/AdGuardHome_linux_arm64.tar.gz +SOURCE_SUM=6f5e8385016788102f6ff0e0505020f822dec0f13b102eefa5c06413e4912963 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/conf/armhf.src b/conf/armhf.src index 949ed84..c8a0312 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.39/AdGuardHome_linux_armv7.tar.gz -SOURCE_SUM=5f6a02e2901f3e49c9e6ba72f47d1817059b2de08992ce3fb5bf79509786e860 +SOURCE_URL=https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.40/AdGuardHome_linux_armv7.tar.gz +SOURCE_SUM=1380d456035a540ddbfcdc3713cc8cba9702f2f685b5621fb64bb1dffdd66fa3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 diff --git a/manifest.json b/manifest.json index eef81b7..b02748d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Network-wide ads & trackers blocking DNS server", "fr": "Serveur DNS, bloqueur de publicités et trackers" }, - "version": "0.107.39~ynh1", + "version": "0.107.40~ynh1", "url": "https://adguard.com/adguard-home.html", "upstream": { "license": "GPL-3.0", From a29b104723249104fb87aaebe295580bb27fe933 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 18 Oct 2023 16:03:33 +0000 Subject: [PATCH 34/35] 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 2f63af6..223f82b 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.39~ynh1 +**Shipped version:** 0.107.40~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 22b4118..0b281cb 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.39~ynh1 +**Version incluse :** 0.107.40~ynh1 ## Captures d’écran From 2256855ac5b321b247f591a5e586531d1dbe4a50 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Wed, 18 Oct 2023 18:45:10 +0200 Subject: [PATCH 35/35] explicit comment --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 11a54a8..e64c6cc 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -# dependencies used by the app +# dependencies used by the scripts (generating password and processing IPs) pkg_dependencies="python3-bcrypt python3-yaml" #=================================================