patches/0002-don-t-install-default-corosync.conf.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
   3 Date: Wed, 22 May 2019 11:14:01 +0200
   4 Subject: [PATCH] don't install default corosync.conf
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  10 ---
  11  .../Make-the-example-config-valid.patch       | 64 -------------------
  12  debian/corosync.install                       |  2 +-
  13  debian/rules                                  |  3 -
  14  3 files changed, 1 insertion(+), 68 deletions(-)
  15  delete mode 100644 debian/patches/Make-the-example-config-valid.patch
  16
  17 diff --git a/debian/patches/Make-the-example-config-valid.patch b/debian/patches/Make-the-example-config-valid.patch
  18 deleted file mode 100644
  19 index 5c2182f7..00000000
  20 --- a/debian/patches/Make-the-example-config-valid.patch
  21 +++ /dev/null
  22 @@ -1,64 +0,0 @@
  23 -From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
  24 -Date: Sun, 16 Dec 2018 22:51:46 +0100
  25 -Subject: Make the example config valid
  26 -
  27 ----
  28 - conf/corosync.conf.example | 22 +++++++---------------
  29 - 1 file changed, 7 insertions(+), 15 deletions(-)
  30 -
  31 -diff --git a/conf/corosync.conf.example b/conf/corosync.conf.example
  32 -index 4658a86..91de572 100644
  33 ---- a/conf/corosync.conf.example
  34 -+++ b/conf/corosync.conf.example
  35 -@@ -2,8 +2,10 @@
  36 - totem {
  37 -       version: 2
  38 -
  39 --      # Set name of the cluster
  40 --      cluster_name: ExampleCluster
  41 -+      # Corosync itself works without a cluster name, but DLM needs one.
  42 -+      # The cluster name is also written into the VG metadata of newly
  43 -+      # created shared LVM volume groups, if lvmlockd uses DLM locking.
  44 -+      cluster_name: debian
  45 -
  46 -       # crypto_cipher and crypto_hash: Used for mutual node authentication.
  47 -       # If you choose to enable this, then do remember to create a shared
  48 -@@ -25,7 +27,7 @@ logging {
  49 -       # Log to a log file. When set to "no", the "logfile" option
  50 -       # must not be set.
  51 -       to_logfile: yes
  52 --      logfile: /var/log/cluster/corosync.log
  53 -+      logfile: /var/log/corosync/corosync.log
  54 -       # Log to the system log daemon. When in doubt, set to yes.
  55 -       to_syslog: yes
  56 -       # Log debug messages (very verbose). When in doubt, leave off.
  57 -@@ -41,7 +43,7 @@ logging {
  58 - quorum {
  59 -       # Enable and configure quorum subsystem (default: off)
  60 -       # see also corosync.conf.5 and votequorum.5
  61 --      #provider: corosync_votequorum
  62 -+      provider: corosync_votequorum
  63 - }
  64 -
  65 - nodelist {
  66 -@@ -53,19 +55,9 @@ nodelist {
  67 -               # Cluster membership node identifier
  68 -               nodeid: 1
  69 -               # Address of first link
  70 --              #ring0_addr: 192.168.0.1
  71 -+              ring0_addr: 127.0.0.1
  72 -               # When knet transport is used it's possible to define up to 8 links
  73 -               #ring1_addr: 192.168.1.1
  74 -       }
  75 --      node {
  76 --              # Hostname of the node
  77 --              name: node2
  78 --              # Cluster membership node identifier
  79 --              nodeid: 2
  80 --              # Address of first link
  81 --              #ring0_addr: 192.168.0.2
  82 --              # When knet transport is used it's possible to define up to 8 links
  83 --              #ring1_addr: 192.168.1.2
  84 --      }
  85 -       # ...
  86 - }
  87 diff --git a/debian/corosync.install b/debian/corosync.install
  88 index bfaca759..c5b92661 100644
  89 --- a/debian/corosync.install
  90 +++ b/debian/corosync.install
  91 @@ -25,7 +25,7 @@ usr/share/doc/corosync/AUTHORS
  92  usr/share/doc/corosync/INSTALL
  93  usr/share/augeas/lenses/corosync.aug
  94  usr/share/augeas/lenses/tests/test_corosync.aug
  95 -etc/corosync/corosync.conf
  96 +etc/corosync/corosync.*example* usr/share/doc/corosync/examples
  97  etc/corosync/uidgid.d
  98  usr/share/corosync/xml2conf.xsl
  99  var/lib/corosync
 100 diff --git a/debian/rules b/debian/rules
 101 index 52ff4699..50d89e2a 100755
 102 --- a/debian/rules
 103 +++ b/debian/rules
 104 @@ -54,11 +54,8 @@ override_dh_auto_test-indep:
 105  override_dh_auto_install-indep:
 106         $(MAKE) -C man DESTDIR="$(CURDIR)/debian/tmp" install
 107
 108 -CONF=debian/tmp/etc/corosync/corosync.conf
 109  override_dh_auto_install-arch:
 110         dh_auto_install
 111 -# We patched the example into a working config file:
 112 -       mv -v $(CONF).example $(CONF)
 113         rm -v debian/tmp/usr/lib/*/lib*.la
 114  # we don't need the upstream license
 115         rm debian/tmp/usr/share/doc/corosync/LICENSE