From d3f621113d08de7a99d32463d1b94fef3f224b67 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Mon, 28 Aug 2023 11:05:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20uuwaf=20=E5=8D=87=E7=BA=A7=E5=88=B0=20v?= =?UTF-8?q?2.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/alist/data.yml | 2 +- apps/dataease/data.yml | 2 +- apps/jumpserver/data.yml | 2 +- apps/openresty/1.21.4.2/data.yml | 2 -- apps/uuwaf/{2.5.1 => 2.6.0}/data.yml | 0 .../uuwaf/{2.5.1 => 2.6.0}/docker-compose.yml | 20 +++++-------------- apps/uuwaf/data.yml | 2 +- apps/zentao/data.yml | 2 +- data.yaml | 3 ++- 9 files changed, 12 insertions(+), 23 deletions(-) rename apps/uuwaf/{2.5.1 => 2.6.0}/data.yml (100%) rename apps/uuwaf/{2.5.1 => 2.6.0}/docker-compose.yml (68%) diff --git a/apps/alist/data.yml b/apps/alist/data.yml index d56a83fd..8020af80 100755 --- a/apps/alist/data.yml +++ b/apps/alist/data.yml @@ -14,7 +14,7 @@ additionalProperties: type: tool crossVersionUpdate: true limit: 0 - recommend: 8 + recommend: 9 website: https://github.com/alist-org/alist github: https://github.com/alist-org/alist document: https://alist.nn.ci/zh/ diff --git a/apps/dataease/data.yml b/apps/dataease/data.yml index 67a837d9..47c895e9 100755 --- a/apps/dataease/data.yml +++ b/apps/dataease/data.yml @@ -14,7 +14,7 @@ additionalProperties: type: tool crossVersionUpdate: true limit: 0 - recommend: 6 + recommend: 7 website: https://dataease.io/ github: https://github.com/dataease/dataease document: https://dataease.io/docs/ diff --git a/apps/jumpserver/data.yml b/apps/jumpserver/data.yml index 8d144061..ad3f6ea3 100644 --- a/apps/jumpserver/data.yml +++ b/apps/jumpserver/data.yml @@ -14,7 +14,7 @@ additionalProperties: type: tool crossVersionUpdate: true limit: 1 - recommend: 7 + recommend: 8 website: https://www.jumpserver.org github: https://github.com/jumpserver/jumpserver document: https://docs.jumpserver.org \ No newline at end of file diff --git a/apps/openresty/1.21.4.2/data.yml b/apps/openresty/1.21.4.2/data.yml index 7db4b550..f4da223c 100755 --- a/apps/openresty/1.21.4.2/data.yml +++ b/apps/openresty/1.21.4.2/data.yml @@ -1,14 +1,12 @@ additionalProperties: formFields: - default: 80 - disabled: true envKey: PANEL_APP_PORT_HTTP labelEn: HTTP Port labelZh: HTTP 端口 required: true type: number - default: 443 - disabled: true envKey: PANEL_APP_PORT_HTTPS labelEn: HTTPS Port labelZh: HTTPS 端口 diff --git a/apps/uuwaf/2.5.1/data.yml b/apps/uuwaf/2.6.0/data.yml similarity index 100% rename from apps/uuwaf/2.5.1/data.yml rename to apps/uuwaf/2.6.0/data.yml diff --git a/apps/uuwaf/2.5.1/docker-compose.yml b/apps/uuwaf/2.6.0/docker-compose.yml similarity index 68% rename from apps/uuwaf/2.5.1/docker-compose.yml rename to apps/uuwaf/2.6.0/docker-compose.yml index b7c0a809..495edee0 100644 --- a/apps/uuwaf/2.5.1/docker-compose.yml +++ b/apps/uuwaf/2.6.0/docker-compose.yml @@ -1,18 +1,10 @@ networks: - wafnet: - name: wafnet - driver: bridge - ipam: - driver: default - config: - - gateway: 172.22.0.1 - subnet: 172.22.0.0/24 - driver_opts: - com.docker.network.bridge.name: wafnet + 1panel-network: + external: true services: uuwaf: - image: uusec/nanqiang:v2.5.1 + image: uusec/nanqiang:v2.6.0 ulimits: nproc: 65535 nofile: @@ -20,8 +12,7 @@ services: hard: 102400 container_name: uuwaf networks: - wafnet: - ipv4_address: 172.22.0.3 + - 1panel-network ports: - ${PANEL_APP_PORT_HTTP1}:80 - ${PANEL_APP_PORT_HTTPS2}:443 @@ -40,8 +31,7 @@ services: image: percona:8 container_name: wafdb networks: - wafnet: - ipv4_address: 172.22.0.7 + - 1panel-network volumes: - wafshared:/docker-entrypoint-initdb.d - wafdata:/var/lib/mysql diff --git a/apps/uuwaf/data.yml b/apps/uuwaf/data.yml index fb210df1..d14ac218 100644 --- a/apps/uuwaf/data.yml +++ b/apps/uuwaf/data.yml @@ -14,7 +14,7 @@ additionalProperties: type: tool crossVersionUpdate: false limit: 1 - recommend: 0 + recommend: 6 website: https://waf.uusec.com/#/ github: https://github.com/Safe3/uuWAF document: https://waf.uusec.com/#/?id=main diff --git a/apps/zentao/data.yml b/apps/zentao/data.yml index b27115f4..dcb327d3 100644 --- a/apps/zentao/data.yml +++ b/apps/zentao/data.yml @@ -14,7 +14,7 @@ additionalProperties: type: tool crossVersionUpdate: true limit: 0 - recommend: 9 + recommend: 10 website: https://www.zentao.net/index.html github: https://github.com/easysoft/zentaopms document: https://www.zentao.net/book/zentaopms/38.html diff --git a/data.yaml b/data.yaml index b198e632..9d51de06 100644 --- a/data.yaml +++ b/data.yaml @@ -15,4 +15,5 @@ additionalProperties: - key: CI/CD name: CI/CD - key: Local - name: 本地 \ No newline at end of file + name: 本地 + version: v1.5.0 \ No newline at end of file