Commit 6936db7d authored by Alexander A. Klimov's avatar Alexander A. Klimov

Update to 6.0.9

parent 2eb04c08
Pipeline #15008 passed with stages
in 7 minutes and 54 seconds
......@@ -66,6 +66,9 @@ build/centos/7:
<<: *build
variables:
DOCKER_IMAGE: centos/7
script:
- sudo yum install -y devtoolset-7-gcc\*
- . /opt/rh/devtoolset-7/enable; icinga-build-package
test/centos/7:
<<: *test
......
......@@ -4,18 +4,30 @@ Date: Wed Nov 20 13:20:51 2019 +0100
Change default server port for icinga-redis
diff --git a/redis.conf b/redis.conf
index d74ff98..becbb52 100644
index ab0a30cbd..d8e51f8ba 100644
--- a/redis.conf
+++ b/redis.conf
@@ -89,7 +89,7 @@ protected-mode yes
@@ -86,9 +86,9 @@ bind 127.0.0.1
# are explicitly listed using the "bind" directive.
protected-mode yes
# Accept connections on the specified port, default is 6379 (IANA #815344).
-# Accept connections on the specified port, default is 6379 (IANA #815344).
+# Accept connections on the specified port, default is 6380.
# If port 0 is specified Redis will not listen on a TCP socket.
-port 6379
+port 6380
# TCP listen() backlog.
#
@@ -135,7 +135,7 @@ tcp-keepalive 300
# default port, use:
#
# port 0
-# tls-port 6379
+# tls-port 6380
# Configure a X.509 certificate and private key to use for authenticating the
# server to connected clients, masters or cluster peers. These files should be
@@ -155,7 +155,7 @@ supervised no
#
# Creating a pid file is best effort: if Redis is not able to create it
......@@ -26,7 +38,7 @@ index d74ff98..becbb52 100644
# Specify the server verbosity level.
# This can be one of:
diff --git a/sentinel.conf b/sentinel.conf
index bc9a705..e738713 100644
index b6ff05f25..2d86376fd 100644
--- a/sentinel.conf
+++ b/sentinel.conf
@@ -18,7 +18,7 @@
......@@ -47,11 +59,24 @@ index bc9a705..e738713 100644
# sentinel auth-pass <master-name> <password>
#
diff --git a/src/config.c b/src/config.c
index 4a956d698..bd3100db6 100644
--- a/src/config.c
+++ b/src/config.c
@@ -2316,7 +2316,7 @@ standardConfig configs[] = {
/* Integer configs */
createIntConfig("databases", NULL, IMMUTABLE_CONFIG, 1, INT_MAX, server.dbnum, 16, INTEGER_CONFIG, NULL, NULL),
- createIntConfig("port", NULL, IMMUTABLE_CONFIG, 0, 65535, server.port, 6379, INTEGER_CONFIG, NULL, NULL), /* TCP port. */
+ createIntConfig("port", NULL, IMMUTABLE_CONFIG, 0, 65535, server.port, 6380, INTEGER_CONFIG, NULL, NULL), /* TCP port. */
createIntConfig("io-threads", NULL, IMMUTABLE_CONFIG, 1, 128, server.io_threads_num, 1, INTEGER_CONFIG, NULL, NULL), /* Single threaded by default */
createIntConfig("auto-aof-rewrite-percentage", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.aof_rewrite_perc, 100, INTEGER_CONFIG, NULL, NULL),
createIntConfig("cluster-replica-validity-factor", "cluster-slave-validity-factor", MODIFIABLE_CONFIG, 0, INT_MAX, server.cluster_slave_validity_factor, 10, INTEGER_CONFIG, NULL, NULL), /* Slave max data age factor. */
diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c
index d30879d..fa8d4fe 100644
index 9d9c15e00..ff72dc92b 100644
--- a/src/redis-benchmark.c
+++ b/src/redis-benchmark.c
@@ -567,7 +567,7 @@ usage:
@@ -1421,7 +1421,7 @@ usage:
printf(
"Usage: redis-benchmark [-h <host>] [-p <port>] [-c <clients>] [-n <requests>] [-k <boolean>]\n\n"
" -h <hostname> Server hostname (default 127.0.0.1)\n"
......@@ -59,8 +84,8 @@ index d30879d..fa8d4fe 100644
+" -p <port> Server port (default 6380)\n"
" -s <socket> Server socket (overrides host and port)\n"
" -a <password> Password for Redis Auth\n"
" -c <clients> Number of parallel connections (default 50)\n"
@@ -674,7 +674,7 @@ int main(int argc, const char **argv) {
" --user <username> Used to send ACL style 'AUTH username pass'. Needs -a.\n"
@@ -1542,7 +1542,7 @@ int main(int argc, const char **argv) {
config.latency = NULL;
config.clients = listCreate();
config.hostip = "127.0.0.1";
......@@ -70,10 +95,10 @@ index d30879d..fa8d4fe 100644
config.tests = NULL;
config.dbnum = 0;
diff --git a/src/redis-cli.c b/src/redis-cli.c
index f9b93e9..f112f1c 100644
index 45a1228e6..3259b0d37 100644
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -1470,7 +1470,7 @@ static void usage(void) {
@@ -1720,7 +1720,7 @@ static void usage(void) {
"\n"
"Usage: redis-cli [OPTIONS] [cmd [arg [arg ...]]]\n"
" -h <hostname> Server hostname (default: 127.0.0.1).\n"
......@@ -82,7 +107,7 @@ index f9b93e9..f112f1c 100644
" -s <socket> Server socket (overrides hostname and port).\n"
" -a <password> Password to use when connecting to the server.\n"
" You can also use the " REDIS_CLI_AUTH_ENV " environment\n"
@@ -6999,7 +6999,7 @@ int main(int argc, char **argv) {
@@ -8066,7 +8066,7 @@ int main(int argc, char **argv) {
int firstarg;
config.hostip = sdsnew("127.0.0.1");
......@@ -92,12 +117,12 @@ index f9b93e9..f112f1c 100644
config.repeat = 1;
config.interval = 0;
diff --git a/src/sentinel.c b/src/sentinel.c
index adff9d4..368014e 100644
index 1bd82453f..d85ee6049 100644
--- a/src/sentinel.c
+++ b/src/sentinel.c
@@ -40,7 +40,7 @@
extern char **environ;
@@ -48,7 +48,7 @@ extern char **environ;
extern SSL_CTX *redis_tls_ctx;
#endif
-#define REDIS_SENTINEL_PORT 26379
+#define REDIS_SENTINEL_PORT 26380
......@@ -105,10 +130,10 @@ index adff9d4..368014e 100644
/* ======================== Sentinel global state =========================== */
diff --git a/src/server.c b/src/server.c
index 7f0acaa..0301801 100644
index 831349a76..34b9eea3f 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1645,7 +1645,7 @@ void initServerConfig(void) {
@@ -2396,7 +2396,7 @@ void initServerConfig(void) {
/* Replication related */
server.masterauth = NULL;
server.masterhost = NULL;
......@@ -117,7 +142,7 @@ index 7f0acaa..0301801 100644
server.master = NULL;
server.cached_master = NULL;
server.master_initial_offset = -1;
@@ -3739,7 +3739,7 @@ void usage(void) {
@@ -4819,7 +4819,7 @@ void usage(void) {
fprintf(stderr," ./redis-server --test-memory <megabytes>\n\n");
fprintf(stderr,"Examples:\n");
fprintf(stderr," ./redis-server (run the server with default conf)\n");
......@@ -126,16 +151,3 @@ index 7f0acaa..0301801 100644
fprintf(stderr," ./redis-server --port 7777\n");
fprintf(stderr," ./redis-server --port 7777 --replicaof 127.0.0.1 8888\n");
fprintf(stderr," ./redis-server /etc/myredis.conf --loglevel verbose\n\n");
diff --git a/src/server.h b/src/server.h
index aa0ec37..70d476e 100644
--- a/src/server.h
+++ b/src/server.h
@@ -83,7 +83,7 @@ typedef long long mstime_t; /* millisecond time type. */
#define CONFIG_MIN_HZ 1
#define CONFIG_MAX_HZ 500
#define MAX_CLIENTS_PER_CLOCK_TICK 200 /* HZ is adapted based on that. */
-#define CONFIG_DEFAULT_SERVER_PORT 6379 /* TCP port. */
+#define CONFIG_DEFAULT_SERVER_PORT 6380 /* TCP port. */
#define CONFIG_DEFAULT_TCP_BACKLOG 511 /* TCP listen backlog. */
#define CONFIG_DEFAULT_CLIENT_TIMEOUT 0 /* Default client timeout: infinite */
#define CONFIG_DEFAULT_DBNUM 16
......@@ -23,7 +23,7 @@
%global redis_port 6380
Name: %{?pkg_prefix}redis
Version: 5.0.10
Version: 6.0.9
Release: 1%{?dist}
Summary: A persistent key-value database
# redis, linenoise, lzf, hiredis are BSD
......@@ -272,6 +272,9 @@ exit 0
%changelog
* Mon Dec 07 2020 Alexander A. Klimov <alexander.klimov@icinga.com> - 6.0.9-1
- Update to 6.0.9
* Fri Nov 13 2020 Alexander A. Klimov <alexander.klimov@icinga.com> - 5.0.10-1
- Update to 5.0.10
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment