Blob Blame History Raw
--- mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/mysql-mmm/mmm_common.conf	2009-11-03 12:47:50.000000000 -0600
@@ -1,45 +1,41 @@
-active_master_role	writer
-
+active_master_role      writer
 
 <host default>
-	cluster_interface		eth0
-
-	pid_path				/var/run/mmmd_agent.pid
-	bin_path				/usr/bin/mysql-mmm/
-
+    cluster_interface       eth0
+    pid_path                /var/run/mysql-mmm/mmmd_agent.pid
+    bin_path                /usr/libexec/mysql-mmm/
     replication_user        replication
     replication_password    slave
-
-	agent_user				mmm_agent
-	agent_password			RepAgent
+    agent_user              mmm_agent
+    agent_password          RepAgent
 </host>
 
 <host db1>
-	ip						192.168.0.31
-	mode					master
-	peer					db2
+    ip      192.168.0.31
+    mode    master
+    peer    db2
 </host>
 
 <host db2>
-	ip						192.168.0.32
-	mode					master
-	peer					db1
+    ip      192.168.0.32
+    mode    master
+    peer    db1
 </host>
 
 <host db3>
-	ip						192.168.0.33
-	mode					slave
+    ip      192.168.0.33
+    mode    slave
 </host>
 
 
 <role writer>
-	hosts					db1, db2
-	ips						192.168.0.50
-	mode					exclusive
+    hosts   db1, db2
+    ips     192.168.0.50
+    mode    exclusive
 </role>
 
 <role reader>
-	hosts					db1, db2, db3
-	ips						192.168.0.51, 192.168.0.52, 192.168.0.53
-	mode					balanced
+    hosts   db1, db2, db3
+    ips     192.168.0.51, 192.168.0.52, 192.168.0.53
+    mode    balanced
 </role>
--- mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf.orig	2009-06-18 20:15:54.000000000 -0500
+++ mysql-mmm-2.0.9/etc/mysql-mmm/mmm_tools.conf	2009-11-03 12:51:47.000000000 -0600
@@ -1,43 +1,43 @@
 include mmm_agent.conf
 
-default_copy_method			scp
-clone_dirs					data, logs
+default_copy_method         scp
+clone_dirs                  data, logs
 
 <host default>
-	ssh_user				root
+    ssh_user                root
 
-    lvm_snapshot_size		1G
-    lvm_logical_volume		mysql
-    lvm_volume_group		storage
-    lvm_mount_dir			/mmm_snapshot
-    lvm_mount_opts			-orw,nouuid
+    lvm_snapshot_size       1G
+    lvm_logical_volume      mysql
+    lvm_volume_group        storage
+    lvm_mount_dir           /mmm_snapshot
+    lvm_mount_opts          -orw,nouuid
 
-	tools_user				mmm_tools
-	tools_password			RepTools
+    tools_user              mmm_tools
+    tools_password          RepTools
 
-	backup_dir				/mmm_backup
-	restore_dir				/mysql
+    backup_dir              /mmm_backup
+    restore_dir             /mysql
 </host>
 
 
 <copy_method scp>
     backup_command scp -c blowfish -r %SSH_USER%@%IP%:%SNAPSHOT%/%CLONE_DIR% %DEST_DIR%/
     restore_command cp -axv %BACKUP_DIR%/* %DEST_DIR%/
-	true_copy 1
+    true_copy 1
 </copy_method>
 
 <copy_method rdiff>
-	backup_command rdiff-backup --ssh-no-compression -v 5 !--include %SNAPSHOT%/%CLONE_DIR%! --exclude %SNAPSHOT% %SSH_USER%@%IP%::%SNAPSHOT%/ %DEST_DIR%/
-	restore_command rdiff-backup --force -v 5 -r %VERSION% %BACKUP_DIR% %DEST_DIR%/.mmm_restore; cp -axvl --remove-destination %DEST_DIR%/.mmm_restore/*  %DEST_DIR%/; rm -r %DEST_DIR%/.mmm_restore/
-	incremental_command rdiff-backup --parsable-output -l %BACKUP_DIR%
-	single_run 1
-	incremental 1
+    backup_command rdiff-backup --ssh-no-compression -v 5 !--include %SNAPSHOT%/%CLONE_DIR%! --exclude %SNAPSHOT% %SSH_USER%@%IP%::%SNAPSHOT%/ %DEST_DIR%/
+    restore_command rdiff-backup --force -v 5 -r %VERSION% %BACKUP_DIR% %DEST_DIR%/.mmm_restore; cp -axvl --remove-destination %DEST_DIR%/.mmm_restore/*  %DEST_DIR%/; rm -r %DEST_DIR%/.mmm_restore/
+    incremental_command rdiff-backup --parsable-output -l %BACKUP_DIR%
+    single_run 1
+    incremental 1
 </copy_method>
 
 <copy_method ssh-gz>
-	backup_command ssh -c blowfish %SSH_USER%@%IP% "cd '%SNAPSHOT%'; tar cv !'%CLONE_DIR%'!" | gzip > %DEST_DIR%/backup.tar.gz
-	restore_command cd %DEST_DIR%; tar xzfv %BACKUP_DIR%/backup.tar.gz
-	single_run 1
+    backup_command ssh -c blowfish %SSH_USER%@%IP% "cd '%SNAPSHOT%'; tar cv !'%CLONE_DIR%'!" | gzip > %DEST_DIR%/backup.tar.gz
+    restore_command cd %DEST_DIR%; tar xzfv %BACKUP_DIR%/backup.tar.gz
+    single_run 1
 </copy_method>
 
 
--- mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/etc/mysql-mmm/mmm_agent.conf	2009-11-03 17:29:11.000000000 -0600
@@ -1,2 +1,6 @@
 include mmm_common.conf
+
+# The 'this' variable refers to this server.  Proper operation requires 
+# that 'this' server (db1 by default), as well as all other servers, have the 
+# proper IP addresses set in mmm_common.conf.
 this db1
--- mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf.orig	2009-10-29 13:26:29.000000000 -0500
+++ mysql-mmm-2.0.10/etc/mysql-mmm/mmm_mon.conf	2009-11-03 17:54:12.000000000 -0600
@@ -1,16 +1,24 @@
 include mmm_common.conf
 
 <monitor>
-	ip						127.0.0.1
-	pid_path				/var/run/mmmd_mon.pid
-	bin_path				/usr/bin/mysql-mmm/
-	status_path				/var/lib/misc/mmmd_mon.status
-	ping_ips				192.168.0.1, 192.168.0.2, 192.168.0.3
+    ip                  127.0.0.1
+    pid_path            /var/run/mysql-mmm/mmmd_mon.pid
+    bin_path            /usr/libexec/mysql-mmm
+    status_path         /var/lib/mysql-mmm/mmmd_mon.status
+    ping_ips            192.168.0.1, 192.168.0.2, 192.168.0.3
+    auto_set_online     60
+
+    # The kill_host_bin does not exist by default, though the monitor will
+    # throw a warning about it missing.  See the section 5.10 "Kill Host 
+    # Functionality" in the PDF documentation.
+    #
+    # kill_host_bin     /usr/libexec/mysql-mmm/monitor/kill_host
+    #
 </monitor>
 
 <host default>
-	monitor_user			mmm_monitor
-	monitor_password		RepMonitor
+    monitor_user        mmm_monitor
+    monitor_password    RepMonitor
 </host>
 
 debug 0