[zabbix20/el6] Fix typo in proxy init script and improve the README

[Volker Fröhlich]

commit d4237cf051079988946d69a3b781d9a057a46b03
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Sun Dec 15 14:55:26 2013 +0100

    Fix typo in proxy init script and improve the README
    
    - The start function had a typo causing failure
    - Improved the section on running multiple instances in the README

 zabbix-fedora.README |   11 ++++++++---
 zabbix-proxy.init    |    2 +-
 zabbix20.spec        |    6 +++++-
 3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/zabbix-fedora.README b/zabbix-fedora.README
index 172c4d9..97d55dc 100644
--- a/zabbix-fedora.README
+++ b/zabbix-fedora.README
@@ -83,13 +83,18 @@ If you want to run multiple instances on the same host, do the following:
 - Create a file of the same name as the new init script in /etc/sysconfig
 - Define CFG_FILE="</path/to/daemon_config_file>" in this file
 - Create the file defined as CFG_FILE and adjust settings; in particular:
+ - DB settings if you set up multiple instances of server and proxy daemons;
+   IMPORTANT: Two daemons using the same database at the same time could act
+   destructive!
  - PidFile
- - ListenPort and/or ListenIP, if you plan for simultaneous operation 
+ - ListenPort and/or ListenIP, if you plan for simultaneous operation;
+   Don't forget to review your firewall settings!
  - LogFile, if you don't use syslog
- - DB settings for server and proxy daemons
-- Optionally run the following to register as a service and set it to start up:
+- Optionally run the following to register the new instance as a service and
+  start it up automatically:
   chkconfig --add <init_script_name>
   chkconfig <init_script_name> on
+- service <init_script_name> start
 
 
 ==Configuration changes==
diff --git a/zabbix-proxy.init b/zabbix-proxy.init
index cc1fe9e..e3b2283 100644
--- a/zabbix-proxy.init
+++ b/zabbix-proxy.init
@@ -37,7 +37,7 @@ param="-c $config"
 start()
 {
     echo -n $"Starting Zabbix proxy: "
-    daemon --usersrv zabbix --pidfile "$pidfile" $exec $param
+    daemon --user zabbixsrv --pidfile "$pidfile" $exec $param
     rv=$?
     echo
     [ $rv -eq 0 ] && touch $lockfile
diff --git a/zabbix20.spec b/zabbix20.spec
index 2c8d830..2ad6365 100644
--- a/zabbix20.spec
+++ b/zabbix20.spec
@@ -20,7 +20,7 @@
 
 Name:           zabbix20
 Version:        2.0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -847,6 +847,10 @@ fi
 %files web-pgsql
 
 %changelog
+* Sun Dec 15 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.10-2
+- The start function of the proxy init script had a typo causing failure
+- Improved the section on running multiple instances in the README
+
 * Fri Dec 13 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.10-1
 - New upstream release
 - Drop obsolete patch ZBX-7479