From 88cf9572ae16c1d40b7fe11b708b6ffc194c5c05 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <31820853+zhengkunwang223@users.noreply.github.com>
Date: Thu, 6 Jul 2023 13:58:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=20adguardhome=20?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=20(#206)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adguardhome/0.107.33/data.yml           | 192 ++++++++++++------------
 adguardhome/0.107.33/docker-compose.yml |  64 ++++----
 synapse/1.86.0/data.yml                 |  11 --
 synapse/1.86.0/docker-compose.yml       |  30 ----
 4 files changed, 128 insertions(+), 169 deletions(-)
 delete mode 100644 synapse/1.86.0/data.yml
 delete mode 100644 synapse/1.86.0/docker-compose.yml

diff --git a/adguardhome/0.107.33/data.yml b/adguardhome/0.107.33/data.yml
index 742b03ac4..a044fb8db 100644
--- a/adguardhome/0.107.33/data.yml
+++ b/adguardhome/0.107.33/data.yml
@@ -1,96 +1,96 @@
-additionalProperties:
-    formFields:
-        - default: 20053
-          edit: true
-          envKey: PLAIN_DNS_PORT
-          labelEn: Plain DNS port
-          labelZh: 普通DNS端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: 20067
-          edit: true
-          envKey: DHCP_PORT1
-          labelEn: DHCP service port 1
-          labelZh: DHCP服务端口1
-          required: true
-          rule: paramPort
-          type: number
-        - default: 20068
-          edit: true
-          envKey: DHCP_PORT2
-          labelEn: DHCP service port 2
-          labelZh: DHCP服务端口2
-          required: true
-          rule: paramPort
-          type: number
-        - default: 23000
-          edit: true
-          envKey: HTTP_PORT
-          labelEn: HTTP web port
-          labelZh: HTTP网页端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: 23001
-          edit: true
-          envKey: PANEL_APP_PORT_HTTP
-          labelEn: Initial setup web page port
-          labelZh: 初始设置网页端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: 20443
-          edit: true
-          envKey: DOH_PORT
-          labelEn: DOH service port
-          labelZh: DOH服务端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: 853
-          edit: true
-          envKey: DOT_PORT
-          labelEn: DOT service port
-          labelZh: DOT服务端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: 20784
-          edit: true
-          envKey: QUIC_PORT1
-          labelEn: QUIC service port 1
-          labelZh: QUIC服务端口1
-          required: true
-          rule: paramPort
-          type: number
-        - default: 8853
-          edit: true
-          envKey: QUIC_PORT2
-          labelEn: QUIC service port 2
-          labelZh: QUIC服务端口2
-          required: true
-          rule: paramPort
-          type: number
-        - default: 5443
-          edit: true
-          envKey: DNS_CRYPT_PORT
-          labelEn: DNS Crypt service port
-          labelZh: DNS Crypt服务端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: ./data/work
-          edit: true
-          envKey: WORK_PATH
-          labelEn: Work data folder path
-          labelZh: 工作数据文件夹路径
-          required: true
-          type: text
-        - default: ./data/conf
-          edit: true
-          envKey: CONFIG_PATH
-          labelEn: Configuration folder path
-          labelZh: 配置文件夹路径
-          required: true
-          type: text
+additionalProperties:
+    formFields:
+        - default: 20053
+          edit: true
+          envKey: PLAIN_DNS_PORT
+          labelEn: Plain DNS port
+          labelZh: 普通DNS端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: 20067
+          edit: true
+          envKey: DHCP_PORT1
+          labelEn: DHCP service port 1
+          labelZh: DHCP服务端口1
+          required: true
+          rule: paramPort
+          type: number
+        - default: 20068
+          edit: true
+          envKey: DHCP_PORT2
+          labelEn: DHCP service port 2
+          labelZh: DHCP服务端口2
+          required: true
+          rule: paramPort
+          type: number
+        - default: 23000
+          edit: true
+          envKey: HTTP_PORT
+          labelEn: HTTP web port
+          labelZh: HTTP网页端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: 23001
+          edit: true
+          envKey: PANEL_APP_PORT_HTTP
+          labelEn: Initial setup web page port
+          labelZh: 初始设置网页端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: 20443
+          edit: true
+          envKey: DOH_PORT
+          labelEn: DOH service port
+          labelZh: DOH服务端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: 853
+          edit: true
+          envKey: DOT_PORT
+          labelEn: DOT service port
+          labelZh: DOT服务端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: 20784
+          edit: true
+          envKey: QUIC_PORT1
+          labelEn: QUIC service port 1
+          labelZh: QUIC服务端口1
+          required: true
+          rule: paramPort
+          type: number
+        - default: 8853
+          edit: true
+          envKey: QUIC_PORT2
+          labelEn: QUIC service port 2
+          labelZh: QUIC服务端口2
+          required: true
+          rule: paramPort
+          type: number
+        - default: 5443
+          edit: true
+          envKey: DNS_CRYPT_PORT
+          labelEn: DNS Crypt service port
+          labelZh: DNS Crypt服务端口
+          required: true
+          rule: paramPort
+          type: number
+        - default: ./data/work
+          edit: true
+          envKey: WORK_PATH
+          labelEn: Work data folder path
+          labelZh: 工作数据文件夹路径
+          required: true
+          type: text
+        - default: ./data/conf
+          edit: true
+          envKey: CONFIG_PATH
+          labelEn: Configuration folder path
+          labelZh: 配置文件夹路径
+          required: true
+          type: text
diff --git a/adguardhome/0.107.33/docker-compose.yml b/adguardhome/0.107.33/docker-compose.yml
index f77a57351..c8d8ca48a 100644
--- a/adguardhome/0.107.33/docker-compose.yml
+++ b/adguardhome/0.107.33/docker-compose.yml
@@ -1,32 +1,32 @@
-version: '3'
-services:
-  adguardhome:
-    container_name: ${CONTAINER_NAME}
-    restart: always
-    networks:
-      - 1panel-network
-    ports:
-      - ${PLAIN_DNS_PORT}:53/tcp
-      - ${PLAIN_DNS_PORT}:53/udp
-      - ${DHCP_PORT1}:67/udp
-      - ${DHCP_PORT2}:68/udp
-      - ${HTTP_PORT}:80/tcp
-      - ${DOH_PORT}:443/tcp
-      - ${DOH_PORT}:443/udp
-      - ${PANEL_APP_PORT_HTTP}:3000/tcp
-      - ${DOT_PORT}:853/tcp
-      - ${QUIC_PORT1}:784/udp
-      - ${DOT_PORT}:853/udp
-      - ${QUIC_PORT2}:8853/udp
-      - ${DNS_CRYPT_PORT}:5443/tcp
-      - ${DNS_CRYPT_PORT}:5443/udp
-    volumes:
-      - ${WORK_PATH}:/opt/adguardhome/work
-      - ${CONFIG_PATH}:/opt/adguardhome/conf
-    image: adguard/adguardhome:v0.107.33
-    labels:  
-      createdBy: "Apps" 
-
-networks:  
-  1panel-network:  
-    external: true
+version: '3'
+services:
+  adguardhome:
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - ${PLAIN_DNS_PORT}:53/tcp
+      - ${PLAIN_DNS_PORT}:53/udp
+      - ${DHCP_PORT1}:67/udp
+      - ${DHCP_PORT2}:68/udp
+      - ${HTTP_PORT}:80/tcp
+      - ${DOH_PORT}:443/tcp
+      - ${DOH_PORT}:443/udp
+      - ${PANEL_APP_PORT_HTTP}:3000/tcp
+      - ${DOT_PORT}:853/tcp
+      - ${QUIC_PORT1}:784/udp
+      - ${DOT_PORT}:853/udp
+      - ${QUIC_PORT2}:8853/udp
+      - ${DNS_CRYPT_PORT}:5443/tcp
+      - ${DNS_CRYPT_PORT}:5443/udp
+    volumes:
+      - ${WORK_PATH}:/opt/adguardhome/work
+      - ${CONFIG_PATH}:/opt/adguardhome/conf
+    image: adguard/adguardhome:v0.107.33
+    labels:  
+      createdBy: "Apps" 
+
+networks:  
+  1panel-network:  
+    external: true
diff --git a/synapse/1.86.0/data.yml b/synapse/1.86.0/data.yml
deleted file mode 100644
index 70a3eec15..000000000
--- a/synapse/1.86.0/data.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-additionalProperties:
-    formFields:
-        - default: 40026
-          edit: true
-          envKey: PANEL_APP_PORT_HTTP
-          labelEn: Port
-          labelZh: 端口
-          required: true
-          rule: paramPort
-          type: number
-
diff --git a/synapse/1.86.0/docker-compose.yml b/synapse/1.86.0/docker-compose.yml
deleted file mode 100644
index 5f9b71ac3..000000000
--- a/synapse/1.86.0/docker-compose.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-version: "3"
-services:
-  synapse:
-    container_name: ${CONTAINER_NAME}
-    restart: always
-    networks:
-      - 1panel-network
-    volumes:
-      - synapse-data:/data
-    ports:
-      - "${PANEL_APP_PORT_HTTP}:8008"
-    environment:
-      - TZ=Asia/Shanghai
-      - UID=1000
-      - GID=1000
-    image: matrixdotorg/synapse:v1.86.0
-    logging:
-      options:
-        max-size: "10m"
-    command: run -m synapse.app.homeserver --config-path=/data/homeserver.yaml
-    labels:  
-      createdBy: "Apps"
-
-volumes:
-  synapse-data:
-    external: true
-
-networks:  
-  1panel-network:  
-    external: true