rebase and re-format patches

[corosync-pve.git] / patches / 0002-don-t-install-default-corosync.conf.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Tue, 7 Mar 2017 13:32:02 +0100
Subject: [PATCH] don't install default corosync.conf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 debian/corosync.conf    | 111 ----------------------------------------
 debian/corosync.install |   1 -
 2 files changed, 112 deletions(-)
 delete mode 100644 debian/corosync.conf

diff --git a/debian/corosync.conf b/debian/corosync.conf
deleted file mode 100644
index 04444322..00000000
--- a/debian/corosync.conf
+++ /dev/null
@@ -1,111 +0,0 @@
-# Please read the corosync.conf.5 manual page
-totem {
-	version: 2
-
-	# Corosync itself works without a cluster name, but DLM needs one.
-	# The cluster name is also written into the VG metadata of newly
-	# created shared LVM volume groups, if lvmlockd uses DLM locking.
-	# It is also used for computing mcastaddr, unless overridden below.
-	cluster_name: debian
-
-	# How long before declaring a token lost (ms)
-	token: 3000
-
-	# How many token retransmits before forming a new configuration
-	token_retransmits_before_loss_const: 10
-
-	# Limit generated nodeids to 31-bits (positive signed integers)
-	clear_node_high_bit: yes
-
-	# crypto_cipher and crypto_hash: Used for mutual node authentication.
-	# If you choose to enable this, then do remember to create a shared
-	# secret with "corosync-keygen".
-	# enabling crypto_cipher, requires also enabling of crypto_hash.
-	# crypto_cipher and crypto_hash should be used instead of deprecated
-	# secauth parameter.
-
-	# Valid values for crypto_cipher are none (no encryption), aes256, aes192,
-	# aes128 and  3des. Enabling crypto_cipher, requires also enabling of
-	# crypto_hash.
-	crypto_cipher: none
-
-	# Valid values for crypto_hash are  none  (no  authentication),  md5,  sha1,
-	# sha256, sha384 and sha512.
-	crypto_hash: none
-
-	# Optionally assign a fixed node id (integer)
-	# nodeid: 1234
-
-	# interface: define at least one interface to communicate
-	# over. If you define more than one interface stanza, you must
-	# also set rrp_mode.
-	interface {
-		# Rings must be consecutively numbered, starting at 0.
-		ringnumber: 0
-		# This is normally the *network* address of the
-		# interface to bind to. This ensures that you can use
-		# identical instances of this configuration file
-		# across all your cluster nodes, without having to
-		# modify this option.
-		bindnetaddr: 127.0.0.1
-		# However, if you have multiple physical network
-		# interfaces configured for the same subnet, then the
-		# network address alone is not sufficient to identify
-		# the interface Corosync should bind to. In that case,
-		# configure the *host* address of the interface
-		# instead:
-		# bindnetaddr: 192.168.1.1
-		# When selecting a multicast address, consider RFC
-		# 2365 (which, among other things, specifies that
-		# 239.255.x.x addresses are left to the discretion of
-		# the network administrator). Do not reuse multicast
-		# addresses across multiple Corosync clusters sharing
-		# the same network.
-		# mcastaddr: 239.255.1.1
-		# Corosync uses the port you specify here for UDP
-		# messaging, and also the immediately preceding
-		# port. Thus if you set this to 5405, Corosync sends
-		# messages over UDP ports 5405 and 5404.
-		mcastport: 5405
-		# Time-to-live for cluster communication packets. The
-		# number of hops (routers) that this ring will allow
-		# itself to pass. Note that multicast routing must be
-		# specifically enabled on most network routers.
-		ttl: 1
-	}
-}
-
-logging {
-	# Log the source file and line where messages are being
-	# generated. When in doubt, leave off. Potentially useful for
-	# debugging.
-	fileline: off
-	# Log to standard error. When in doubt, set to no. Useful when
-	# running in the foreground (when invoking "corosync -f")
-	to_stderr: no
-	# Log to a log file. When set to "no", the "logfile" option
-	# must not be set.
-	to_logfile: no
-	#logfile: /var/log/corosync/corosync.log
-	# Log to the system log daemon. When in doubt, set to yes.
-	to_syslog: yes
-	# Log with syslog facility daemon.
-	syslog_facility: daemon
-	# Log debug messages (very verbose). When in doubt, leave off.
-	debug: off
-	# Log messages with time stamps. When in doubt, set to on
-	# (unless you are only logging to syslog, where double
-	# timestamps can be annoying).
-	timestamp: on
-	logger_subsys {
-		subsys: QUORUM
-		debug: off
-	}
-}
-
-quorum {
-	# Enable and configure quorum subsystem (default: off)
-	# see also corosync.conf.5 and votequorum.5
-	provider: corosync_votequorum
-	expected_votes: 2
-}
diff --git a/debian/corosync.install b/debian/corosync.install
index 027a58db..f38d1f78 100755
--- a/debian/corosync.install
+++ b/debian/corosync.install
@@ -30,6 +30,5 @@ usr/share/augeas/lenses/corosync.aug
 usr/share/augeas/lenses/tests/test_corosync.aug
 etc/corosync/corosync.*example* usr/share/doc/corosync/examples
 etc/corosync/uidgid.d
-debian/corosync.conf etc/corosync
 usr/share/corosync/xml2conf.xsl
 var/lib/corosync