feat: 修改一些软件的配置文件

2024-11-10 14:56:58 +08:00 · 2023-03-11 12:27:32 +08:00 · 2023-03-11 12:27:32 +08:00 · 3a18a5f5c0
commit 3a18a5f5c0
parent 722dface7b
14 changed files with 27 additions and 33 deletions
--- a/apps/dataease/versions/1.18.2/docker-compose.yml
+++ b/apps/dataease/versions/1.18.2/docker-compose.yml
@ -2,6 +2,7 @@ version: '3'
 services:
  dataease:
    image: registry.cn-qingdao.aliyuncs.com/dataease/dataease:v1.18.2
+    restart: always
    container_name: ${CONTAINER_NAME}
    ports:
      - ${PANEL_APP_PORT_HTTP}:8081
--- a/apps/gitlab/versions/15.8.3/config.json
+++ b/apps/gitlab/versions/15.8.3/config.json
@ -2,7 +2,7 @@
  "formFields": [
    {
      "type": "text",
-      "labelZh": "访问地址",
+      "labelZh": "域名或IP",
      "labelEn": "Address",
      "required": true,
      "default": "",
--- a/apps/gitlab/versions/15.8.3/docker-compose.yml
+++ b/apps/gitlab/versions/15.8.3/docker-compose.yml
@ -6,6 +6,7 @@ services:
    restart: always
    hostname: ${GITLAB_HOSTNAME}
    environment:
+      TZ: 'Asia/Shanghai'
      GITLAB_OMNIBUS_CONFIG: |
        external_url 'http://${GITLAB_HOSTNAME}:${PANEL_APP_PORT_HTTP}'
    ports:
--- a/apps/halo/versions/2.2.0/config.json
+++ b/apps/halo/versions/2.2.0/config.json
@ -1,5 +1,4 @@
 {
-
  "formFields": [
    {
      "type": "apps",
@ -43,7 +42,8 @@
      "default": "halo",
      "random": true,
      "rule": "paramCommon",
-      "envKey": "PANEL_DB_NAME"
+      "envKey": "PANEL_DB_NAME",
+      "edit": true
    },
    {
      "type": "text",
@ -53,7 +53,8 @@
      "default": "halo",
      "random": true,
      "rule": "paramCommon",
-      "envKey": "PANEL_DB_USER"
+      "envKey": "PANEL_DB_USER",
+      "edit": true
    },
    {
      "type": "password",
@ -63,7 +64,8 @@
      "default": "halo",
      "random": true,
      "rule": "paramComplexity",
-      "envKey": "PANEL_DB_USER_PASSWORD"
+      "envKey": "PANEL_DB_USER_PASSWORD",
+      "edit": true
    },
    {
      "type": "text",
@ -73,7 +75,8 @@
      "default": "admin",
      "random": true,
      "rule": "paramCommon",
-      "envKey": "HALO_ADMIN"
+      "envKey": "HALO_ADMIN",
+      "edit": true
    },
    {
      "type": "password",
@ -83,7 +86,8 @@
      "default": "halo",
      "random": true,
      "rule": "paramComplexity",
-      "envKey": "HALO_ADMIN_PASSWORD"
+      "envKey": "HALO_ADMIN_PASSWORD",
+      "edit": true
    },
    {
      "type": "text",
@ -92,7 +96,8 @@
      "required": true,
      "default": "http://localhost:8080",
      "rule": "paramExtUrl",
-      "envKey": "HALO_EXTERNAL_URL"
+      "envKey": "HALO_EXTERNAL_URL",
+      "edit": true
    },
    {
      "type": "number",
@ -101,7 +106,8 @@
      "required": true,
      "default": 8080,
      "rule": "paramPort",
-      "envKey": "PANEL_APP_PORT_HTTP"
+      "envKey": "PANEL_APP_PORT_HTTP",
+      "edit": true
    }
  ]
 }
--- a/apps/halo/versions/2.2.0/docker-compose.yml
+++ b/apps/halo/versions/2.2.0/docker-compose.yml
@ -7,7 +7,7 @@ services:
    networks:
      - 1panel-network
    volumes:
-      - ./data:/root/.halo
+      - ./data:/root/.halo2
    ports:
      - ${PANEL_APP_PORT_HTTP}:8090
    command:
--- a/apps/halo/versions/2.3.0/config.json
+++ b/apps/halo/versions/2.3.0/config.json
@ -1,5 +1,4 @@
 {
-
  "formFields": [
    {
      "type": "apps",
--- a/apps/halo/versions/2.3.0/docker-compose.yml
+++ b/apps/halo/versions/2.3.0/docker-compose.yml
@ -7,7 +7,7 @@ services:
    networks:
      - 1panel-network
    volumes:
-      - ./data:/root/.halo
+      - ./data:/root/.halo2
    ports:
      - ${PANEL_APP_PORT_HTTP}:8090
    command:
--- a/apps/jenkins/versions/2.391/docker-compose.yml
+++ b/apps/jenkins/versions/2.391/docker-compose.yml
@ -3,7 +3,7 @@ services:
  jenkins:
    container_name: ${CONTAINER_NAME}
    image: jenkins/jenkins:2.391
-    restart: unless-stopped
+    restart: always
    privileged: true
    user: root
    ports:
--- a/apps/list.json
+++ b/apps/list.json
@ -168,20 +168,6 @@
      "github": "https://github.com/jenkinsci/jenkins",
      "document": "https://www.jenkins.io/doc/book/"
    },
-    {
-      "key": "gitlab",
-      "name": "GitLab",
-      "tags": ["CI/CD"],
-      "versions": ["15.8.3"],
-      "shortDescZh": "项目管理和代码托管平台",
-      "shortDescEn": "Project management and code hosting platform",
-      "type": "tool",
-      "limit": 1,
-      "crossVersionUpdate": false,
-      "website": "https://about.gitlab.com/",
-      "github": "https://github.com/gitlabhq/gitlabhq",
-      "document": "https://docs.gitlab.com/"
-    },
    {
      "key": "postgresql",
      "name": "PostgreSQL",
--- a/apps/mariadb/versions/10.9.5/docker-compose.yml
+++ b/apps/mariadb/versions/10.9.5/docker-compose.yml
@ -2,6 +2,7 @@ version: '3'
 services:
  mariadb:
    container_name: ${CONTAINER_NAME}
+    restart: always
    networks:
      - 1panel-network
    image: "mariadb:10.9.5"
--- a/apps/mongodb/versions/6.0.4/docker-compose.yml
+++ b/apps/mongodb/versions/6.0.4/docker-compose.yml
@ -3,6 +3,7 @@ services:
  mongodb:
    container_name: ${CONTAINER_NAME}
    image: mongo:6.0.4
+    restart: always
    environment:
      MONGO_INITDB_ROOT_USERNAME: ${PANEL_DB_ROOT_USER}
      MONGO_INITDB_ROOT_PASSWORD: ${PANEL_DB_ROOT_PASSWORD}
--- a/apps/openresty/versions/1.21.4/conf/nginx.conf
+++ b/apps/openresty/versions/1.21.4/conf/nginx.conf
@ -1,20 +1,16 @@
 user  root;
 worker_processes  auto;
-
 error_log  /var/log/nginx/error.log notice;
 error_log  /dev/stdout notice;
 pid        /var/run/nginx.pid;

-
 events {
    worker_connections  1024;
 }

-
 http {
    include       mime.types;
    default_type  application/octet-stream;
-
    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                      '$status $body_bytes_sent "$http_referer" '
                      '"$http_user_agent" "$http_x_forwarded_for"';
@ -38,11 +34,13 @@ http {
    gzip_proxied   expired no-cache no-store private auth;
    gzip_disable   "MSIE [1-6]\.";

-
    lua_code_cache on;
    lua_shared_dict limit 10m;
    lua_package_path "/www/common/waf/?.lua;/usr/local/openresty/lualib/?.lua;";
    init_by_lua_file  /www/common/waf/init.lua;

+    limit_conn_zone $binary_remote_addr zone=perip:10m;
+    limit_conn_zone $server_name zone=perserver:10m;
+
    include /usr/local/openresty/nginx/conf/conf.d/*.conf;
 }
--- a/apps/phpmyadmin/versions/5.2.0/docker-compose.yml
+++ b/apps/phpmyadmin/versions/5.2.0/docker-compose.yml
@ -3,6 +3,7 @@ services:
  phpmyadmin:
    image: phpmyadmin/phpmyadmin:5.2.0
    container_name: ${CONTAINER_NAME}
+    restart: always
    ports:
      - ${PANEL_APP_PORT_HTTP}:80
    environment:
--- a/apps/redis/versions/6.0.16/docker-compose.yml
+++ b/apps/redis/versions/6.0.16/docker-compose.yml
@ -8,7 +8,7 @@ services:
      - 1panel-network
    ports:
      - ${PANEL_APP_PORT_HTTP}:6379
-    command: redis-server  /etc/redis/redis.conf --save 20 1 --loglevel warning --requirepass ${PANEL_DB_ROOT_PASSWORD}
+    command: redis-server  /etc/redis/redis.conf --loglevel warning --requirepass ${PANEL_DB_ROOT_PASSWORD}
    volumes:
      - ./data:/data
      - ./conf/redis.conf:/etc/redis/redis.conf