perfsonar development work

Author: dfn.karch
Date: 2011-07-19 14:47:57 +0100 (Tue, 19 Jul 2011)
New Revision: 728

Modified:
   trunk/build/perfSONAR-MA-Hades/Build.PL
   trunk/build/rpm/SPECS/oppd-MA-Hades.spec
   trunk/etc/oppd.d.example/hades.conf
   trunk/etc/oppd.d.example/status.conf
Log:
changed example configuration for ease of deployment in default environment
more build changes to merge Status MA


Modified: trunk/build/perfSONAR-MA-Hades/Build.PL
===================================================================
--- trunk/build/perfSONAR-MA-Hades/Build.PL     2011-07-19 13:18:49 UTC (rev 
727)
+++ trunk/build/perfSONAR-MA-Hades/Build.PL     2011-07-19 13:47:57 UTC (rev 
728)
@@ -13,7 +13,7 @@
         'Test::More' => 0,
     },
     requires => {
-        'perfSONAR'  => 0.54,
+        'perfSONAR'  => 0.53,
     },
     etc_files => {
         'etc/hades.conf' => 'etc/oppd.d/hades.conf',

Modified: trunk/build/rpm/SPECS/oppd-MA-Hades.spec
===================================================================
--- trunk/build/rpm/SPECS/oppd-MA-Hades.spec    2011-07-19 13:18:49 UTC (rev 
727)
+++ trunk/build/rpm/SPECS/oppd-MA-Hades.spec    2011-07-19 13:47:57 UTC (rev 
728)
@@ -74,8 +74,12 @@
 #%{_mandir}/man3/*
 %{install_base}/*
 %config /etc/oppd.d/hades.conf
+%config /etc/oppd.d/hades-status.conf
 
 %changelog
+* Tue Jul 19 2011 Roland Karch
+- merged Status MA into HADES MA package
+
 * Thu Jul 07 2011 Hakan Calim
 - Change Release to RC2 
 - Fixed problem with Ls registration

Modified: trunk/etc/oppd.d.example/hades.conf
===================================================================
--- trunk/etc/oppd.d.example/hades.conf 2011-07-19 13:18:49 UTC (rev 727)
+++ trunk/etc/oppd.d.example/hades.conf 2011-07-19 13:47:57 UTC (rev 728)
@@ -31,7 +31,7 @@
   #
   <module_param>
 
-    config  "mydomain"
+    config  "/etc/hades/hades.conf"
       # Hades domain for which data should be available via this service
 
     # You can add further Hades configuration parameters here.

Modified: trunk/etc/oppd.d.example/status.conf
===================================================================
--- trunk/etc/oppd.d.example/status.conf        2011-07-19 13:18:49 UTC (rev 
727)
+++ trunk/etc/oppd.d.example/status.conf        2011-07-19 13:47:57 UTC (rev 
728)
@@ -29,7 +29,7 @@
   #
   <module_param>
 
-    config  "mydomain"
+    config  "/etc/hades/hades.conf"
       # Hades domain for which data should be available via this service
 
     # You can add further Hades configuration parameters here.