perfsonar-dev - [pS-dev] [GEANT/SA2/SA2T3-OPPD] r694 - in trunk: build/perfSONAR build/perfSONAR-MP-BWCTL build/perfSONAR-MP-OWAMP etc/oppd-hades-ma/oppd.d etc/oppd-mdm
Subject: perfsonar development work
List archive
[pS-dev] [GEANT/SA2/SA2T3-OPPD] r694 - in trunk: build/perfSONAR build/perfSONAR-MP-BWCTL build/perfSONAR-MP-OWAMP etc/oppd-hades-ma/oppd.d etc/oppd-mdm
Chronological Thread
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/SA2T3-OPPD] r694 - in trunk: build/perfSONAR build/perfSONAR-MP-BWCTL build/perfSONAR-MP-OWAMP etc/oppd-hades-ma/oppd.d etc/oppd-mdm
- Date: Wed, 30 Mar 2011 14:48:11 +0100
Author: dfn.calim
Date: 2011-03-30 14:48:07 +0100 (Wed, 30 Mar 2011)
New Revision: 694
Modified:
trunk/build/perfSONAR-MP-BWCTL/Build.PL
trunk/build/perfSONAR-MP-OWAMP/Build.PL
trunk/build/perfSONAR/Build.PL
trunk/build/perfSONAR/MANIFEST
trunk/etc/oppd-hades-ma/oppd.d/hades-status.conf
trunk/etc/oppd-hades-ma/oppd.d/hades.conf
trunk/etc/oppd-mdm/oppd.conf
Log:
add new build files for version 0.54 rpm packages
Modified: trunk/build/perfSONAR/Build.PL
===================================================================
--- trunk/build/perfSONAR/Build.PL 2011-03-22 13:58:30 UTC (rev 693)
+++ trunk/build/perfSONAR/Build.PL 2011-03-30 13:48:07 UTC (rev 694)
@@ -9,7 +9,7 @@
license => 'apache',
dist_author => 'DFN-Labor
<>',
dist_abstract => 'perl perfSONAR implementation',
- dist_version_from => 'lib/perfSONAR.pm',
+ dist_version => '0.54',
build_requires => {
'Test::More' => 0,
},
@@ -33,19 +33,20 @@
etc_files => {
#'etc/oppd-egee.conf' => 'etc/oppd.conf',
'etc/oppd-mdm.conf' => 'etc/oppd.conf',
- 'etc/Auth_request.xml' => 'etc/oppd/Auth_request.xml',
- 'etc/Auth_response.xml' => 'etc/oppd/Auth_response.xml',
- 'etc/LS_deregister.xml' => 'etc/oppd/LS_deregister.xml',
- 'etc/LS_register.xml' => 'etc/oppd/LS_register.xml',
- 'etc/LS_keepalive.xml' => 'etc/oppd/LS_keepalive.xml',
- 'etc/LS_KeyRequest.xml' => 'etc/oppd/LS_KeyRequest.xml',
+ 'etc/Auth_request.xml' => 'etc/oppd.d/Auth_request.xml',
+ 'etc/Auth_response.xml' => 'etc/oppd.d/Auth_response.xml',
+ 'etc/LS_deregister.xml' => 'etc/oppd.d/LS_deregister.xml',
+ 'etc/LS_register.xml' => 'etc/oppd.d/LS_register.xml',
+ 'etc/LS_keepalive.xml' => 'etc/oppd.d/LS_keepalive.xml',
+ 'etc/LS_KeyRequest.xml' => 'etc/oppd.d/LS_KeyRequest.xml',
},
init_files => {
- 'etc/oppd.init.debian' => 'init/init.d/oppd',
+ 'etc/oppd.init.redhat' => 'init/init.d/oppd',
+ #'etc/oppd.init.debian' => 'init/init.d/oppd',
},
- #sysconfig_files => {
- # 'etc/oppd.sysconfig.redhat' => 'init/sysconfig/oppd',
- #},
+ sysconfig_files => {
+ 'etc/oppd.sysconfig.redhat' => 'init/sysconfig/oppd',
+ },
add_to_cleanup => [ 'perfSONAR-*' ],
#install_path => { etc => '/etc' },
create_makefile_pl => 'small',
Modified: trunk/build/perfSONAR/MANIFEST
===================================================================
--- trunk/build/perfSONAR/MANIFEST 2011-03-22 13:58:30 UTC (rev 693)
+++ trunk/build/perfSONAR/MANIFEST 2011-03-30 13:48:07 UTC (rev 694)
@@ -9,12 +9,15 @@
etc/LS_register.xml
etc/oppd-mdm.conf
etc/oppd.conf.example
+etc/oppd.sysconfig.redhat
+etc/oppd.init.redhat
lib/perfSONAR.pm
lib/perfSONAR/Auth.pm
lib/perfSONAR/Client/LS.pm
lib/perfSONAR/DataStruct.pm
lib/perfSONAR/DataStruct/NMWG.pm
lib/perfSONAR/Echo.pm
+lib/perfSONAR/MA.pm
lib/perfSONAR/MP.pm
lib/perfSONAR/SOAP.pm
lib/perfSONAR/SOAP/Fault.pm
Modified: trunk/build/perfSONAR-MP-BWCTL/Build.PL
===================================================================
--- trunk/build/perfSONAR-MP-BWCTL/Build.PL 2011-03-22 13:58:30 UTC (rev
693)
+++ trunk/build/perfSONAR-MP-BWCTL/Build.PL 2011-03-30 13:48:07 UTC (rev
694)
@@ -7,7 +7,7 @@
dist_name => 'perfsonar-oppd-mp-bwctl',
license => 'apache',
dist_author => 'DFN-Labor
<>',
- dist_version_from => 'lib/perfSONAR/MP/BWCTL.pm',
+ dist_version => '0.54',
dist_abstract => 'BWCTL MP module for perl-perfSONAR',
build_requires => {
'Test::More' => 0,
@@ -18,7 +18,7 @@
'IO::Tty' => '>= 1.02',
},
etc_files => {
- 'etc/oppd-bwctl.conf.example' => 'etc/oppd.d/oppd-bwctl.conf',
+ 'etc/oppd-bwctl.conf.example' => 'etc/oppd.d/bwctl.conf',
},
add_to_cleanup => [ 'perfSONAR-MP-BWCTL-*' ],
create_makefile_pl => 'small',
Modified: trunk/build/perfSONAR-MP-OWAMP/Build.PL
===================================================================
--- trunk/build/perfSONAR-MP-OWAMP/Build.PL 2011-03-22 13:58:30 UTC (rev
693)
+++ trunk/build/perfSONAR-MP-OWAMP/Build.PL 2011-03-30 13:48:07 UTC (rev
694)
@@ -7,7 +7,7 @@
dist_name => 'perfsonar-oppd-mp-owamp',
license => 'apache',
dist_author => 'DFN-Labor
<>',
- dist_version_from => 'lib/perfSONAR/MP/OWAMP.pm',
+ dist_version => '0.54',
dist_abstract => 'OWAMP MP module for perl-perfSONAR',
build_requires => {
'Test::More' => 0,
@@ -24,11 +24,7 @@
create_makefile_pl => 'small',
);
-my $install_base = $builder->install_base();
-if ($install_base){
- $builder->install_path('etc' => "$install_base/etc");
-}
-$builder->install_path('etc' => 'etc');
+$builder->install_path('etc' => '/etc');
$builder->add_build_element('etc');
$builder->install_base_relpaths('lib' => 'lib');
$builder->create_build_script();
Modified: trunk/etc/oppd-hades-ma/oppd.d/hades-status.conf
===================================================================
--- trunk/etc/oppd-hades-ma/oppd.d/hades-status.conf 2011-03-22 13:58:30
UTC (rev 693)
+++ trunk/etc/oppd-hades-ma/oppd.d/hades-status.conf 2011-03-30 13:48:07
UTC (rev 694)
@@ -7,7 +7,7 @@
#
# Necessary parameters for module initialisation
#
- module MA::Status # Name of module to load
+ module MA::Hades # Name of module to load
servicetype MA # Service type: MP or MA
#
@@ -29,7 +29,7 @@
#
<module_param>
- config "/opt/hades/etc/hades-win.conf"
+ 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-hades-ma/oppd.d/hades.conf
===================================================================
--- trunk/etc/oppd-hades-ma/oppd.d/hades.conf 2011-03-22 13:58:30 UTC (rev
693)
+++ trunk/etc/oppd-hades-ma/oppd.d/hades.conf 2011-03-30 13:48:07 UTC (rev
694)
@@ -31,7 +31,7 @@
#
<module_param>
- config "/opt/hades/etc/hades-win.conf"
+ 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-mdm/oppd.conf
===================================================================
--- trunk/etc/oppd-mdm/oppd.conf 2011-03-22 13:58:30 UTC (rev 693)
+++ trunk/etc/oppd-mdm/oppd.conf 2011-03-30 13:48:07 UTC (rev 694)
@@ -17,7 +17,7 @@
# Default: on
#
# Example:
-detach off
+#detach off
#
#detach on
- [pS-dev] [GEANT/SA2/SA2T3-OPPD] r694 - in trunk: build/perfSONAR build/perfSONAR-MP-BWCTL build/perfSONAR-MP-OWAMP etc/oppd-hades-ma/oppd.d etc/oppd-mdm, svn-noreply, 03/30/2011
Archive powered by MHonArc 2.6.16.