X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=16d64e9167ba25840fc10a2d4e88278eadac3d32;hb=9fdbffd4fa452d8d7fc26631f2ee2385d37318b5;hp=e36bada8e48eaf8f292e43fb8884c7ad0f1dd782;hpb=623e299bda6c0343246807db3d012e0b2478e43f;p=sfa.git

diff --git a/setup.py b/setup.py
index e36bada8..16d64e91 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 """
-Installation script for the geniwrapper module
+Installation script for the sfa module
 """
 
 import sys, os, os.path
@@ -9,42 +9,46 @@ from glob import glob
 import shutil
 from distutils.core import setup
 
-bins = [ 'config/sfa-config-tty',
-            'sfa/plc/sfa-import-plc.py', 
-            'sfa/plc/sfa-nuke-plc.py', 
-            'sfa/server/sfa-server.py', 
-            'sfa/server/sfa-clean-peer-records.py', 
-            'sfa/client/sfi.py', 
-            'sfa/client/getNodes.py',
-            'sfa/client/getRecord.py',
-            'sfa/client/setRecord.py',
-            'sfa/client/genidump.py',
-            'sfatables/sfatables',
-            ]
-remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in bins ]
+bins = [ 
+    'config/sfa-config-tty',
+    'config/gen-sfa-cm-config.py',
+    'sfa/plc/sfa-import-plc.py', 
+    'sfa/plc/sfa-nuke-plc.py', 
+    'sfa/server/sfa-server.py', 
+    'sfa/server/sfa-clean-peer-records.py', 
+    'sfa/client/sfi.py', 
+    'sfa/client/getNodes.py',
+    'sfa/client/getRecord.py',
+    'sfa/client/setRecord.py',
+    'sfa/client/sfadump.py',
+    'sfatables/sfatables',
+    ]
+
+package_dirs = [
+    'sfa', 
+    'sfa/client',
+    'sfa/methods',
+    'sfa/plc',
+    'sfa/server',
+    'sfa/trust',
+    'sfa/util', 
+    'sfa/managers',
+    'sfa/rspecs',
+    'sfa/rspecs/aggregates',
+    'sfa/rspecs/aggregates/vini',
+    'sfatables',
+    'sfatables/commands',
+    'sfatables/processors',
+    ]
 
-package_dirs = [ 'sfa', 
-                 'sfa/client',
-                 'sfa/methods',
-                 'sfa/plc',
-                 'sfa/server',
-                 'sfa/trust',
-                 'sfa/util', 
-                 'sfa/rspecs',
-                 'sfa/rspecs/aggregates',
-                 'sfa/rspecs/aggregates/vini',
-                 'sfatables',
-                 'sfatables/commands',
-                 'sfatables/processors',
-                 ]
 
 data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
                               'config/registries.xml',
-                              'config/sfa_config',
+                              'config/default_config.xml',
                               'config/sfi_config']),
-              ('/etc/sfatables/matches/', glob('sfatables/matches/*')),
-              ('/etc/sfatables/targets/', glob('sfatables/targets/*')),
-              ('/etc/init.d/', ['sfa/init.d/sfa'])]
+              ('/etc/sfatables/matches/', glob('sfatables/matches/*.xml')),
+              ('/etc/sfatables/targets/', glob('sfatables/targets/*.xml')),
+              ('/etc/init.d/', ['sfa/init.d/sfa', 'sfa/init.d/sfa_cm'])]
 
 # add sfatables processors as data_files
 processor_files = [f for f in glob('sfatables/processors/*') if os.path.isfile(f)]
@@ -55,12 +59,14 @@ for d in processor_subdirs:
     d_files = [f for f in glob(d + '/*') if os.path.isfile(f)]
     data_files.append((etc_dir, processor_files))
 
-initscripts = [ '/etc/init.d/sfa' ]
+initscripts = [ '/etc/init.d/sfa', '/etc/init.d/sfa_cm' ]
 
 if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
     python_path = sys.path
-    site_packages_path = [ path + os.sep + 'sfa' for path in python_path if path.endswith('site-packages')]
-    remove_dirs = ['/etc/sfa/'] + site_packages_path
+    site_packages_path = [ os.path.join(p,'sfa') for p in python_path if p.endswith('site-packages')]
+    site_packages_path += [ os.path.join(p,'sfatables') for p in python_path if p.endswith('site-packages')]
+    remove_dirs = ['/etc/sfa/', '/etc/sfatables'] + site_packages_path
+    remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in bins ]
     remove_files = remove_bins + initscripts
 
     # remove files