Update AdGuard Home to Debian 13 and improve install (#7720)

ct/adguard.sh

@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}"
 var_ram="${var_ram:-512}"
 var_disk="${var_disk:-2}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -20,15 +20,15 @@ color
 catch_errors
 
 function update_script() {
-    header_info
+  header_info
-    check_container_storage
+  check_container_storage
-    check_container_resources
+  check_container_resources
-    if [[ ! -d /opt/AdGuardHome ]]; then
+  if [[ ! -d /opt/AdGuardHome ]]; then
-        msg_error "No ${APP} Installation Found!"
+    msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-    msg_error "Adguard Home should be updated via the user interface."
     exit
+  fi
+  msg_error "Adguard Home can only be updated via the user interface."
+  exit
 }
 
 start
@@ -38,4 +38,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}"

frontend/public/json/adguard.json

@@ -1,51 +1,51 @@
 {
-    "name": "AdGuard Home",
+  "name": "AdGuard Home",
-    "slug": "adguard",
+  "slug": "adguard",
-    "categories": [
+  "categories": [
-        5
+    5
-    ],
+  ],
-    "date_created": "2024-04-28",
+  "date_created": "2024-04-28",
-    "type": "ct",
+  "type": "ct",
-    "updateable": true,
+  "updateable": true,
-    "privileged": false,
+  "privileged": false,
-    "interface_port": 3000,
+  "interface_port": 3000,
-    "documentation": "https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started",
+  "documentation": "https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started",
-    "website": "https://adguard.com/en/adguard-home/overview.html",
+  "website": "https://adguard.com/en/adguard-home/overview.html",
-    "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/adguard-home.webp",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/adguard-home.webp",
-    "config_path": "/opt/AdGuardHome/AdGuardHome.yaml",
+  "config_path": "/opt/AdGuardHome/AdGuardHome.yaml",
-    "description": "AdGuard Home is an open-source, self-hosted network-wide ad blocker. It blocks advertisements, trackers, phishing and malware websites, and provides protection against online threats. AdGuard Home is a DNS-based solution, which means it blocks ads and malicious content at the network level, before it even reaches your device. It runs on your home network and can be easily configured and managed through a web-based interface. It provides detailed statistics and logs, allowing you to see which websites are being blocked, and why. AdGuard Home is designed to be fast, lightweight, and easy to use, making it an ideal solution for home users who want to block ads, protect their privacy, and improve the speed and security of their online experience.",
+  "description": "AdGuard Home is an open-source, self-hosted network-wide ad blocker. It blocks advertisements, trackers, phishing and malware websites, and provides protection against online threats. AdGuard Home is a DNS-based solution, which means it blocks ads and malicious content at the network level, before it even reaches your device. It runs on your home network and can be easily configured and managed through a web-based interface. It provides detailed statistics and logs, allowing you to see which websites are being blocked, and why. AdGuard Home is designed to be fast, lightweight, and easy to use, making it an ideal solution for home users who want to block ads, protect their privacy, and improve the speed and security of their online experience.",
-    "install_methods": [
+  "install_methods": [
-        {
+    {
-            "type": "default",
+      "type": "default",
-            "script": "ct/adguard.sh",
+      "script": "ct/adguard.sh",
-            "resources": {
+      "resources": {
-                "cpu": 1,
+        "cpu": 1,
-                "ram": 512,
+        "ram": 512,
-                "hdd": 2,
+        "hdd": 2,
-                "os": "debian",
+        "os": "debian",
-                "version": "12"
+        "version": "13"
-            }
+      }
-        },
-        {
-            "type": "alpine",
-            "script": "ct/alpine-adguard.sh",
-            "resources": {
-                "cpu": 1,
-                "ram": 256,
-                "hdd": 1,
-                "os": "alpine",
-                "version": "3.22"
-            }
-        }
-    ],
-    "default_credentials": {
-        "username": null,
-        "password": null
     },
-    "notes": [
+    {
-        {
+      "type": "alpine",
-            "text": "Adguard Home can be updated via the user interface.",
+      "script": "ct/alpine-adguard.sh",
-            "type": "info"
+      "resources": {
-        }
+        "cpu": 1,
-    ]
+        "ram": 256,
+        "hdd": 1,
+        "os": "alpine",
+        "version": "3.22"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": null,
+    "password": null
+  },
+  "notes": [
+    {
+      "text": "AdGuard Home can only be updated via the user interface.",
+      "type": "info"
+    }
+  ]
 }

install/adguard-install.sh

@@ -13,9 +13,7 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing AdGuard Home"
+fetch_and_deploy_gh_release "AdGuardHome" "AdguardTeam/AdGuardHome" "prebuild" "latest" "/opt/AdGuardHome" "AdGuardHome_linux_amd64.tar.gz"
-$STD tar zxvf <(curl -fsSL https://static.adtidy.org/adguardhome/release/AdGuardHome_linux_amd64.tar.gz) -C /opt
-msg_ok "Installed AdGuard Home"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/AdGuardHome.service
@@ -45,6 +43,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-$STD apt-get -y autoremove
+$STD apt -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"