rename /etc/geni into /etc/sfa

diff --git a/INSTALL.txt b/INSTALL.txt
index 12beb11..dd26eda 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -34,12 +34,12 @@ NOTICE:  table "geni$plc" does not exist, skipping
   inserting authority record for plc
 
 --- 
-run sfa-config-tty again - to initialize /etc/geni/authorities/plc/plc.pkey
+run sfa-config-tty again - to initialize /etc/sfa/authorities/plc/plc.pkey
 
 [2009.06.09--1l-f8-32-vplc07] / # sfa-config-tty 
 Enter command (u for usual changes, w to save, ? for help) q
-                /etc/geni/authorities/server.key
-copied from     /etc/geni/authorities/plc/plc.pkey
+                /etc/sfa/authorities/server.key
+copied from     /etc/sfa/authorities/plc/plc.pkey
 ---
 
 
@@ -48,7 +48,7 @@ xxx tested this far xxx
 
 Federation:
 ===========
-edit /etc/geni/aggregates.xml and /etc/geni/registries.xml  
+edit /etc/sfa/aggregates.xml and /etc/sfa/registries.xml  
 * set addr to ip or hostname of federated peer
 * set port to geni service port on federated peer
 * set hrn to humarn readable name of federated peer interface

diff --git a/cmdline/demoAggregate.sh b/cmdline/demoAggregate.sh
index d29c8f7..ccb4b5f 100644 (file)
--- a/cmdline/demoAggregate.sh
+++ b/cmdline/demoAggregate.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PATH=$PATH:/etc/geni
+export PATH=$PATH:/etc/sfa
 source sfi_config
 CWD=$(pwd)
 

diff --git a/cmdline/testSfi.sh b/cmdline/testSfi.sh
index bef30a4..2d2d180 100644 (file)
--- a/cmdline/testSfi.sh
+++ b/cmdline/testSfi.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PATH=$PATH:/etc/geni
+export PATH=$PATH:/etc/sfa
 source sfi_config
 CWD=$(pwd)
 

diff --git a/cmdline/testSfiDelegate.sh b/cmdline/testSfiDelegate.sh
index 243d541..72f6057 100644 (file)
--- a/cmdline/testSfiDelegate.sh
+++ b/cmdline/testSfiDelegate.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PATH=$PATH:/etc/geni
+export PATH=$PATH:/etc/sfa
 source sfi_config
 CWD=$(pwd)
 

diff --git a/cmdline/testSfiSliceRegister.sh b/cmdline/testSfiSliceRegister.sh
index 026c8b2..0e65123 100644 (file)
--- a/cmdline/testSfiSliceRegister.sh
+++ b/cmdline/testSfiSliceRegister.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PATH=$PATH:/etc/geni
+export PATH=$PATH:/etc/sfa
 source sfi_config
 CWD=$(pwd)
 

diff --git a/config/sfa-config-tty b/config/sfa-config-tty
index 348b921..9cda7f5 100755 (executable)
--- a/config/sfa-config-tty
+++ b/config/sfa-config-tty
@@ -277,7 +277,7 @@ def main ():
     argv = sys.argv[1:]
     save = True
     parser = OptionParser(usage=command_usage, version="%prog 1.0")
-    parser.set_defaults(config_dir="/etc/geni",
+    parser.set_defaults(config_dir="/etc/sfa",
                         usual_variables=[])
     parser.add_option("","--configdir",dest="config_dir",action="append", help="specify configuration directory")
     parser.add_option("","--usual_variable",dest="usual_variables",action="append", help="add a usual variable")

diff --git a/geni/aggregate.py b/geni/aggregate.py
index 4f95ee8..8c05626 100644 (file)
--- a/geni/aggregate.py
+++ b/geni/aggregate.py
@@ -41,7 +41,7 @@ class Aggregates(dict):
 
     required_fields = ['hrn', 'addr', 'port']
      
-    def __init__(self, api, file = "/etc/geni/aggregates.xml"):
+    def __init__(self, api, file = "/etc/sfa/aggregates.xml"):
         dict.__init__(self, {})
         self.api = api
 

diff --git a/geni/alt_aggregate.py b/geni/alt_aggregate.py
index 0f65dbd..8d5a400 100644 (file)
--- a/geni/alt_aggregate.py
+++ b/geni/alt_aggregate.py
@@ -42,7 +42,7 @@ class AltAggregate(GeniServer):
     # @param key_file private key filename of registry
     # @param cert_file certificate filename containing public key (could be a GID file)     
 
-    def __init__(self, ip, port, key_file, cert_file, config = "/etc/geni/sfa_config"):
+    def __init__(self, ip, port, key_file, cert_file, config = "/etc/sfa/sfa_config"):
         GeniServer.__init__(self, ip, port, key_file, cert_file)
         self.key_file = key_file
         self.cert_file = cert_file

diff --git a/geni/init.d/sfa b/geni/init.d/sfa
index 88adf05..52ea5f8 100755 (executable)
--- a/geni/init.d/sfa
+++ b/geni/init.d/sfa
@@ -10,7 +10,7 @@
 #
 
 # Source config
-. /etc/geni/sfa_config
+. /etc/sfa/sfa_config
 
 # source function library
 . /etc/init.d/functions

diff --git a/geni/registry.py b/geni/registry.py
index e328650..7b705c3 100644 (file)
--- a/geni/registry.py
+++ b/geni/registry.py
@@ -46,7 +46,7 @@ class Registries(dict):
 
     required_fields = ['hrn', 'addr', 'port']
 
-    def __init__(self, api, file = "/etc/geni/registries.xml"):
+    def __init__(self, api, file = "/etc/sfa/registries.xml"):
         dict.__init__(self, {})
         self.api = api
     

diff --git a/geni/slicemgr.py b/geni/slicemgr.py
index 6c7a263..6407902 100644 (file)
--- a/geni/slicemgr.py
+++ b/geni/slicemgr.py
@@ -22,6 +22,6 @@ class SliceMgr(GeniServer):
     # @param key_file private key filename of registry
     # @param cert_file certificate filename containing public key (could be a GID file)     
 
-    def __init__(self, ip, port, key_file, cert_file, config = "/etc/geni/sfa_config"):
+    def __init__(self, ip, port, key_file, cert_file, config = "/etc/sfa/sfa_config"):
         GeniServer.__init__(self, ip, port, key_file, cert_file)
         self.server.interface = 'slicemgr'      

diff --git a/geni/util/api.py b/geni/util/api.py
index 07a4a63..8fb6ed6 100644 (file)
--- a/geni/util/api.py
+++ b/geni/util/api.py
@@ -100,7 +100,7 @@ class GeniAPI:
     import geni.methods
     methods = geni.methods.all
     
-    def __init__(self, config = "/etc/geni/sfa_config", encoding = "utf-8", 
+    def __init__(self, config = "/etc/sfa/sfa_config", encoding = "utf-8", 
                  peer_cert = None, interface = None, key_file = None, cert_file = None):
         self.encoding = encoding
 

diff --git a/geni/util/config.py b/geni/util/config.py
index 130388e..c802d05 100644 (file)
--- a/geni/util/config.py
+++ b/geni/util/config.py
@@ -35,7 +35,7 @@ class Config:
     fast but no type conversions.
     """
 
-    def __init__(self, filepath = "/etc/geni/sfa_config"):
+    def __init__(self, filepath = "/etc/sfa/sfa_config"):
         # Load plc_config
 
         loaded = False

diff --git a/geniwrapper.spec b/geniwrapper.spec
index ae1935c..3319c02 100644 (file)
--- a/geniwrapper.spec
+++ b/geniwrapper.spec
@@ -70,16 +70,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files plc
 %defattr(-,root,root)
-%config (noreplace) /etc/geni/sfa_config
-%config (noreplace) /etc/geni/aggregates.xml
-%config (noreplace) /etc/geni/registries.xml
+%config (noreplace) /etc/sfa/sfa_config
+%config (noreplace) /etc/sfa/aggregates.xml
+%config (noreplace) /etc/sfa/registries.xml
 /etc/init.d/sfa
 %{_bindir}/sfa-config-tty
 %{_bindir}/gimport.py*
 %{_bindir}/plc.py*
 
 %files client
-%config (noreplace) /etc/geni/sfi_config
+%config (noreplace) /etc/sfa/sfi_config
 %{_bindir}/sfi.py*
 %{_bindir}/getNodes.py*
 %{_bindir}/getRecord.py*

diff --git a/setup.py b/setup.py
index 333b539..fe9c75f 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ scripts = [ 'geni/gimport.py',
             'cmdline/genidump.py',
             ]
 package_dirs = ['geni', 'geni/util', 'geni/methods']
-data_files = [ ('/etc/geni/', ['config/aggregates.xml', 'config/registries.xml', 
+data_files = [ ('/etc/sfa/', ['config/aggregates.xml', 'config/registries.xml', 
                                'config/sfa_config', 'config/sfi_config']),
                ('/etc/init.d/', ['geni/init.d/sfa']),
                ('/var/www/html/wsdl', [ 'wsdl/sfa.wsdl' ] ),
@@ -29,7 +29,7 @@ initscripts = ['/etc/init.d/geni']
 if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
     python_path = sys.path
     site_packages_path = [ path + os.sep + 'geni' for path in python_path if path.endswith('site-packages')]
-    remove_dirs = ['/etc/geni/'] + site_packages_path
+    remove_dirs = ['/etc/sfa/'] + site_packages_path
     remove_files = ['/usr/bin/gimport.py', '/usr/bin/plc.py', '/usr/bin/sfi.py', '/usr/bin/sfa-config-tty'] + \
                     symlinks + initscripts