Fix icinga server port patch

debian/patches/icinga-server-port.patch

@@ -3,10 +3,10 @@ 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
---- a/redis.conf
-+++ b/redis.conf
+Index: redis/redis.conf
+===================================================================
+--- redis.orig/redis.conf
++++ redis/redis.conf
 @@ -89,7 +89,7 @@ protected-mode yes
  
  # Accept connections on the specified port, default is 6379 (IANA #815344).
@@ -16,20 +16,11 @@ index d74ff98..becbb52 100644
  
  # TCP listen() backlog.
  #
-@@ -155,7 +155,7 @@ supervised no
- #
- # Creating a pid file is best effort: if Redis is not able to create it
- # nothing bad happens, the server will start and run normally.
--pidfile /var/run/redis_6379.pid
-+pidfile /var/run/redis_6380.pid
- 
- # Specify the server verbosity level.
- # This can be one of:
-diff --git a/sentinel.conf b/sentinel.conf
-index bc9a705..e738713 100644
---- a/sentinel.conf
-+++ b/sentinel.conf
-@@ -18,7 +18,7 @@
+Index: redis/sentinel.conf
+===================================================================
+--- redis.orig/sentinel.conf
++++ redis/sentinel.conf
+@@ -19,7 +19,7 @@ bind 127.0.0.1 ::1
  
  # port <sentinel-port>
  # The port that this sentinel instance will run on
@@ -38,7 +29,7 @@ index bc9a705..e738713 100644
  
  # 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
+@@ -82,7 +82,7 @@ dir /var/lib/redis
  #
  # Note: master name should not include special characters or spaces.
  # The valid charset is A-z 0-9 and the three characters ".-_".
@@ -47,10 +38,10 @@ index bc9a705..e738713 100644
  
  # sentinel auth-pass <master-name> <password>
  #
-diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c
-index d30879d..fa8d4fe 100644
---- a/src/redis-benchmark.c
-+++ b/src/redis-benchmark.c
+Index: redis/src/redis-benchmark.c
+===================================================================
+--- redis.orig/src/redis-benchmark.c
++++ redis/src/redis-benchmark.c
 @@ -567,7 +567,7 @@ usage:
      printf(
  "Usage: redis-benchmark [-h <host>] [-p <port>] [-c <clients>] [-n <requests>] [-k <boolean>]\n\n"
@@ -69,10 +60,10 @@ index d30879d..fa8d4fe 100644
      config.hostsocket = NULL;
      config.tests = NULL;
      config.dbnum = 0;
-diff --git a/src/redis-cli.c b/src/redis-cli.c
-index f9b93e9..f112f1c 100644
---- a/src/redis-cli.c
-+++ b/src/redis-cli.c
+Index: redis/src/redis-cli.c
+===================================================================
+--- redis.orig/src/redis-cli.c
++++ redis/src/redis-cli.c
 @@ -1470,7 +1470,7 @@ static void usage(void) {
  "\n"
  "Usage: redis-cli [OPTIONS] [cmd [arg [arg ...]]]\n"
@@ -91,10 +82,10 @@ index f9b93e9..f112f1c 100644
      config.hostsocket = NULL;
      config.repeat = 1;
      config.interval = 0;
-diff --git a/src/sentinel.c b/src/sentinel.c
-index adff9d4..368014e 100644
---- a/src/sentinel.c
-+++ b/src/sentinel.c
+Index: redis/src/sentinel.c
+===================================================================
+--- redis.orig/src/sentinel.c
++++ redis/src/sentinel.c
 @@ -40,7 +40,7 @@
  
  extern char **environ;
@@ -104,10 +95,10 @@ index adff9d4..368014e 100644
  
  /* ======================== Sentinel global state =========================== */
  
-diff --git a/src/server.c b/src/server.c
-index 7f0acaa..0301801 100644
---- a/src/server.c
-+++ b/src/server.c
+Index: redis/src/server.c
+===================================================================
+--- redis.orig/src/server.c
++++ redis/src/server.c
 @@ -1645,7 +1645,7 @@ void initServerConfig(void) {
      /* Replication related */
      server.masterauth = NULL;
@@ -126,11 +117,11 @@ 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. */
+Index: redis/src/server.h
+===================================================================
+--- redis.orig/src/server.h
++++ redis/src/server.h
+@@ -83,7 +83,7 @@ typedef long long mstime_t; /* milliseco
  #define CONFIG_MIN_HZ            1
  #define CONFIG_MAX_HZ            500
  #define MAX_CLIENTS_PER_CLOCK_TICK 200          /* HZ is adapted based on that. */