From: Thierry Parmentelat Date: Fri, 3 Jul 2009 00:24:24 +0000 (+0000) Subject: rename /etc/geni into /etc/sfa X-Git-Tag: sfa-0.9-0@14641~199 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=115c220ddea863b078e31209d26109171124031b;p=sfa.git rename /etc/geni into /etc/sfa --- diff --git a/INSTALL.txt b/INSTALL.txt index 12beb110..dd26edaf 100644 --- 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 d29c8f7d..ccb4b5f5 100644 --- 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 bef30a48..2d2d1802 100644 --- 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 243d5418..72f6057f 100644 --- 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 026c8b2f..0e651238 100644 --- 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 348b9216..9cda7f5f 100755 --- 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 4f95ee83..8c05626b 100644 --- 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 0f65dbd9..8d5a4006 100644 --- 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 88adf053..52ea5f8c 100755 --- 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 e3286502..7b705c3e 100644 --- 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 6c7a263d..64079020 100644 --- 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 07a4a63f..8fb6ed69 100644 --- 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 130388e6..c802d057 100644 --- 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 ae1935c4..3319c02a 100644 --- 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 333b539b..fe9c75ff 100755 --- 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