[Debian-ha-commits] [corosync] 01/02: Create new corosync.conf based on upstream version.
Adrian Vondendriesch
discostu-guest at moszumanska.debian.org
Sat May 2 15:17:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
discostu-guest pushed a commit to branch master
in repository corosync.
commit e8fffd3ea4af78100e0aa675283f3e723c3c8493
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date: Sat May 2 16:29:51 2015 +0200
Create new corosync.conf based on upstream version.
Because many parameters changed since version 2.x we should adjust our sample
configuration accordingly.
Signed-off-by: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
---
debian/changelog | 2 +
debian/corosync.example-config | 130 +++++++++++++++++++++++++----------------
2 files changed, 81 insertions(+), 51 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fdb01a2..d8030be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,8 @@ corosync (2.3.4-1) UNRELEASED; urgency=medium
- Patch upstream corosync-notifyd.service file
- Use debian initscript within corosync.service
* Add OPTIONS within /etc/default/corosync-notifyd
+ * debian/corosync.example-config: create a new example-config based on
+ current upstream version (Closes: #682532, #739730)
-- Richard B Winters <rik at mmogp.com> Wed, 22 Apr 2015 15:51:34 -0400
diff --git a/debian/corosync.example-config b/debian/corosync.example-config
index 1356709..8c39c39 100644
--- a/debian/corosync.example-config
+++ b/debian/corosync.example-config
@@ -1,5 +1,4 @@
-# Please read the openais.conf.5 manual page
-
+# Please read the corosync.conf.5 manual page
totem {
version: 2
@@ -9,68 +8,97 @@ totem {
# How many token retransmits before forming a new configuration
token_retransmits_before_loss_const: 10
- # How long to wait for join messages in the membership protocol (ms)
- join: 60
-
- # How long to wait for consensus to be achieved before starting a new round of membership configuration (ms)
- consensus: 3600
-
- # Turn off the virtual synchrony filter
- vsftype: none
-
- # Number of messages that may be sent by one processor on receipt of the token
- max_messages: 20
-
# Limit generated nodeids to 31-bits (positive signed integers)
clear_node_high_bit: yes
- # Disable encryption
- secauth: off
+ # 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
- # How many threads to use for encryption/decryption
- threads: 0
+ # 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
- # This specifies the mode of redundant ring, which may be none, active, or passive.
- rrp_mode: none
-
- interface {
- # The following values need to be set based on your environment
+ # 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
- bindnetaddr: 127.0.0.1
- mcastaddr: 226.94.1.1
+ # 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
}
}
-amf {
- mode: disabled
-}
-
-service {
- # Load the Pacemaker Cluster Resource Manager
- ver: 0
- name: pacemaker
-}
-
-aisexec {
- user: root
- group: root
-}
-
logging {
- fileline: off
- to_stderr: yes
- to_logfile: no
- to_syslog: yes
+ # 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: yes
+ 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
- debug: off
- timestamp: on
- logger_subsys {
- subsys: AMF
- debug: off
- tags: enter|leave|trace1|trace2|trace3|trace4|trace6
- }
+ # 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
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/corosync.git
More information about the Debian-HA-Commits
mailing list