From d0551f3370d34818bff95b4592c091ad1116bf66 Mon Sep 17 00:00:00 2001
From: derks <derks@fedoraproject.org>
Date: Feb 25 2010 17:47:18 +0000
Subject: - Fixed init scripts to check for ENABLED only within the start function.

Tue Feb 23 2010 BJ Dierkes <wdierkes@rackspace.com> - 2.1.0-2
- Added defaults file for mysql-mmm-agent and mysql-mmm-monitor
- Init scripts exit if ENABLED != 1
- Fixed typo in mysql-mmm-monitor where mmmd_mon was still referenced

---

diff --git a/import.log b/import.log
index 73b662e..429abdd 100644
--- a/import.log
+++ b/import.log
@@ -4,3 +4,4 @@ mysql-mmm-2_0_11-1:HEAD:mysql-mmm-2.0.11-1.src.rpm:1266440724
 mysql-mmm-2_0_11-2:HEAD:mysql-mmm-2.0.11-2.src.rpm:1266441284
 mysql-mmm-2_1_0-1:HEAD:mysql-mmm-2.1.0-1.src.rpm:1266882781
 mysql-mmm-2_1_0-1_1:HEAD:mysql-mmm-2.1.0-1.1.src.rpm:1266897069
+mysql-mmm-2_1_0-3:HEAD:mysql-mmm-2.1.0-3.src.rpm:1267120022
diff --git a/mysql-mmm-agent.init b/mysql-mmm-agent.init
index 40cd127..3bd56dc 100644
--- a/mysql-mmm-agent.init
+++ b/mysql-mmm-agent.init
@@ -5,12 +5,13 @@
 #
 # chkconfig: - 64 36
 # description:  MMM Agent.
-# processname: mmmd_agent
+# processname: mmm_agentd
 # config: /etc/mysql-mmm/mmm_agent.conf
 # pidfile: /var/run/mysql-mmm/mmm_agentd.pid
 
-# Source function library.
+# Source function library and defaults file.
 . /etc/rc.d/init.d/functions
+. /etc/default/mysql-mmm-agent
 
 # Paths
 MMMD_AGENT_BIN="/usr/sbin/mmm_agentd"
@@ -18,7 +19,13 @@ MMMD_AGENT_PIDFILE="/var/run/mysql-mmm/mmm_agentd.pid"
 LOCKFILE='/var/lock/subsys/mysql-mmm-agent'
 prog='MMM Agent Daemon'
 
+
 start() {
+        if [ "${ENABLED}" != "1" ]; then
+                echo "$prog is disabled!"
+                exit 1
+        fi
+
         echo -n "Starting $prog: "
         if [ -s $MMMD_AGENT_PIDFILE ] && kill -0 `cat $MMMD_AGENT_PIDFILE` 2> /dev/null; then
             echo " already running."
diff --git a/mysql-mmm-monitor.init b/mysql-mmm-monitor.init
index dd15715..e5df51e 100644
--- a/mysql-mmm-monitor.init
+++ b/mysql-mmm-monitor.init
@@ -5,12 +5,13 @@
 #
 # chkconfig: - 64 36
 # description:  MMM Monitor.
-# processname: mmmd_mon
+# processname: mmm_mond
 # config: /etc/mysql-mmm/mmm_mon.conf
 # pidfile: /var/run/mysql-mmm/mmm_mond.pid
 
-# Source function library.
+# Source function library and defaults file.
 . /etc/rc.d/init.d/functions
+. /etc/default/mysql-mmm-monitor
 
 # Cluster name (it can be empty for default cases)
 CLUSTER=''
@@ -18,15 +19,18 @@ LOCKFILE='/var/lock/subsys/mysql-mmm-monitor'
 prog='MMM Monitor Daemon'
 
 if [ "$CLUSTER" != "" ]; then
-    MMMD_MON_BIN="/usr/sbin/mmm_mond @$CLUSTER"
-    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmm_mond-$CLUSTER.pid"
+        MMMD_MON_BIN="/usr/sbin/mmm_mond @$CLUSTER"
+        MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmm_mond-$CLUSTER.pid"
 else 
-    MMMD_MON_BIN="/usr/sbin/mmmd_mon"
-    MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmm_mond.pid"
+        MMMD_MON_BIN="/usr/sbin/mmm_mond"
+        MMMD_MON_PIDFILE="/var/run/mysql-mmm/mmm_mond.pid"
 fi
 
-
 start() {
+        if [ "${ENABLED}" != "1" ]; then
+                echo "$prog is disabled!"
+                exit 1
+        fi
         echo -n "Starting $prog: "
         if [ -s $MMMD_MON_PIDFILE ] && kill -0 `cat $MMMD_MON_PIDFILE` 2> /dev/null; then
             echo " already running."
@@ -35,7 +39,7 @@ start() {
         daemon $MMMD_MON_BIN
         RETVAL=$?
         echo
-	[ $RETVAL = 0 ] && touch $LOCKFILE
+        [ $RETVAL = 0 ] && touch $LOCKFILE
         return $RETVAL
 }
 
diff --git a/mysql-mmm.spec b/mysql-mmm.spec
index 4cc8211..ae19b0e 100644
--- a/mysql-mmm.spec
+++ b/mysql-mmm.spec
@@ -1,7 +1,7 @@
 
 Name: mysql-mmm
 Version: 2.1.0
-Release: 1.1%{?dist}
+Release: 3%{?dist}
 Summary: Multi-Master Replication Manager for MySQL
 License: GPLv2
 URL: http://mysql-mmm.org
@@ -16,6 +16,7 @@ Source6: mmm_agent.conf
 Source7: mmm_mon.conf
 Source8: mmm_tools.conf
 Source9: mmm_common.conf
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 
 BuildArch: noarch
 Provides: mmm = %{version}-%{release} 
@@ -117,6 +118,19 @@ install -m 0640 %SOURCE9 %{buildroot}%{_sysconfdir}/mysql-mmm/mmm_common.conf
 install -m 0755 %SOURCE3 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-agent
 install -m 0755 %SOURCE4 %{buildroot}%{_sysconfdir}/init.d/mysql-mmm-monitor
 
+# Create defaults files
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/default
+
+cat >%{buildroot}%{_sysconfdir}/default/mysql-mmm-agent <<EOF
+# mysql-mmm-agent defaults
+ENABLED=1
+EOF
+
+cat >%{buildroot}%{_sysconfdir}/default/mysql-mmm-monitor <<EOF
+# mysql-mmm-monitor defaults
+ENABLED=1
+EOF
+ 
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -176,6 +190,7 @@ fi
 %defattr(-,root,root,-)
 %doc README
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_agent.conf
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/default/mysql-mmm-agent
 %attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-agent
 %{perl_vendorlib}/MMM/Agent
 %{_libexecdir}/mysql-mmm/agent/
@@ -186,6 +201,7 @@ fi
 %doc README
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_mon.conf
 %config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_mon_log.conf
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/default/mysql-mmm-monitor
 %attr(755,root,root) %{_sysconfdir}/init.d/mysql-mmm-monitor
 %{perl_vendorlib}/MMM/Monitor
 %{_libexecdir}/mysql-mmm/monitor/
@@ -194,6 +210,15 @@ fi
 
 
 %changelog
+* Thu Feb 25 2010 BJ Dierkes <wdierkes@rackspace.com> - 2.1.0-3
+- Fixed init scripts to check for ENABLED only within the start
+  function.
+
+* Tue Feb 23 2010 BJ Dierkes <wdierkes@rackspace.com> - 2.1.0-2
+- Added defaults file for mysql-mmm-agent and mysql-mmm-monitor
+- Init scripts exit if ENABLED != 1
+- Fixed typo in mysql-mmm-monitor where mmmd_mon was still referenced
+
 * Mon Feb 22 2010 BJ Dierkes <wdierkes@rackspace.com> - 2.1.0-1.1
 - Latest sources from upstream
 - Updated init scripts to reflect new binary paths