feat:添加synapse-admin、nginx-ui、zabbix-gent到列表

apps/nginx-ui/2.0.0-beta.3/data.yml

@@ -3,8 +3,8 @@ additionalProperties:
         - default: 31080
           edit: true
           envKey: PANEL_APP_PORT_HTTP
-          labelEn: HTTP Port
-          labelZh: HTTP端口
+          labelEn: Console Port
+          labelZh: 控制台端口
           required: true
           rule: paramPort
           type: number

apps/nginx-ui/latest/data.yml

@@ -3,8 +3,8 @@ additionalProperties:
         - default: 31080
           edit: true
           envKey: PANEL_APP_PORT_HTTP
-          labelEn: HTTP Port
-          labelZh: HTTP端口
+          labelEn: Console Port
+          labelZh: 控制台端口
           required: true
           rule: paramPort
           type: number

apps/zabbix-server/6.4.4-mysql/.env.sample

@@ -1,8 +1,8 @@
 CONTAINER_NAME="zabbix-server"
+PANEL_APP_PORT_HTTP2="10051"
 PANEL_APP_PORT_HTTP="40047"
-PANEL_APP_PORT_HTTP2="40048"
 PANEL_DB_HOST="127.0.0.1"
-FLARUM_DB_PORT="3306"
+ZABBIX_DB_PORT="3306"
 PANEL_DB_NAME="zabbix"
 PANEL_DB_USER="zabbix"
 PANEL_DB_USER_PASSWORD="MyDBPWD_brls9UwcRasl"

apps/zabbix-server/6.4.4-mysql/data.yml

@@ -50,7 +50,7 @@ additionalProperties:
           type: password
         - default: 10051
           edit: true
-          envKey: PANEL_APP_PORT_HTTP
+          envKey: PANEL_APP_PORT_HTTP2
           labelEn: Gateway port
           labelZh: 网关端口
           required: true
@@ -58,7 +58,7 @@ additionalProperties:
           type: number
         - default: 40047
           edit: true
-          envKey: PANEL_APP_PORT_HTTP2
+          envKey: PANEL_APP_PORT_HTTP
           labelEn: Port
           labelZh: 端口
           required: true

apps/zabbix-server/6.4.4-mysql/docker-compose.yml

@@ -6,9 +6,10 @@ services:
     networks:
       - 1panel-network
     ports:
-      - "${PANEL_APP_PORT_HTTP}:10051"
+      - "${PANEL_APP_PORT_HTTP2}:10051"
     environment:
       - DB_SERVER_HOST=${PANEL_DB_HOST}
+      - DB_SERVER_PORT=${ZABBIX_DB_PORT}
       - MYSQL_DATABASE=${PANEL_DB_NAME}
       - MYSQL_USER=${PANEL_DB_USER}
       - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
@@ -42,7 +43,7 @@ services:
       - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
       #- MYSQL_ROOT_PASSWORD=root_pwd
     ports:
-      - ${PANEL_APP_PORT_HTTP2}:8080
+      - ${PANEL_APP_PORT_HTTP}:8080
     image: zabbix/zabbix-web-nginx-mysql:alpine-6.4.4
     depends_on:
       - zabbix-server-mysql

apps/zabbix-server/README.md

@@ -1,3 +1,17 @@
+# 使用说明
+
+默认账户与密码
+
+```
+username:admin
+password:zabbix
+```
+
+**注意：Zabbix-MySQL版本的，Zabbix 6.X的需求环境MySQL8**
+
+
+# 原始相关
+
 Zabbix is free software, released under the GNU General Public License
 (GPL) version 2.
 

apps/zabbix-server/data.yml.bak

@@ -13,7 +13,7 @@ additionalProperties:
     shortDescEn: Real-time monitoring of IT components and services (Server)
     type: tool
     crossVersionUpdate: true
-    limit: 0
+    limit: 1
     recommend: 0
     website: https://www.zabbix.com/
     github: https://github.com/zabbix/zabbix

apps/zabbix-server/latest-mysql/.env.sample

@@ -1,8 +1,8 @@
 CONTAINER_NAME="zabbix-server"
-PANEL_APP_PORT_HTTP="10051"
-PANEL_APP_PORT_HTTP2="40047"
+PANEL_APP_PORT_HTTP2="10051"
+PANEL_APP_PORT_HTTP="40047"
 PANEL_DB_HOST="127.0.0.1"
-FLARUM_DB_PORT="3306"
+ZABBIX_DB_PORT="3306"
 PANEL_DB_NAME="zabbix"
 PANEL_DB_USER="zabbix"
 PANEL_DB_USER_PASSWORD="MyDBPWD_brls9UwcRasl"

apps/zabbix-server/latest-mysql/data.yml

@@ -48,17 +48,17 @@ additionalProperties:
           required: true
           rule: paramComplexity
           type: password
-        - default: 40047
+        - default: 10051
           edit: true
-          envKey: PANEL_APP_PORT_HTTP
+          envKey: PANEL_APP_PORT_HTTP2
           labelEn: Gateway port
           labelZh: 网关端口
           required: true
           rule: paramPort
           type: number
-        - default: 40048
+        - default: 40047
           edit: true
-          envKey: PANEL_APP_PORT_HTTP2
+          envKey: PANEL_APP_PORT_HTTP
           labelEn: Port
           labelZh: 端口
           required: true

apps/zabbix-server/latest-mysql/docker-compose.yml

@@ -6,9 +6,10 @@ services:
     networks:
       - 1panel-network
     ports:
-      - "${PANEL_APP_PORT_HTTP}:10051"
+      - "${PANEL_APP_PORT_HTTP2}:10051"
     environment:
       - DB_SERVER_HOST=${PANEL_DB_HOST}
+      - DB_SERVER_PORT=${ZABBIX_DB_PORT}
       - MYSQL_DATABASE=${PANEL_DB_NAME}
       - MYSQL_USER=${PANEL_DB_USER}
       - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
@@ -42,7 +43,7 @@ services:
       - MYSQL_PASSWORD=${PANEL_DB_USER_PASSWORD}
       #- MYSQL_ROOT_PASSWORD=root_pwd
     ports:
-      - ${PANEL_APP_PORT_HTTP2}:8080
+      - ${PANEL_APP_PORT_HTTP}:8080
     image: zabbix/zabbix-web-nginx-mysql:alpine-latest
     depends_on:
       - zabbix-server-mysql