X-Git-Url: http://git.onelab.eu/?p=myops.git;a=blobdiff_plain;f=myops.spec;h=c25cb4c0b8050d2a0ee19bba8340ef09c32ad09e;hp=28b623a3fad65bc9dae546d4e631d66835a72579;hb=85070b3d456667f238051af1a2f1f2a0c12300ab;hpb=607f0e13927eb18075c375fa9ba5527da4fcbb44

diff --git a/myops.spec b/myops.spec
index 28b623a..c25cb4c 100644
--- a/myops.spec
+++ b/myops.spec
@@ -33,18 +33,18 @@ Group: Applications/System
 MyOps is a collection of support services and scripts for operating a MyPLC
 deployment.
 
-%package client
+%package puppet-client
 Summary: MyOps for client
 Group: Applications/System
 
 Requires: puppet
 Requires: coreutils
 
-%description client
+%description puppet-client
 Client side configuration.
 
 ######################################## Server
-%package server
+%package puppet-server
 Summary: MyOps the server side
 Group: Applications/System
 
@@ -52,9 +52,45 @@ Requires: puppet-server
 Requires: puppet
 Requires: coreutils
 
-%description server
+%description puppet-server
 Server side services
 
+
+######################################## get/query/view
+%package getqueryview
+Summary: MyOps components for collection, view and query.
+Group: Applications/System
+
+# view
+Requires: bzr
+Requires: nc
+Requires: coreutils
+Requires: twisted
+Requires: pycairo
+Requires: mod_python
+Requires: python-ldap
+Requires: python-memcached
+Requires: mod_wsgi
+Requires: Django 
+Requires: mlocate
+Requires: sysstat
+# NOTE: some default fonts incase no others are present.
+Requires: bitstream-vera-fonts-common
+Requires: bitstream-vera-sans-fonts 
+Requires: bitstream-vera-sans-mono-fonts
+
+# query
+Requires: couchdb
+Requires: python-couchdb
+Requires: python-setuptools-devel
+
+#collect
+Requires: php
+
+
+%description getqueryview
+The combination of collection, query and view servers.
+
 %prep
 %setup -q
 
@@ -62,29 +98,62 @@ Server side services
 rm -rf $RPM_BUILD_ROOT
 
 
-# setup directories
+#################### SERVER
 install -d $RPM_BUILD_ROOT/usr/share/%{name}
+install -d $RPM_BUILD_ROOT/usr/bin
 install -d $RPM_BUILD_ROOT/etc/puppet/manifests
 install -d $RPM_BUILD_ROOT/etc/puppet/bin
-install -d $RPM_BUILD_ROOT/etc/cron.hourly
 install -d $RPM_BUILD_ROOT/var/lib/puppet
+install -d $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly/
+install -d $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/
+
+install -d $RPM_BUILD_ROOT/etc/planetlab/db-config.d/
+install -d $RPM_BUILD_ROOT/var/www/html/PlanetLabConf/
+install -d $RPM_BUILD_ROOT/var/www/html/view
 
-# server
 rsync -a ./puppet  $RPM_BUILD_ROOT/usr/share/myops/
+rsync -a ./web $RPM_BUILD_ROOT/usr/share/myops/
+
+# Generate an autosign list from plc node hostnames
 install -D -m 755 puppet/cron.d/autosign.plcsh $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly/
 install -D -m 755 puppet/server/bin/node_classifier $RPM_BUILD_ROOT/%{_sysconfdir}/puppet/bin/
 install -D -m 644 puppet/server/manifests/site.pp $RPM_BUILD_ROOT/%{_sysconfdir}/puppet/manifests/
 install -D -m 644 puppet/server/puppetmaster.conf $RPM_BUILD_ROOT/%{_sysconfdir}/puppet/
+install -D -m 644 puppet/client/puppet.conf $RPM_BUILD_ROOT/%{_sysconfdir}/puppet
 
-# client
-install -D -m 644 puppet/client/hardcoded.conf $RPM_BUILD_ROOT/%{_sysconfdir}/puppet
 rsync -ar ./puppet/server/modules $RPM_BUILD_ROOT/%{_sysconfdir}/puppet/
 
+ls web/collect
+ls $RPM_BUILD_ROOT
+
+install -D -m 644 web/db-config.d/030-conf_files_myops $RPM_BUILD_ROOT/etc/planetlab/db-config.d
+install -D -m 755 web/collect/sar2graphite.py $RPM_BUILD_ROOT/usr/bin/
+install -D -m 755 web/collect/sar2graphite.py $RPM_BUILD_ROOT/var/www/html/PlanetLabConf/
+install -D -m 644 web/collect/cron.d/sysstat.cron $RPM_BUILD_ROOT/var/www/html/PlanetLabConf/
+install -D -m 644 web/collect/cron.d/sysstat.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/
+install -D -m 755 web/collect/server/upload.php $RPM_BUILD_ROOT/var/www/html/
+install -D -m 755 web/collect/server/cron.hourly/load_all_couchdb.sh $RPM_BUILD_ROOT/%{_sysconfdir}/cron.hourly
+
+install -D -m 644 web/view/urllist.txt $RPM_BUILD_ROOT/var/www/html/view/
+install -D -m 644 web/view/index.php $RPM_BUILD_ROOT/var/www/html/view/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files server
+%files getqueryview
+%defattr(-,root,root)
+/usr/share/%{name}/web
+/%{_sysconfdir}/cron.d/sysstat.cron
+/var/www/html/PlanetLabConf/sysstat.cron
+/var/www/html/PlanetLabConf/sar2graphite.py*
+/usr/bin/sar2graphite.py
+/etc/planetlab/db-config.d
+/var/www/html/upload.php
+%{_sysconfdir}/cron.hourly
+/var/www/html/view/urllist.txt
+/var/www/html/view/index.php
+
+%files puppet-server
 %defattr(-,root,root)
 /%{_sysconfdir}/cron.hourly/autosign.plcsh
 /%{_sysconfdir}/puppet/bin/node_classifier
@@ -92,22 +161,20 @@ rm -rf $RPM_BUILD_ROOT
 /%{_sysconfdir}/puppet/puppetmaster.conf
 /%{_sysconfdir}/puppet/modules
 
-%files client
+%files puppet-client
 %defattr(-,root,root)
-/%{_sysconfdir}/puppet/hardcoded.conf
-/usr/share/%{name}
+/%{_sysconfdir}/puppet/puppet.conf
+/usr/share/%{name}/puppet
 
-%post server
-echo "Reminder: open ports 8139,8140,8141 in iptables"
+%post puppet-server
+echo "Reminder: open ports for puppet: 8139,8140,8141 in iptables"
 chkconfig --add puppetmaster
 chkconfig puppetmaster on
 
-%post client
+%post puppet-client
 chkconfig --add puppet
 chkconfig puppet on
 
-cat /etc/puppet/hardcoded.conf >> /etc/puppet/puppet.conf
-
 
 %changelog
 %define module_current_branch 1.0