diff --git a/apps/list.json b/apps/list.json index 7ca649cd0..4eb337402 100644 --- a/apps/list.json +++ b/apps/list.json @@ -109,6 +109,19 @@ "limit": 1, "crossVersionUpdate": true, "source": "https://github.com/joeferner/redis-commander" + }, + { + "key": "minio", + "name": "MinIO", + "tags": ["Tool"], + "versions": ["RELEASE.2022-08-13T21-54-44Z"], + "short_desc": "开源的对象存储服务器", + "author": "minio", + "type": "tool", + "required": [], + "limit": 1, + "crossVersionUpdate": true, + "source": "https://github.com/minio/minio" } ] } \ No newline at end of file diff --git a/apps/minio/metadata/minio.png b/apps/minio/metadata/minio.png new file mode 100644 index 000000000..72c994c68 Binary files /dev/null and b/apps/minio/metadata/minio.png differ diff --git a/apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/README.md b/apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/config.json b/apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/config.json new file mode 100644 index 000000000..fe6c8a10e --- /dev/null +++ b/apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/config.json @@ -0,0 +1,28 @@ +{ + "formFields": [ + { + "type": "text", + "labelZh": "Root 用户", + "labelEn": "User", + "required": true, + "default": "random", + "envKey": "MINIO_ROOT_USER" + }, + { + "type": "text", + "labelZh": "密码", + "labelEn": "Password", + "required": true, + "default": "Password@123", + "envKey": "MINIO_ROOT_PASSWORD" + }, + { + "type": "number", + "labelZh": "端口", + "labelEn": "Port", + "required": true, + "default": 9000, + "envKey": "PANEL_APP_PORT_HTTP" + } + ] +} \ No newline at end of file diff --git a/apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/docker-compose.yml b/apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/docker-compose.yml new file mode 100644 index 000000000..fccace723 --- /dev/null +++ b/apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/docker-compose.yml @@ -0,0 +1,26 @@ +version: '3' +services: + 1panel_minio: + image: minio/minio:RELEASE.2022-08-13T21-54-44Z + container_name: 1panel_minio + ports: + - ${PANEL_APP_PORT_HTTP}:9000 + - "9001:9001" + restart: always + command: server /data --console-address ":9001" + environment: + MINIO_ROOT_USER: ${MINIO_ROOT_USER} + MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} + logging: + options: + max-size: "5M" + max-file: "10" + driver: json-file + networks: + - 1panel + volumes: + - ./data:/data + +networks: + 1panel: + external: true \ No newline at end of file diff --git a/apps/redis/versions/7.0.5/conf/redis.conf b/apps/redis/versions/7.0.5/conf/redis.conf index 6486692d5..c337ee247 100644 --- a/apps/redis/versions/7.0.5/conf/redis.conf +++ b/apps/redis/versions/7.0.5/conf/redis.conf @@ -108,7 +108,7 @@ # By default protected mode is enabled. You should disable it only if # you are sure you want clients from other hosts to connect to Redis # even if no authentication is configured. -protected-mode no +protected-mode yes # Redis uses default hardened security configuration directives to reduce the # attack surface on innocent users. Therefore, several sensitive configuration @@ -338,7 +338,7 @@ daemonize no # # Note that on modern Linux systems "/run/redis.pid" is more conforming # and should be used instead. -pidfile "/var/run/redis_6379.pid" +pidfile /var/run/redis_6379.pid # Specify the server verbosity level. # This can be one of: @@ -430,7 +430,7 @@ proc-title-template "{title} {listen-addr} {server-mode}" # # You can set these explicitly by uncommenting the following line. # -# save 3600 1 300 100 60 10000 +save 3600 1 300 100 60 10000 # By default Redis will stop accepting writes if RDB snapshots are enabled # (at least one save point) and the latest background save failed. @@ -478,7 +478,7 @@ rdbchecksum yes # sanitize-dump-payload no # The filename where to dump the DB -dbfilename "dump.rdb" +dbfilename dump.rdb # Remove RDB files used by replication in instances without persistence # enabled. By default this option is disabled, however there are environments @@ -501,7 +501,7 @@ rdb-del-sync-files no # The Append Only File will also be created inside this directory. # # Note that you must specify a directory here, not a file name. -dir "/data" +dir ./ ################################# REPLICATION ################################# @@ -909,10 +909,10 @@ replica-priority 100 # commands. For instance ~* allows all the keys. The pattern # is a glob-style pattern like the one of KEYS. # It is possible to specify multiple patterns. -# %R~ Add key read pattern that specifies which keys can be read +# %R~ Add key read pattern that specifies which keys can be read # from. # %W~ Add key write pattern that specifies which keys can be -# written to. +# written to. # allkeys Alias for ~* # resetkeys Flush the list of allowed keys patterns. # & Add a glob-style pattern of Pub/Sub channels that can be @@ -939,10 +939,10 @@ replica-priority 100 # -@all. The user returns to the same state it has immediately # after its creation. # () Create a new selector with the options specified within the -# parentheses and attach it to the user. Each option should be -# space separated. The first character must be ( and the last +# parentheses and attach it to the user. Each option should be +# space separated. The first character must be ( and the last # character must be ). -# clearselectors Remove all of the currently attached selectors. +# clearselectors Remove all of the currently attached selectors. # Note this does not change the "root" user permissions, # which are the permissions directly applied onto the # user (outside the parentheses). @@ -968,7 +968,7 @@ replica-priority 100 # Basically ACL rules are processed left-to-right. # # The following is a list of command categories and their meanings: -# * keyspace - Writing or reading from keys, databases, or their metadata +# * keyspace - Writing or reading from keys, databases, or their metadata # in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, # KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, # key or metadata will also have `write` category. Commands that only read @@ -1343,6 +1343,7 @@ oom-score-adj no # oom-score-adj-values to positive values will always succeed. oom-score-adj-values 0 200 800 + #################### KERNEL transparent hugepage CONTROL ###################### # Usually the kernel Transparent Huge Pages control is set to "madvise" or @@ -1588,8 +1589,8 @@ aof-timestamp-enabled no # # cluster-node-timeout 15000 -# The cluster port is the port that the cluster bus will listen for inbound connections on. When set -# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires +# The cluster port is the port that the cluster bus will listen for inbound connections on. When set +# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires # you to specify the cluster bus port when executing cluster meet. # cluster-port 0 @@ -1724,12 +1725,12 @@ aof-timestamp-enabled no # PubSub message by default. (client-query-buffer-limit default value is 1gb) # # cluster-link-sendbuf-limit 0 - -# Clusters can configure their announced hostname using this config. This is a common use case for + +# Clusters can configure their announced hostname using this config. This is a common use case for # applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based # routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS -# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is -# communicated along the clusterbus to all nodes, setting it to an empty string will remove +# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is +# communicated along the clusterbus to all nodes, setting it to an empty string will remove # the hostname and also propagate the removal. # # cluster-announce-hostname "" @@ -1738,13 +1739,13 @@ aof-timestamp-enabled no # a user defined hostname, or by declaring they have no endpoint. Which endpoint is # shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type # config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how -# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. -# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' +# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. +# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' # will be returned instead. # # When a cluster advertises itself as having an unknown endpoint, it's indicating that -# the server doesn't know how clients can reach the cluster. This can happen in certain -# networking situations where there are multiple possible routes to the node, and the +# the server doesn't know how clients can reach the cluster. This can happen in certain +# networking situations where there are multiple possible routes to the node, and the # server doesn't know which one the client took. In this case, the server is expecting # the client to reach out on the same endpoint it used for making the last request, but use # the port provided in the response. @@ -1815,7 +1816,7 @@ slowlog-log-slower-than 10000 # There is no limit to this length. Just be aware that it will consume memory. # You can reclaim memory used by the slow log with SLOWLOG RESET. -slowlog-max-len 10086 +slowlog-max-len 128 ################################ LATENCY MONITOR ############################## @@ -1978,7 +1979,7 @@ hll-sparse-max-bytes 3000 # zero, the limit is ignored, so for instance it is possible to set just a # max entries limit by setting max-bytes to 0 and max-entries to the desired # value. -stream-node-max-bytes 4kb +stream-node-max-bytes 4096 stream-node-max-entries 100 # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in @@ -2057,7 +2058,7 @@ client-output-buffer-limit pubsub 32mb 8mb 60 # errors or data eviction. To avoid this we can cap the accumulated memory # used by all client connections (all pubsub and normal clients). Once we # reach that limit connections will be dropped by the server freeing up -# memory. The server will attempt to drop the connections using the most +# memory. The server will attempt to drop the connections using the most # memory first. We call this mechanism "client eviction". # # Client eviction is configured using the maxmemory-clients setting as follows: @@ -2273,10 +2274,3 @@ jemalloc-bg-thread yes # to suppress # # ignore-warnings ARM64-COW-BUG - -# Generated by CONFIG REWRITE -save 3600 1 -save 300 100 -save 60 10000 -latency-tracking-info-percentiles 50 99 99.9 -user default on nopass ~* &* +@all diff --git a/apps/redis/versions/7.0.5/docker-compose.yml b/apps/redis/versions/7.0.5/docker-compose.yml index c0e4f86a2..2c650a582 100644 --- a/apps/redis/versions/7.0.5/docker-compose.yml +++ b/apps/redis/versions/7.0.5/docker-compose.yml @@ -7,7 +7,7 @@ services: - 1panel 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 --requirepass ${PANEL_DB_ROOT_PASSWORD} volumes: - ./data:/data - ./conf/redis.conf:/etc/redis/redis.conf diff --git a/frontend/src/styles/common.scss b/frontend/src/styles/common.scss index 944f9796b..d7da66764 100644 --- a/frontend/src/styles/common.scss +++ b/frontend/src/styles/common.scss @@ -182,7 +182,7 @@ .mask-prompt { position: absolute; z-index: 9999; - top: 20%; + top: 25%; left: 50%; transform: translate(-50%, -50%); } diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue index d857eb81d..dcfc6d3bf 100644 --- a/frontend/src/views/app-store/installed/index.vue +++ b/frontend/src/views/app-store/installed/index.vue @@ -31,8 +31,8 @@ {{ $t('app.canUpdate') }} - - + +