Commit 47c9bd7b authored by Henrik Triem's avatar Henrik Triem
Browse files

Try removing patches

parent 197a5506
Pipeline #17958 failed with stages
in 1 minute and 24 seconds
Index: pkg-redis/redis.conf
===================================================================
--- pkg-redis.orig/redis.conf
+++ pkg-redis/redis.conf
@@ -286,7 +286,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_6380.pid
# Specify the server verbosity level.
# This can be one of:
Author: Henrik Triem <henrik.triem@icinga.com>
Date: Tue May 18 19:20:51 2021 +0100
Change default server port for icinga-redis
Index: pkg-redis/redis.conf
===================================================================
--- pkg-redis.orig/redis.conf
+++ pkg-redis/redis.conf
@@ -95,7 +95,7 @@ protected-mode yes
# Accept connections on the specified port, default is 6379 (IANA #815344).
# If port 0 is specified Redis will not listen on a TCP socket.
-port 6379
+port 6380
# TCP listen() backlog.
#
Index: pkg-redis/sentinel.conf
===================================================================
--- pkg-redis.orig/sentinel.conf
+++ pkg-redis/sentinel.conf
@@ -18,7 +18,7 @@
# port <sentinel-port>
# The port that this sentinel instance will run on
-port 26379
+port 26380
# By default Redis Sentinel does not run as a daemon. Use 'yes' if you need it.
# Note that Redis will write a pid file in /var/run/redis-sentinel.pid when
@@ -81,7 +81,7 @@ dir /tmp
#
# Note: master name should not include special characters or spaces.
# The valid charset is A-z 0-9 and the three characters ".-_".
-sentinel monitor mymaster 127.0.0.1 6379 2
+sentinel monitor mymaster 127.0.0.1 6380 2
# sentinel auth-pass <master-name> <password>
#
Index: pkg-redis/src/redis-benchmark.c
===================================================================
--- pkg-redis.orig/src/redis-benchmark.c
+++ pkg-redis/src/redis-benchmark.c
@@ -1555,7 +1555,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"
-" -p <port> Server port (default 6379)\n"
+" -p <port> Server port (default 6380)\n"
" -s <socket> Server socket (overrides host and port)\n"
" -a <password> Password for Redis Auth\n"
" --user <username> Used to send ACL style 'AUTH username pass'. Needs -a.\n"
@@ -1707,7 +1707,7 @@ int main(int argc, const char **argv) {
config.idlemode = 0;
config.clients = listCreate();
config.hostip = "127.0.0.1";
- config.hostport = 6379;
+ config.hostport = 6380;
config.hostsocket = NULL;
config.tests = NULL;
config.dbnum = 0;
Index: pkg-redis/src/redis-cli.c
===================================================================
--- pkg-redis.orig/src/redis-cli.c
+++ pkg-redis/src/redis-cli.c
@@ -1828,7 +1828,7 @@ static void usage(void) {
"\n"
"Usage: redis-cli [OPTIONS] [cmd [arg [arg ...]]]\n"
" -h <hostname> Server hostname (default: 127.0.0.1).\n"
-" -p <port> Server port (default: 6379).\n"
+" -p <port> Server port (default: 6380).\n"
" -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"
@@ -8200,7 +8200,7 @@ int main(int argc, char **argv) {
memset(&config.sslconfig, 0, sizeof(config.sslconfig));
config.hostip = sdsnew("127.0.0.1");
- config.hostport = 6379;
+ config.hostport = 6380;
config.hostsocket = NULL;
config.repeat = 1;
config.interval = 0;
Index: pkg-redis/src/sentinel.c
===================================================================
--- pkg-redis.orig/src/sentinel.c
+++ pkg-redis/src/sentinel.c
@@ -49,7 +49,7 @@ extern SSL_CTX *redis_tls_ctx;
extern SSL_CTX *redis_tls_client_ctx;
#endif
-#define REDIS_SENTINEL_PORT 26379
+#define REDIS_SENTINEL_PORT 26380
/* ======================== Sentinel global state =========================== */
Index: pkg-redis/src/server.c
===================================================================
--- pkg-redis.orig/src/server.c
+++ pkg-redis/src/server.c
@@ -1479,7 +1479,7 @@ dictType keylistDictType = {
NULL /* allow to expand */
};
-/* Cluster nodes hash table, mapping nodes addresses 1.2.3.4:6379 to
+/* Cluster nodes hash table, mapping nodes addresses 1.2.3.4:6380 to
* clusterNode structures. */
dictType clusterNodesDictType = {
dictSdsHash, /* hash function */
@@ -2687,7 +2687,7 @@ void initServerConfig(void) {
/* Replication related */
server.masterauth = NULL;
server.masterhost = NULL;
- server.masterport = 6379;
+ server.masterport = 6380;
server.master = NULL;
server.cached_master = NULL;
server.master_initial_offset = -1;
@@ -5590,7 +5590,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");
- fprintf(stderr," ./redis-server /etc/redis/6379.conf\n");
+ fprintf(stderr," ./redis-server /etc/redis/6380.conf\n");
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");
Supports Markdown
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