X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=412b401016c36481b366d5239e3050b76620ce50;hb=f27128bd33db08114f264c4028ae667c962b64c5;hp=c98d71e0bb66c7d46b2a223e7ccc04dd99641f1f;hpb=2d2a85edf02c635b592dfdb52c92dfa97b845f68;p=sfa.git

diff --git a/setup.py b/setup.py
index c98d71e0..412b4010 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
 
-from __future__ import print_function
 
 """
 Installation script for the sfa module
@@ -53,10 +53,7 @@ packages = [
     'sfa/rspecs/versions',
     'sfa/client',
     'sfa/planetlab',
-    'sfa/nitos',
     'sfa/dummy',
-    'sfa/openstack',
-    'sfa/federica',
     'sfa/iotlab',
     'sfatables',
     'sfatables/commands',
@@ -85,10 +82,12 @@ data_files = [
     ('/usr/share/sfa/examples/', glob('sfa/examples/*' ) + [ 'cron.d/sfa.cron' ] ),
 ]
 
-
+# use /lib/systemd instead of /usr/lib/systemd
+# the latter would work on fedora only, the former
+# will work on both fedora and ubuntu
 services = ['sfa-db', 'sfa-aggregate', 'sfa-registry']
 data_files.append(
-    ('/usr/lib/systemd/system',
+    ('/lib/systemd/system',
      ['systemd/{}.service'.format(service)
       for service in services]))
 
@@ -112,7 +111,7 @@ if sys.argv[1] in ['uninstall', 'remove', 'delete', 'clean']:
     remove_dirs = ['/etc/sfa/', '/etc/sfatables'] + site_packages_path
     remove_bins = [ '/usr/bin/' + os.path.basename(bin) for bin in scripts ]
     remove_files = (remove_bins
-                    + ["/usr/lib/systemd/system/{}".format(x)
+                    + ["/lib/systemd/system/{}".format(x)
                        for x in services])
 
     # remove files