perfsonar development work

Author: dfn.calim
Date: 2011-05-25 10:35:02 +0100 (Wed, 25 May 2011)
New Revision: 711

Added:
   trunk/etc/oppd-ma-hades/
   trunk/etc/oppd-ma-hades/oppd.conf
   trunk/etc/oppd-ma-hades/oppd.d/hades.conf
   trunk/etc/oppd-ma-hades/oppd.d/status.conf
   trunk/etc/oppd-mp-bwctl/
   trunk/etc/oppd-mp-bwctl/oppd.conf
   trunk/etc/oppd-mp-bwctl/oppd.d/
   trunk/etc/oppd-mp-bwctl/oppd.d/bwctl.conf
   trunk/etc/oppd-mp-owamp/
   trunk/etc/oppd-mp-owamp/oppd.conf
   trunk/etc/oppd-mp-owamp/oppd.d/
   trunk/etc/oppd-mp-owamp/oppd.d/owamp.conf
Removed:
   trunk/etc/oppd-hades-ma/
   trunk/etc/oppd-ma-hades/oppd.d/hades-status.conf
   trunk/etc/oppd-ma-hades/oppd.d/hades.conf
   trunk/etc/oppd-ma-hades/oppd.dev.conf
Log:
change config files

Copied: trunk/etc/oppd-ma-hades (from rev 707, trunk/etc/oppd-hades-ma)

Added: trunk/etc/oppd-ma-hades/oppd.conf
===================================================================
--- trunk/etc/oppd-ma-hades/oppd.conf                           (rev 0)
+++ trunk/etc/oppd-ma-hades/oppd.conf   2011-05-25 09:35:02 UTC (rev 711)
@@ -0,0 +1 @@
+link ../oppd.conf.example
\ No newline at end of file


Property changes on: trunk/etc/oppd-ma-hades/oppd.conf
___________________________________________________________________
Name: svn:special
   + *

Deleted: trunk/etc/oppd-ma-hades/oppd.d/hades-status.conf
===================================================================
--- trunk/etc/oppd-hades-ma/oppd.d/hades-status.conf    2011-04-14 15:21:43 
UTC (rev 707)
+++ trunk/etc/oppd-ma-hades/oppd.d/hades-status.conf    2011-05-25 09:35:02 
UTC (rev 711)
@@ -1,39 +0,0 @@
-#
-# Status MA configuration for LHCOPN
-#
-
-<service MA/HADES/MYDOMAIN/STATUS>
-
-  #
-  # Necessary parameters for module initialisation
-  #
-  module        MA::Hades      # Name of module to load
-  servicetype   MA              # Service type: MP or MA
-
-  #
-  # Name, description, and keyword will be reported to Lookup Server
-  #
-  name          "Hades Status Measurement Archive"
-  description   "Measurement Archive for Hades Traceroute data \
-                 from measurement points in the LHCOPN network"
-  keyword       "project:mydomain"
-
-  #
-  # Further parameters
-  #
-  metric        "traceroute status"
-    # Measurement metric(s). More than one element definition possible.
-
-  #
-  # Module parameters
-  #
-  <module_param>
-
-    config  "/etc/hades/hades.conf"
-      # Hades domain for which data should be available via this service
-
-    # You can add further Hades configuration parameters here.
-    # TODO: pointer to useful documentation
-  </module_param>
-
-</service MA/HADES/MYDOMAIN/STATUS>

Deleted: trunk/etc/oppd-ma-hades/oppd.d/hades.conf
===================================================================
--- trunk/etc/oppd-hades-ma/oppd.d/hades.conf   2011-04-14 15:21:43 UTC (rev 
707)
+++ trunk/etc/oppd-ma-hades/oppd.d/hades.conf   2011-05-25 09:35:02 UTC (rev 
711)
@@ -1,41 +0,0 @@
-#
-# Hades MA example configuration
-#
-
-<service MA/HADES/MYDOMAIN>
-
-  #
-  # Necessary parameters for module initialisation
-  #
-  module        MA::Hades       # Name of module to load
-  servicetype   MA              # Service type: MP or MA
-
-  #
-  # Name, description, and keyword will be reported to Lookup Server
-  #
-  name          "Hades Measurement Archive"
-  description   "Measurement Archive for Hades (OWD, OWDV, Packet Loss) data 
\
-                 from measurement points in my network (mydomain)"
-  keyword       "project:mydomain"
-
-  #
-  # Further parameters
-  #
-  metric        "one way delay"
-  metric        "one way delay variation"
-  metric        "packet loss"
-    # Measurement metric(s). More than one element definition possible.
-
-  #
-  # Module parameters
-  #
-  <module_param>
-
-    config  "/etc/hades/hades.conf"
-      # Hades domain for which data should be available via this service
-
-    # You can add further Hades configuration parameters here.
-    # TODO: pointer to useful documentation
-  </module_param>
-
-</service MA/HADES/MYDOMAIN>

Added: trunk/etc/oppd-ma-hades/oppd.d/hades.conf
===================================================================
--- trunk/etc/oppd-ma-hades/oppd.d/hades.conf                           (rev 
0)
+++ trunk/etc/oppd-ma-hades/oppd.d/hades.conf   2011-05-25 09:35:02 UTC (rev 
711)
@@ -0,0 +1 @@
+link ../../oppd.d.example/hades.conf
\ No newline at end of file


Property changes on: trunk/etc/oppd-ma-hades/oppd.d/hades.conf
___________________________________________________________________
Name: svn:special
   + *

Added: trunk/etc/oppd-ma-hades/oppd.d/status.conf
===================================================================
--- trunk/etc/oppd-ma-hades/oppd.d/status.conf                          (rev 
0)
+++ trunk/etc/oppd-ma-hades/oppd.d/status.conf  2011-05-25 09:35:02 UTC (rev 
711)
@@ -0,0 +1 @@
+link ../../oppd.d.example/status.conf
\ No newline at end of file


Property changes on: trunk/etc/oppd-ma-hades/oppd.d/status.conf
___________________________________________________________________
Name: svn:special
   + *

Deleted: trunk/etc/oppd-ma-hades/oppd.dev.conf
===================================================================
--- trunk/etc/oppd-hades-ma/oppd.dev.conf       2011-04-14 15:21:43 UTC (rev 
707)
+++ trunk/etc/oppd-ma-hades/oppd.dev.conf       2011-05-25 09:35:02 UTC (rev 
711)
@@ -1,469 +0,0 @@
-#
-# Configuration file for the Open Perl PerfSONAR Daemon (oppd) for MDM
-#
-# All configuration options are set to their default values.
-# See 'man oppd' and 'man oppd.conf' for more information.
-#
-
-
-#
-# detach - Detach from terminal.
-#
-# Detach from terminal, aka run in background (instead of foreground).
-# Log messages will not be sent to STDERR.
-#
-# Valid options: yes, on, 1, true, no, off, 0, false
-#
-# Default: on
-#
-# Example:
-detach         off
-#
-#detach         on
-
-
-#
-# logfile - Name of log file.
-#
-# Append messages to the specified file.
-#
-# Set it to no, off, 0, or false to disable log file usage.
-# Set it to yes, on, 1, or true to enable logging to default log file
-# "/var/log/oppd.log".
-#
-# You can use this option together with "syslog" (see below).
-# Messages will then be written to both, log file and system log.
-#
-# Valid options: yes, on, 1, true, no, off, 0, false, path to log file
-#
-# Default: off
-#
-# Example:
-# logfile        "/var/log/oppd.log"
-#
-#logfile        off
-logfile        "/var/log/oppd.log"
-
-
-#
-# syslog - Whether messages should be written to system log.
-#
-# Set it to no, off, 0, or false to disable sending messages to system log.
-# Set it to yes, on, 1, or true to enable sending messages to system log.
-#
-# You can use this option together with "logfile" (see above).
-# Messages will then be written to both, log file and system log.
-#
-# Valid options: yes, on, 1, true, no, off, 0, false
-#
-# Default: off
-#
-# Example:
-# syslog         on
-#
-#syslog         off
-syslog         on
-
-
-#
-# syslog-host - The (optional) host to which system log messages are 
forwarded.
-#
-# If this option is set to a dns name or ip address, all system log messages
-# are forwarded to the specified remote host.
-# If set to no, off, 0, false, or "" logging is done locally.
-#
-# Valid options: no, off, 0, false, name or ip of syslog host
-#
-# Default: off
-#
-# Example:
-# syslog-host    "syslog.nowhere.com"
-#
-#syslog-host    off
-
-
-#
-# syslog-ident - Identification string for system log messages.
-#
-# This string will be prepended to all messages in the system log.
-#
-# Default: oppd
-#
-# Example:
-# syslog-ident    "hades-tracert"
-#
-#syslog-ident   "oppd"
-
-
-#
-# syslog-facility - Type of program for system logging.
-#
-# This string will be used as the system log facility for messages sent to
-# the system log.
-# See your syslog documentation for the facilities available on your system.
-#
-# Valid options: (Typical facilities.)
-# auth, authpriv, cron, daemon, kern, local0 through local7,  mail, news,
-# syslog, user, uucp
-#
-# Default: daemon
-#
-# Example:
-# syslog-facility "local0"
-#
-#syslog-facility "daemon"
-
-
-#
-# loglevel - The log level used for logging to syslog and to the log files.
-#
-# This option is used for setting the verbosity of the running daemon.
-# The log levels available are the log levels defined by Log::Dispatch.
-#
-# Valid options: (This is a list of values that should be accepted.)
-# 0. trace
-# 1. debug
-# 2. info
-# 3. warning
-# 4. error
-# 5. fatal
-#
-# Default: notice
-#
-# Example:
-# loglevel        "info"
-#
-loglevel        "info"
-#loglevel        "debug"
-
-
-#
-# pidfile - Name of pid file.
-#
-# Set it to no, off, 0, or false to disable pid file usage.
-# Set it to yes, on, 1, or true to write pid file to default position
-# "/var/run/oppd.pid".
-#
-# Valid options: yes, on, 1, true, no, off, 0, false, path to pid file
-#
-# Default: /var/run/oppd.pid
-#
-# Example:
-pidfile        off
-#
-#pidfile        "/var/run/oppd.pid"
-
-
-#
-# port - Port used to listen on incoming connections
-#
-# Port used to listen on incoming connections.
-#
-# Valid options: integer number
-#
-# Default: 8090
-#
-# Example:
-# port           12345
-#
-#port           8090
-
-
-#
-# max_proc - Maximum number of parallel running request processes.
-#
-# Set the maximum number of processes to be spawned for handling incoming
-# requests.
-#
-# Valid options: integer number
-#
-# Default: 5
-#
-# Example:
-# max_proc       20
-#
-#max_proc       5
-
-
-###############################################################################
-#
-# Options for Lookup Service communication:
-#
-###############################################################################
-
-#
-# ls_register - Lookup Service registration.
-#
-# Enable or disable Lookup Service registration.
-#
-# Valid options: yes, on, 1, true, no, off, 0, false
-#
-# Default: off
-#
-# Example:
-# ls_register    on
-#
-#ls_register    off
-
-
-#
-# keepalive - Keep alive interval.
-#
-# The keep alive interval for sending registration information to Lookup
-# Service in seconds.
-#
-# Valid options: integer number
-#
-# Default: 3600 (1 hour)
-#
-# Example:
-# keepalive      7200
-#
-#keepalive      3600
-
-
-#
-# ls_url - Lookup Service address.
-#
-# For every Lookup Service you want to send the registration information to
-# you should put one ls_url line in the configuration file. All you need is 
to
-# give the address of the service as URL.
-#
-# Valid options: URL
-#
-# Default: none
-#
-# Example:
-# ls_url         "http://myls.mydomain.org:8080/ervices/LookupService";
-# ls_url         "http://188.1.36.53:8080/axis/services/LookupService";
-# ls_url         
"http://loco3.man.poznan.pl:8080/LookupService/services/LookupService";
-# ls_url         "http://selena.acad.bg:8070/axis/services/LookupService";
-# ls_url         
"http://ndb0-aami.internet2.edu:9095/perfSONAR_PS/services/hLS";
-# ls_url         "http://ndb1.internet2.edu:9995/perfSONAR_PS/services/hLS";
-# ls_url         "http://dc211.internet2.edu:9995/perfSONAR_PS/services/hLS";
-# ls_url         
"http://loco4.man.poznan.pl:8180/geant2-java-xml-ls/services/LookupService";
-#
-#ls_url         [FILL ME]
-
-
-#
-# hostname - Host name sent to the Lookup Service.
-#
-# Host name sent to the Lookup Service.
-#
-# Valid options: String
-#
-# Default: none
-#
-# Example:
-# hostname       "myhost.mydomain.org"
-#
-#hostname       [FILL ME]
-
-
-#
-# organization - Organization sent to the Lookup Service.
-#
-# Organization sent to the Lookup Service.
-#
-# Valid options: String
-#
-# Default: none
-#
-# Example:
-# organization   "My Company"
-#
-#organization   [FILL ME]
-
-
-#
-# contact - Contact e-mail address sent to the Lookup Service.
-#
-# Contact e-mail address sent to the Lookup Service.
-#
-# Valid options: e-mail address
-#
-# Default: none
-#
-# Example:
-# contact        
""
-#
-#contact        [FILL ME]
-
-
-###############################################################################
-#
-# Options for Authentication communication:
-#
-###############################################################################
-
-#
-# auth - Use Authentication Service.
-#
-# Enable or disable authentication via Authentication Service.
-#
-# Valid options: yes, on, 1, true, no, off, 0, false
-#
-# Default: off
-#
-# Example:
-# auth           on
-#
-#auth           off
-
-
-#
-# as_url - Location of Authentication Service.
-#
-# Location of the Authentication Service as URL.
-#
-# Valid options: URL
-#
-# Default: none
-#
-# Example:
-# as_url         "http://myas.mydomain.org:8080/services/AuthService";
-# as_url         "http://myas.rediris.es:8080/services/AuthService";
-# as_url         
"http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService";
-#
-#as_url         [FILL ME]
-as_url          "http://myas.rediris.es:8080/services/AuthService";
-
-
-###############################################################################
-#
-# SSL configuration options
-#
-###############################################################################
-
-#
-# ssl - SSL (Secure Socket Layer) support.
-#
-# Enable or disable SSL (Secure Socket Layer) support, which means that
-# the daemon will expect HTTPS requests instead of normal HTTP request.
-# IMPORTANT: Normal HTTP requests will not work anymore if SSL is enabled!
-# IMPORTANT: Most of the following options are necessary for SSL. You should
-#            take care of all of them and make sure that you really know what
-#            you are doing! If oppd is missing a necessary option, you will 
get
-#            an error message and the daemon will not start!
-#
-# Valid options: yes, on, 1, true, no, off, 0, false
-#
-# Default: off
-#
-# Example:
-# ssl            on
-#
-#ssl            off
-
-
-#
-# ssl_cert_file - SSL certificate file.
-#
-# Use this option to specify the location of your certificate.
-# This option is required and there is NO default value!
-#
-# Valid options: File path (file format should be PEM)
-#
-# Default: none
-#
-# Example:
-# ssl_cert_file  /var/www/certs/server-cert.pem
-#
-#ssl_cert_file  [FILL ME]
-
-
-#
-# ssl_key_file - SSL server key file.
-#
-# Use this option to specify the location of your server key file.
-# This option is required and there is NO default value!
-#
-# Valid options: File path (file format should be PEM)
-#
-# Default: none
-#
-# Example:
-# ssl_key_file   /var/www/certs/server-key.pem
-#
-#ssl_key_file   [FILL ME]
-
-
-#
-# ssl_verify_client - Verify SSL client certificate.
-#
-# Enable or Disable the verification of the SSL client certificate. This is
-# normally used as a method of client authentication.
-# IMPORTANT: This option is enabled by default, because you normally don't 
want
-#            to allow access to perfSONAR services by untrusted users. You
-#            should only disable it if you really know what you are doing!
-#
-# Valid options: yes, on, 1, true, no, off, 0, false
-#
-# Default: on
-#
-# Example:
-# ssl_verify_client  off
-#
-#ssl_verify_client  on
-
-
-#
-# ssl_ca_file - SSL certificate(s) of the reputable certificate authorities.
-#
-# If you want to verify that the peer certificate has been signed by a
-# reputable certificate authority (see ssl_verify_client above), then you
-# must use this option (and/or ssl_ca_path below) to locate the file
-# containing the certificate(s) of the reputable certificate authorities.
-# There is NO default value!
-#
-# Valid options: File path (file format should be PEM)
-#
-# Default: none
-#
-# Example:
-# ssl_ca_file    /var/www/certs/my-ca.pem
-#
-#ssl_ca_file    [FILL ME]
-
-
-#
-# ssl_ca_path - Directory containing SSL certificate(s)
-#
-# If you want to verify that the peer certificate has been signed by a
-# reputable certificate authority (see ssl_verify_client above), then you
-# must use this option (and/or ssl_ca_file above) to locate the 
certificate(s)
-# of the reputable certificate authorities.
-# If you are unusually friendly with the OpenSSL documentation, you might 
have
-# set yourself up a directory containing several trusted certificates as
-# separate files as well as an index of the certificates.
-# Use this option to specify the location of this directory.
-# There is NO default value!
-#
-# Valid options: Directory path
-#
-# Default: none
-#
-# Example:
-# ssl_ca_path    /var/www/certs/ca/
-#
-#ssl_ca_path    [FILL ME]
-
-
-###############################################################################
-#
-# Configuring services
-#
-###############################################################################
-#
-# You have to define (at least) one or more <service> sections for every
-# perfSONAR services you want to provide. Instead of defining them all here
-# in this file, it is most likely more comfortable to use the following
-# statement to include all files in the subdirectory oppd.d ending with 
suffix
-# .conf. In this directory you should put every service into it's own file.
-# But you are, of course, free to do everything your own way!
-#
-###############################################################################
-
-include         oppd.d/*.conf
-

Added: trunk/etc/oppd-mp-bwctl/oppd.conf
===================================================================
--- trunk/etc/oppd-mp-bwctl/oppd.conf                           (rev 0)
+++ trunk/etc/oppd-mp-bwctl/oppd.conf   2011-05-25 09:35:02 UTC (rev 711)
@@ -0,0 +1 @@
+link ../oppd.conf.example
\ No newline at end of file


Property changes on: trunk/etc/oppd-mp-bwctl/oppd.conf
___________________________________________________________________
Name: svn:special
   + *

Added: trunk/etc/oppd-mp-bwctl/oppd.d/bwctl.conf
===================================================================
--- trunk/etc/oppd-mp-bwctl/oppd.d/bwctl.conf                           (rev 
0)
+++ trunk/etc/oppd-mp-bwctl/oppd.d/bwctl.conf   2011-05-25 09:35:02 UTC (rev 
711)
@@ -0,0 +1 @@
+link ../../oppd.d.example/bwctl.conf
\ No newline at end of file


Property changes on: trunk/etc/oppd-mp-bwctl/oppd.d/bwctl.conf
___________________________________________________________________
Name: svn:special
   + *

Added: trunk/etc/oppd-mp-owamp/oppd.conf
===================================================================
--- trunk/etc/oppd-mp-owamp/oppd.conf                           (rev 0)
+++ trunk/etc/oppd-mp-owamp/oppd.conf   2011-05-25 09:35:02 UTC (rev 711)
@@ -0,0 +1 @@
+link ../oppd.conf.example
\ No newline at end of file


Property changes on: trunk/etc/oppd-mp-owamp/oppd.conf
___________________________________________________________________
Name: svn:special
   + *

Added: trunk/etc/oppd-mp-owamp/oppd.d/owamp.conf
===================================================================
--- trunk/etc/oppd-mp-owamp/oppd.d/owamp.conf                           (rev 
0)
+++ trunk/etc/oppd-mp-owamp/oppd.d/owamp.conf   2011-05-25 09:35:02 UTC (rev 
711)
@@ -0,0 +1 @@
+link ../../oppd.d.example/owamp.conf
\ No newline at end of file


Property changes on: trunk/etc/oppd-mp-owamp/oppd.d/owamp.conf
___________________________________________________________________
Name: svn:special
   + *