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