move init.d and cron.d one step up in the source tree

diff --git a/Makefile b/Makefile
index 701c329..6d770b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ force:
 
 ##########
 tags:  
-       find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|~$$|\.(py[co]|doc|html|pdf|png|svg|out|bak|xml|dg)$$' | xargs etags
+       find . -type f | egrep -v '/\.git/|/\.svn/|TAGS|AA-|~$$|\.(py[co]|doc|html|pdf|png|svg|out|bak|xml|dg)$$' | xargs etags
 .PHONY: tags
 
 signatures:
@@ -141,7 +141,7 @@ else
        +$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
        +$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
        +$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
-       +$(RSYNC) ./sfa/init.d/sfa  $(SSHURL)/etc/init.d/
+       +$(RSYNC) ./init.d/sfa  $(SSHURL)/etc/init.d/
        +$(RSYNC) ./config/default_config.xml $(SSHURL)/etc/sfa/
        $(SSHCOMMAND) exec service sfa restart
 endif

diff --git a/cron.d/readme b/cron.d/readme
new file mode 100644 (file)
index 0000000..53d10a1
--- /dev/null
+++ b/cron.d/readme
@@ -0,0 +1 @@
+As of nov 2011 this is not packaged, use as a template for your installation

diff --git a/sfa/cron.d/sfa.cron b/cron.d/sfa.cron
similarity index 100%
rename from sfa/cron.d/sfa.cron
rename to cron.d/sfa.cron

diff --git a/sfa/init.d/sfa b/init.d/sfa
similarity index 100%
rename from sfa/init.d/sfa
rename to init.d/sfa

diff --git a/sfa/init.d/sfa-cm b/init.d/sfa-cm
similarity index 100%
rename from sfa/init.d/sfa-cm
rename to init.d/sfa-cm

diff --git a/setup.py b/setup.py
index 47a1314..0222695 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@ data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
                             ]),
               ('/etc/sfatables/matches/', glob('sfatables/matches/*.xml')),
               ('/etc/sfatables/targets/', glob('sfatables/targets/*.xml')),
-              ('/etc/init.d/', [ "sfa/init.d/%s"%x for x in initscripts ])]
+              ('/etc/init.d/', [ "init.d/%s"%x for x in initscripts ])]
 
 # add sfatables processors as data_files
 processor_files = [f for f in glob('sfatables/processors/*') if os.path.isfile(f)]

diff --git a/sfa.spec b/sfa.spec
index 0ec3279..9fd9cc9 100644 (file)
--- a/sfa.spec
+++ b/sfa.spec
@@ -14,6 +14,8 @@ License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+# xxx TODO : package cron.d/
+
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}