From f128537866e272855ae6f76a31c46a8d26b30ac9 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Tue, 7 Mar 2023 11:36:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=20redis=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/redis/versions/6.0.16/conf/redis.conf | 24 +++++++------ apps/redis/versions/7.0.5/conf/redis.conf | 40 ++++++++++++---------- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/apps/redis/versions/6.0.16/conf/redis.conf b/apps/redis/versions/6.0.16/conf/redis.conf index 218c4b0a8..d49c89a46 100644 --- a/apps/redis/versions/6.0.16/conf/redis.conf +++ b/apps/redis/versions/6.0.16/conf/redis.conf @@ -141,7 +141,7 @@ tcp-keepalive 300 # server to connected clients, masters or cluster peers. These files should be # PEM formatted. # -# tls-cert-file redis.crt +# tls-cert-file redis.crt # tls-key-file redis.key # Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange: @@ -764,8 +764,8 @@ replica-priority 100 # ACL LOG # # The ACL Log tracks failed commands and authentication events associated -# with ACLs. The ACL Log is useful to troubleshoot failed commands blocked -# by ACLs. The ACL Log is stored in memory. You can reclaim memory with +# with ACLs. The ACL Log is useful to troubleshoot failed commands blocked +# by ACLs. The ACL Log is stored in memory. You can reclaim memory with # ACL LOG RESET. Define the maximum entry length of the ACL Log below. acllog-max-len 128 @@ -1328,18 +1328,18 @@ lua-time-limit 5000 # cluster-replica-no-failover no # This option, when set to yes, allows nodes to serve read traffic while the -# the cluster is in a down state, as long as it believes it owns the slots. +# the cluster is in a down state, as long as it believes it owns the slots. # -# This is useful for two cases. The first case is for when an application +# This is useful for two cases. The first case is for when an application # doesn't require consistency of data during node failures or network partitions. # One example of this is a cache, where as long as the node has the data it -# should be able to serve it. +# should be able to serve it. # -# The second use case is for configurations that don't meet the recommended -# three shards but want to enable cluster mode and scale later. A +# The second use case is for configurations that don't meet the recommended +# three shards but want to enable cluster mode and scale later. A # master outage in a 1 or 2 shard configuration causes a read/write outage to the # entire cluster without this option set, with it set there is only a write outage. -# Without a quorum of masters, slot ownership will not change automatically. +# Without a quorum of masters, slot ownership will not change automatically. # # cluster-allow-reads-when-down no @@ -1874,4 +1874,8 @@ jemalloc-bg-thread yes # by setting the following config which takes a space delimited list of warnings # to suppress # -# ignore-warnings ARM64-COW-BUG \ No newline at end of file +# ignore-warnings ARM64-COW-BUG + +# Redis configuration rewrite by 1Panel + +# End Redis configuration rewrite by 1Panel \ 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 f5c611031..51007df1e 100644 --- a/apps/redis/versions/7.0.5/conf/redis.conf +++ b/apps/redis/versions/7.0.5/conf/redis.conf @@ -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 @@ -1589,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 @@ -1725,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 "" @@ -1739,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. @@ -2058,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,4 +2273,8 @@ jemalloc-bg-thread yes # by setting the following config which takes a space delimited list of warnings # to suppress # -# ignore-warnings ARM64-COW-BUG \ No newline at end of file +# ignore-warnings ARM64-COW-BUG + +# Redis configuration rewrite by 1Panel + +# End Redis configuration rewrite by 1Panel \ No newline at end of file