From 95be658a764f941c1d7b35532411fffef52f099a Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Fri, 10 Dec 2010 20:36:38 +0100
Subject: [PATCH] - Enable or rather force munge support.

---
 README.Fedora | 17 +++++++++++++++--
 torque.spec   | 11 +++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/README.Fedora b/README.Fedora
index 0d82a1c..6a6811e 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -5,6 +5,17 @@ To setup a basic single-node localhost-only batch system, install the
 torque-server, torque-mom, and torque-scheduler packages, and do something like
 this:
 
+0) If torque is built with munge support then this 
+   must be enabled first on all nodes. The munge
+   package should allready be installed.
+
+   Create a munge key with 
+
+   /usr/sbin/create-munge-key
+
+   Copy resulting key /etc/munge/munge.key to 
+   all torque nodes in your cluster including
+   pbs_server, pbs_mom and client (qstat,qsub) nodes.
 
 1) Get your full hostname with
 
@@ -55,6 +66,7 @@ service pbs_server start
 # /sbin/chkconfig pbs_mom on
 # /sbin/chkconfig pbs_server on
 # /sbin/chkconfig pbs_sched on
+# /sbin/chkconfig munge on
 
 9) Submit a test job.
 As a user not as root run the following
@@ -64,8 +76,9 @@ hostname
 echo "Hi I am a batch job running in torque"
 EOF
 
-
-
+10 ) Monitor the state of that job with qstat.
+
+In case of problems first of all look in /var/log/torque
 
 
 
diff --git a/torque.spec b/torque.spec
index 9a59aeb..7d8a335 100644
--- a/torque.spec
+++ b/torque.spec
@@ -68,7 +68,7 @@
 
 Name:        torque
 Version:     3.0.0
-Release:     1%{?dist}
+Release:     2%{?dist}
 Summary:     Tera-scale Open-source Resource and QUEue manager
 Source0:     http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
 Source2:     xpbs.desktop
@@ -135,6 +135,7 @@ This package holds just a few shared files and directories.
 Group:           Applications/System
 Summary:         Client part of TORQUE
 Requires:        %{name}-libs = %{version}-%{release}
+Requires:        munge
 Requires(posttrans):  chkconfig
 Requires(preun):      chkconfig
 
@@ -185,6 +186,7 @@ This package holds the graphical clients.
 Summary:      Run-time libs for programs which will use the %{name} library
 Group:        Development/Libraries
 Requires:     torque = %{version}-%{release}
+Requires:     munge
 Obsoletes:    libtorque  < 2.4.8-2
 Provides:     libtorque = %{version}-%{release}
 
@@ -221,6 +223,7 @@ necessary for developing programs which will use %{name}.
 Group:          System Environment/Daemons
 Summary:        Node execution daemon for TORQUE
 Requires:       torque-libs = %{version}-%{release}
+Requires:       munge
 %if ! %{use_rcp}
 Requires:       openssh-clients
 %endif
@@ -275,6 +278,7 @@ This package holds the fifo C scheduler.
 Group:             System Environment/Daemons
 Summary:           The main part of TORQUE
 Requires:          torque-libs = %{version}-%{release}
+Requires:          munge
 %if ! %{use_rcp}
 Requires:          openssh-server
 %endif
@@ -340,7 +344,7 @@ CFLAGS="%{optflags} -Wno-overlength-strings"
 %configure --includedir=%{_includedir}/torque \
   --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
   --with-sendmail=%{_sbindir}/sendmail --disable-static \
-  --enable-drmaa \
+  --enable-drmaa --enable-munge-auth \
   %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
 
 
@@ -768,6 +772,9 @@ fi
 %endif
 
 %changelog
+* Fri Dec 10 2010 Steve Traylen <steve.traylen@cern.ch> - 3.0.0-2
+- Enable or rather force munge support.
+
 * Thu Dec 9 2010 Steve Traylen <steve.traylen@cern.ch> - 3.0.0-1
 - New upstream 3.0.0. Drop patches torque-cond-touch.patch and
   torque-start-start.patch since both upstream now.