[shinken] update version 2.0.3
david hannequin
hvad at fedoraproject.org
Thu Jul 3 19:46:32 UTC 2014
commit 0e0ef939eab756f48eff3a553832771093916032
Author: hvad <david.hannequin at gmail.com>
Date: Sat Jun 14 07:50:30 2014 +0200
update version 2.0.3
.gitignore | 13 ++
shinken.spec | 382 +++++++++++++++++++++++++++++-----------------------------
sources | 7 +-
3 files changed, 212 insertions(+), 190 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 47eb29d..2028bba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,16 @@
/shinken-1.4.1.tar.gz
/shinken-1.4.2.tar.gz
/1.4.2.tar.gz
+/2.0.3.tar.gz
+/shinken-arbiter.init
+/shinken-broker.init
+/shinken-poller.init
+/shinken-reactionner.init
+/shinken-receiver.init
+/shinken-scheduler.init
+/shinken-arbiter.service
+/shinken-broker.service
+/shinken-poller.service
+/shinken-reactionner.service
+/shinken-receiver.service
+/shinken-scheduler.service
diff --git a/shinken.spec b/shinken.spec
index 857f8ee..0fbc87e 100644
--- a/shinken.spec
+++ b/shinken.spec
@@ -1,26 +1,29 @@
-%global with_systemd 0%{?fedora} >= 17
+%global with_systemd 0%{?fedora} >= 17 || 0%{?rhel} >= 7
%global shinken_user nagios
%global shinken_group nagios
Summary: Python Monitoring tool
Name: shinken
-Version: 1.4.2
-Release: 3%{?dist}
+Version: 2.0.3
+Release: 2%{?dist}
URL: http://www.%{name}-monitoring.org
Source0: https://github.com/naparuba/%{name}/archive/%{version}.tar.gz
-Source1: %{name}-commands.cfg
-Source2: %{name}-admin.8%{name}
-Source3: %{name}-arbiter.8%{name}
-Source4: %{name}-broker.8%{name}
-Source5: %{name}-discovery.8%{name}
-Source6: %{name}-poller.8%{name}
-Source7: %{name}-reactionner.8%{name}
-Source8: %{name}-receiver.8%{name}
-Source9: %{name}-scheduler.8%{name}
+Source1: %{name}-arbiter.service
+Source2: %{name}-broker.service
+Source3: %{name}-reactionner.service
+Source4: %{name}-scheduler.service
+Source5: %{name}-receiver.service
+Source6: %{name}-poller.service
+Source7: %{name}-arbiter.init
+Source8: %{name}-broker.init
+Source9: %{name}-reactionner.init
+Source10: %{name}-scheduler.init
+Source11: %{name}-receiver.init
+Source12: %{name}-poller.init
License: AGPLv3+
-Requires: python
-Requires: python-pyro
Requires: python-simplejson
+Requires: python-pycurl
+Requires: python-cherrypy
%if %{with_systemd}
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -31,8 +34,6 @@ Requires(preun): chkconfig
# This is for /sbin/service
Requires(preun): initscripts
%endif
-Requires: nmap
-Requires: sudo
BuildRequires: python-devel
BuildRequires: python-setuptools
%if %{with_systemd}
@@ -82,7 +83,6 @@ Shinken poller daemon
%package broker
Summary: Shinken Broker
Requires: %{name} = %{version}-%{release}
-Requires: mysql-connector-python
Requires: python-redis
Requires: python-memcached
@@ -98,7 +98,8 @@ Shinken receiver daemon
%prep
-%setup -q
+%setup -q -n %{name}-%{version}
+
# clean git files/
find . -name '.gitignore' -exec rm -f {} \;
@@ -107,59 +108,66 @@ find . -name '.gitignore' -exec rm -f {} \;
sed -i -e 's!./$SCRIPT!python ./$SCRIPT!' test/quick_tests.sh
sed -i -e 's!include var/void_for_git!exclude var/void_for_git!' MANIFEST.in
-rm -rf shinken/webui/plugins/eue shinken/webui/plugins/mobile/htdocs/css/log.css shinken/webui/plugins/mobile/htdocs/css/system.css shinken/webui/plugins/mobile/htdocs/css/details.css etc/packs/os/collectd/discovery.cfg etc/packs/databases/mongodb/macros.cfg shinken/webui/plugins_skonf bin/shinken-skonf etc/packs/trending shinken/modules/glances_ui/plugins/cv_memory/htdocs/js/memory.js
-
%build
-%{__python} setup.py build
+%{__python} setuppackage.py build
%install
+
find %{buildroot} -size 0 -delete
-%{__python} setup.py install -O1 --skip-build --root %{buildroot} --install-scripts=/usr/sbin/ --owner %{shinken_user} --group %{shinken_group}
+%{__python} setuppackage.py install -O1 --skip-build --root %{buildroot} --install-scripts=/usr/sbin/ --owner %{shinken_user} --group %{shinken_group}
install -d -m0755 %{buildroot}%{_sbindir}
-install -p -m0755 bin/shinken-{arbiter,admin,discovery,broker,poller,reactionner,receiver,scheduler} %{buildroot}%{_sbindir}
+install -p -m0755 bin/shinken-{arbiter,broker,poller,reactionner,receiver,scheduler} %{buildroot}%{_sbindir}
install -d -m0755 %{buildroot}%{python_sitelib}/%{name}
install -p %{name}/*.py %{buildroot}%{python_sitelib}/%{name}
-cp -rf %{name}/{clients,core,misc,modules,objects,plugins,webui} %{buildroot}%{python_sitelib}/%{name}
install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/
rm -rf %{buildroot}%{_sysconfdir}/%{name}/*
-install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/objects
-install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/objects/{contacts,discovery,hosts,services}
-
-install -p -m0644 for_fedora/etc/objects/contacts/nagiosadmin.cfg %{buildroot}%{_sysconfdir}/%{name}/objects/contacts/nagiosadmin.cfg
-install -p -m0644 for_fedora/etc/objects/hosts/localhost.cfg %{buildroot}%{_sysconfdir}/%{name}/objects/hosts/localhost.cfg
-install -p -m0644 for_fedora/etc/objects/services/linux_disks.cfg %{buildroot}%{_sysconfdir}/%{name}/objects/services/linux_disks.cfg
-install -p -m0644 for_fedora/etc/htpasswd.users %{buildroot}%{_sysconfdir}/%{name}/htpasswd.users
-install -p -m0644 for_fedora/etc/%{name}-specific.cfg %{buildroot}%{_sysconfdir}/%{name}/
-install -p -m0644 for_fedora/etc/discovery*.cfg %{buildroot}%{_sysconfdir}/%{name}/
-install -p -m0644 for_fedora/etc/{contactgroups,nagios,timeperiods,%{name}-specific,escalations,servicegroups,resource,templates}.cfg %{buildroot}%{_sysconfdir}/%{name}/
-install -p -m0644 for_fedora/etc/{brokerd,pollerd,reactionnerd,receiverd,schedulerd}.ini %{buildroot}%{_sysconfdir}/%{name}/
-
-cp %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/commands.cfg
+install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/daemons
+install -p -m0644 etc/daemons/{brokerd,pollerd,reactionnerd,receiverd,schedulerd}.ini %{buildroot}%{_sysconfdir}/%{name}/daemons/
+
+install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/{arbiters,brokers,pollers,schedulers,reactionners,receivers}
+install -p -m0644 etc/arbiters/arbiter-master.cfg %{buildroot}%{_sysconfdir}/%{name}/arbiters/
+install -p -m0644 etc/brokers/broker-master.cfg %{buildroot}%{_sysconfdir}/%{name}/brokers/
+install -p -m0644 etc/pollers/poller-master.cfg %{buildroot}%{_sysconfdir}/%{name}/pollers/
+install -p -m0644 etc/reactionners/reactionner-master.cfg %{buildroot}%{_sysconfdir}/%{name}/reactionners/
+install -p -m0644 etc/receivers/receiver-master.cfg %{buildroot}%{_sysconfdir}/%{name}/receivers/
+install -p -m0644 etc/schedulers/scheduler-master.cfg %{buildroot}%{_sysconfdir}/%{name}/schedulers/
+
+install -p -m0644 etc/%{name}.cfg %{buildroot}%{_sysconfdir}/%{name}/%{name}.cfg
+install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/{commands,timeperiods,escalations,dependencies,templates,notificationways,servicegroups,hostgroups,contactgroups,hosts,services,contacts,packs,modules,realms,resource.d}
+
+install -p -m0644 etc/realms/all.cfg %{buildroot}%{_sysconfdir}/%{name}/realms/
+install -p -m0644 for_fedora/etc/templates.cfg %{buildroot}%{_sysconfdir}/%{name}/templates/
+install -p -m0644 for_fedora/etc/timeperiods.cfg %{buildroot}%{_sysconfdir}/%{name}/timeperiods/
+install -p -m0644 for_fedora/etc/contactgroups.cfg %{buildroot}%{_sysconfdir}/%{name}/contactgroups/
+install -p -m0644 for_fedora/etc/commands.cfg %{buildroot}%{_sysconfdir}/%{name}/commands/
+install -p -m0644 for_fedora/etc/objects/contacts/nagiosadmin.cfg %{buildroot}%{_sysconfdir}/%{name}/contacts/nagiosadmin.cfg
+install -p -m0644 for_fedora/etc/objects/hosts/localhost.cfg %{buildroot}%{_sysconfdir}/%{name}/hosts/localhost.cfg
+install -p -m0644 for_fedora/etc/objects/services/linux_disks.cfg %{buildroot}%{_sysconfdir}/%{name}/services/linux_disks.cfg
+install -p -m0644 for_fedora/etc/contactgroups.cfg %{buildroot}%{_sysconfdir}/%{name}/contactgroups/contactgroups.cfg
%if %{with_systemd}
install -d -m0755 %{buildroot}%{_unitdir}
- install -p -m0644 for_fedora/systemd/%{name}-arbiter.service %{buildroot}%{_unitdir}/%{name}-arbiter.service
- install -p -m0644 for_fedora/systemd/%{name}-broker.service %{buildroot}%{_unitdir}/%{name}-broker.service
- install -p -m0644 for_fedora/systemd/%{name}-reactionner.service %{buildroot}%{_unitdir}/%{name}-reactionner.service
- install -p -m0644 for_fedora/systemd/%{name}-scheduler.service %{buildroot}%{_unitdir}/%{name}-scheduler.service
- install -p -m0644 for_fedora/systemd/%{name}-receiver.service %{buildroot}%{_unitdir}/%{name}-receiver.service
- install -p -m0644 for_fedora/systemd/%{name}-poller.service %{buildroot}%{_unitdir}/%{name}-poller.service
+ install -p -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}-arbiter.service
+ install -p -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}-broker.service
+ install -p -m0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}-reactionner.service
+ install -p -m0644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}-scheduler.service
+ install -p -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}-receiver.service
+ install -p -m0644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}-poller.service
%else
install -d -m0755 %{buildroot}%{_initrddir}
- install -p -m0644 for_fedora/init.d/%{name}-arbiter %{buildroot}%{_initrddir}/%{name}-arbiter
- install -p -m0644 for_fedora/init.d/%{name}-scheduler %{buildroot}%{_initrddir}/%{name}-scheduler
- install -p -m0644 for_fedora/init.d/%{name}-poller %{buildroot}%{_initrddir}/%{name}-poller
- install -p -m0644 for_fedora/init.d/%{name}-broker %{buildroot}%{_initrddir}/%{name}-broker
- install -p -m0644 for_fedora/init.d/%{name}-reactionner %{buildroot}%{_initrddir}/%{name}-reactionner
- install -p -m0644 for_fedora/init.d/%{name}-receiver %{buildroot}%{_initrddir}/%{name}-receiver
- sed -i -e 's!status $prog!status -p $pidfile $prog!' %{buildroot}%{_initrddir}/%{name}*
+ install -p -m0644 %{SOURCE7} %{buildroot}%{_initrddir}/%{name}-arbiter
+ install -p -m0644 %{SOURCE8} %{buildroot}%{_initrddir}/%{name}-scheduler
+ install -p -m0644 %{SOURCE9} %{buildroot}%{_initrddir}/%{name}-poller
+ install -p -m0644 %{SOURCE10} %{buildroot}%{_initrddir}/%{name}-broker
+ install -p -m0644 %{SOURCE11} %{buildroot}%{_initrddir}/%{name}-reactionner
+ install -p -m0644 %{SOURCE12} %{buildroot}%{_initrddir}/%{name}-receiver
%endif
install -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d
@@ -175,121 +183,97 @@ install -d -m0755 %{buildroot}%{_localstatedir}/lib/%{name}
mkdir -p %{buildroot}%{_localstatedir}/run/
install -d -m0755 %{buildroot}%{_localstatedir}/run/%{name}
-install -d -m0755 %{buildroot}%{_mandir}/man3
-install -p -m0644 %{SOURCE2} %{buildroot}%{_mandir}/man3
-install -p -m0644 %{SOURCE3} %{buildroot}%{_mandir}/man3
-install -p -m0644 %{SOURCE4} %{buildroot}%{_mandir}/man3
-install -p -m0644 %{SOURCE5} %{buildroot}%{_mandir}/man3
-install -p -m0644 %{SOURCE6} %{buildroot}%{_mandir}/man3
-install -p -m0644 %{SOURCE7} %{buildroot}%{_mandir}/man3
-install -p -m0644 %{SOURCE8} %{buildroot}%{_mandir}/man3
-install -p -m0644 %{SOURCE9} %{buildroot}%{_mandir}/man3
-
-install -d -m0755 %{buildroot}%{_usr}/lib/%{name}/plugins/discovery
-install -m0755 libexec/*.py %{buildroot}%{_usr}/lib/%{name}/plugins
-install -m0644 libexec/*.ini %{buildroot}%{_usr}/lib/%{name}/plugins
-install -m0755 libexec/discovery/*.py %{buildroot}%{_usr}/lib/%{name}/plugins/discovery
-
-
-for lib in %{buildroot}%{python_sitearch}/%{name}/*.py; do
- sed '/\/usr\/bin\/env/d' $lib > $lib.new &&
- touch -r $lib $lib.new &&
- mv $lib.new $lib
-done
-
-for Files in %{buildroot}%{python_sitelib}/%{name}/__init__.py %{buildroot}%{python_sitelib}/%{name}/core/__init__.py %{buildroot}%{python_sitelib}/%{name}/daemons/*.py %{buildroot}%{python_sitelib}/%{name}/modules/{openldap_ui.py,nrpe_poller.py,livestatus_broker/livestatus_query_cache.py} ; do
- %{__sed} -i.orig -e 1d ${Files}
- touch -r ${Files}.orig ${Files}
- %{__rm} ${Files}.orig
-done
-
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/font-awesome-ie7.min.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/font-awesome.min.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/shinken-greeting.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/system/views/log.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/login/htdocs/css/login.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/jquery.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/application.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/eltdetail/htdocs/js/domtab.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/views/dashboard.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/problems/views/widget_problems.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/htdocs/css/fullscreen.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/README.md
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/bootstrap.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/htdocs/css/shinken-currently.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/impacts/views/impacts.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/htdocs/js/jquery.jclock.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/widget.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/pagination_element.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/custom/layout.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/htdocs/css/fullscreen-widget.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/bootstrap.min.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/font/fontawesome-webfont.svg
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/header_element.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/htdocs/css/dashboard.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/bootstrap-scrollspy.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins_hostd/login/htdocs/js/jQuery.dPassword.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/htdocs/css/widget.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins_hostd/login/htdocs/css/login.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/jquery.meow.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/problems/views/widget_last_problems.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/eltdetail/htdocs/css/eltdetail.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/system/htdocs/css/system.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/views/fullscreen.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/elements/jquery.meow.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/bootstrap-carousel.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/footer_element.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/system/htdocs/css/log.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/problems/views/problems.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/bootstrap.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/bootstrap.min.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/google-code-prettify/prettify.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/impacts/htdocs/css/impacts.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/views/currently.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/login/views/login.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/bootstrap-typeahead.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/system/views/system.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/google-code-prettify/prettify.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/eltdetail/views/eltdetail.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/docs.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/layout.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/font-awesome.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/font-awesome-ie7.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/shinkenui.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/system/views/system_widget.tpl
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/bootstrap-alert.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/custom/badger.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/navigation_element.tpl
-
-
-sed -i -e 's!/usr/local/shinken/libexec!%{_libdir}/nagios/plugins!' %{buildroot}%{_sysconfdir}/%{name}/resource.cfg
-sed -i -e 's!/usr/lib/nagios/plugins!%{_libdir}/nagios/plugins!' %{buildroot}%{_sysconfdir}/%{name}/resource.cfg
-sed -i -e 's!/usr/local/shinken/var/arbiterd.pid!/var/run/shinken/arbiterd.pid!' %{buildroot}%{_sysconfdir}/%{name}/nagios.cfg
-sed -i -e 's!command_file=/usr/local/shinken/var/rw/nagios.cmd!command_file=/var/log/shinken/nagios.cmd!' %{buildroot}%{_sysconfdir}/%{name}/nagios.cfg
-sed -i -e 's!cfg_file=hostgroups.cfg!!' %{buildroot}%{_sysconfdir}/%{name}/nagios.cfg
-sed -i -e 's!,Windows_administrator!!' %{buildroot}%{_sysconfdir}/%{name}/contactgroups.cfg
-sed -i -e 's!/usr/local/shinken/src/!/usr/sbin/!' FROM_NAGIOS_TO_SHINKEN
-sed -i -e 's!/usr/local/nagios/etc/!/etc/shinken/!' FROM_NAGIOS_TO_SHINKEN
-sed -i -e 's!/usr/local/shinken/src/etc/!/etc/shinken/!' FROM_NAGIOS_TO_SHINKEN
-sed -i -e 's!(you can also be even more lazy and call the bin/launch_all.sh script).!!' FROM_NAGIOS_TO_SHINKEN
-
+install -d -m0755 %{buildroot}%{_mandir}/man8
+install -p -m0644 for_fedora/man/* %{buildroot}%{_mandir}/man8
+
+
+
+sed -i 's|#!/usr/bin/env python||g' %{buildroot}%{_localstatedir}/lib/%{name}/cli/desc/cli.py
+sed -i 's|#!/usr/bin/env python||g' %{buildroot}%{_localstatedir}/lib/%{name}/cli/shinkenio/cli.py
+sed -i 's|#!/usr/bin/env python||g' %{buildroot}%{_localstatedir}/lib/%{name}/cli/doc/cli.py
+
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{_localstatedir}/lib/%{name}/modules/{dummy_arbiter,dummy_broker,dummy_scheduler,dummy_broker_external}/module.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{_localstatedir}/lib/%{name}/cli/shinkenio/cli.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{_localstatedir}/lib/%{name}/modules/dummy_poller/module.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{_localstatedir}/lib/%{name}/modules/__init__.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{_localstatedir}/lib/%{name}/cli/doc/cli.py
+
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/hostextinfo.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/servicegroup.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/serviceescalation.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/hostescalation.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/daemons/reactionnerdaemon.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/clients/livestatus.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/discovery/__init__.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/hostdependency.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/schedulingitem.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/daemons/arbiterdaemon.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/discovery/discoverymanager.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/misc/sorter.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/daemons/brokerdaemon.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/misc/perfdata.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/timeperiod.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/itemgroup.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/daemons/receiverdaemon.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/misc/datamanager.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/hostgroup.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/serviceextinfo.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/__init__.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/resultmodulation.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/misc/__init__.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/contact.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/command.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/config.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/contactgroup.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/pack.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/webui/__init__.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/host.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/businessimpactmodulation.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/escalation.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/clients/LSB.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/realm.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/discoveryrun.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/daemons/schedulerdaemon.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/misc/regenerator.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/clients/__init__.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/discoveryrule.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/service.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/macromodulation.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/checkmodulation.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/matchingitem.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/servicedependency.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/daemons/pollerdaemon.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/daemons/__init__.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/module.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/misc/filter.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/trigger.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/notificationway.py
+sed -i 's|#!/usr/bin/python||g' %{buildroot}%{python_sitelib}/%{name}/objects/item.py
+
+
+sed -i 's|shinken_user=shinken|shinken_user=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/%{name}.cfg
+sed -i 's|shinken_group=shinken|shinken_group=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/%{name}.cfg
+
+
+sed -i 's|#user=shinken|user=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/daemons/{brokerd,reactionnerd,receiverd,schedulerd}.ini
+sed -i 's|#group=shinken|group=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/daemons/{brokerd,reactionnerd,receiverd,schedulerd}.ini
+sed -i 's|# user=shinken|user=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/daemons/pollerd.ini
+sed -i 's|# group=shinken|group=nagios|g' %{buildroot}%{_sysconfdir}/%{name}/daemons/pollerd.ini
+
+rm -rf %{buildroot}%{_localstatedir}/lib/%{name}/inventory/__void_for_git
rm -rf %{buildroot}%{_localstatedir}/{log,run,lib}/%{name}/void_for_git
-rm %{buildroot}%{_sysconfdir}/default/shinken
-rm -rf %{buildroot}%{_sysconfdir}/init.d/shinken*
-rm -rf %{buildroot}%{_usr}/lib/%{name}/plugins/*.{pyc,pyo}
-rm -rf %{buildroot}%{_sbindir}/shinken-{arbiter,discovery,broker,poller,reactionner,receiver,scheduler}.py
+rm -rf %{buildroot}%{_sysconfdir}/init.d/%{name}*
+rm -rf %{buildroot}%{_sbindir}/%{name}-{arbiter,discovery,broker,poller,reactionner,receiver,scheduler}.py
+rm -rf %{buildroot}%{_sysconfdir}/default/%{name}
-find %{buildroot}%{python_sitelib}/%{name} -type f | xargs sed -i 's|#!/usr/bin/python||g'
+rm -rf %{buildroot}%{_localstatedir}/lib/%{name}/doc
+rm -rf %{buildroot}%{_localstatedir}/lib/%{name}/share
+rm -rf %{buildroot}%{_localstatedir}/lib/%{name}/libexec
-chmod +x %{buildroot}%{python_sitelib}/%{name}/{acknowledge.py,trigger_functions.py,__init__.py,action.py,db_sqlite.py,dependencynode.py,satellite.py,bin.py,notification.py,sorteddict.py,skonfuiworker.py,arbiterlink.py,eventhandler.py,autoslots.py,modulesmanager.py,borg.py,memoized.py,singleton.py}
+rm -rf %{buildroot}%{python_sitelib}/modules
-sed -i 's|#!/usr/bin/env python||g' %{buildroot}%{python_sitelib}/%{name}/webui/plugins/mobile/mobile.py
-sed -i 's|#!/usr/bin/env python||g' %{buildroot}%{python_sitelib}/%{name}/modules/webui_broker/helper.py
-sed -i 's|#!/usr/bin/env python||g' %{buildroot}%{python_sitelib}/%{name}/webui/plugins/mobile/mobile.py
-sed -i 's|#!/usr/bin/env python||g' %{buildroot}%{python_sitelib}/%{name}/modules/webui_broker/helper.py
-rm -rf %{buildroot}%{python_sitelib}/%{name}/webui/plugins/user/{__init__.pyo,__init__.pyc}
-rm -rf %{buildroot}%{python_sitelib}/%{name}/webui/plugins/eue
-chmod -x %{buildroot}%{python_sitelib}/%{name}/{acknowledge.py,trigger_functions.py,__init__.py}
+find %{buildroot} -maxdepth 5 -name '*.pyc' -exec rm -f {} \;
+find %{buildroot} -maxdepth 5 -name '*.pyo' -exec rm -f {} \;
%clean
@@ -473,7 +457,31 @@ fi
%attr(0755,root,root) %{_initrddir}/%{name}-arbiter
%endif
%{_sbindir}/%{name}-arbiter*
-%{_mandir}/man3/%{name}-arbiter*
+%config(noreplace) %{_sysconfdir}/%{name}/%{name}.cfg
+%config(noreplace) %{_sysconfdir}/%{name}/arbiters/arbiter-master.cfg
+%config(noreplace) %{_sysconfdir}/%{name}/brokers/broker-master.cfg
+%config(noreplace) %{_sysconfdir}/%{name}/pollers/poller-master.cfg
+%config(noreplace) %{_sysconfdir}/%{name}/reactionners/reactionner-master.cfg
+%config(noreplace) %{_sysconfdir}/%{name}/receivers/receiver-master.cfg
+%config(noreplace) %{_sysconfdir}/%{name}/schedulers/scheduler-master.cfg
+%config(noreplace) %{_sysconfdir}/%{name}/commands/commands.cfg
+%config(noreplace) %{_sysconfdir}/%{name}/timeperiods/timeperiods.cfg
+%config %{_sysconfdir}/%{name}/escalations
+%config %{_sysconfdir}/%{name}/dependencies
+%config(noreplace) %{_sysconfdir}/%{name}/templates/templates.cfg
+%config %{_sysconfdir}/%{name}/notificationways
+%config %{_sysconfdir}/%{name}/servicegroups
+%config %{_sysconfdir}/%{name}/hostgroups
+%config(noreplace) %{_sysconfdir}/%{name}/contactgroups/contactgroups.cfg
+%config(noreplace) %{_sysconfdir}/%{name}/hosts/localhost.cfg
+%config(noreplace) %{_sysconfdir}/%{name}/services/linux_disks.cfg
+%config(noreplace) %{_sysconfdir}/%{name}/contacts/nagiosadmin.cfg
+%config %{_sysconfdir}/%{name}/packs
+%config %{_sysconfdir}/%{name}/modules
+%config(noreplace) %{_sysconfdir}/%{name}/realms/all.cfg
+%config %{_sysconfdir}/%{name}/resource.d
+
+%{_mandir}/man8/%{name}-arbiter*
%files reactionner
%if %{with_systemd}
@@ -482,7 +490,8 @@ fi
%attr(0755,root,root) %{_initrddir}/%{name}-reactionner
%endif
%{_sbindir}/%{name}-reactionner*
-%{_mandir}/man3/%{name}-reactionner*
+%{_mandir}/man8/%{name}-reactionner*
+%config(noreplace) %{_sysconfdir}/%{name}/daemons/reactionnerd.ini
%files scheduler
%if %{with_systemd}
@@ -491,7 +500,8 @@ fi
%attr(0755,root,root) %{_initrddir}/%{name}-scheduler
%endif
%{_sbindir}/%{name}-scheduler*
-%{_mandir}/man3/%{name}-scheduler*
+%{_mandir}/man8/%{name}-scheduler*
+%config(noreplace) %{_sysconfdir}/%{name}/daemons/schedulerd.ini
%files poller
%if %{with_systemd}
@@ -500,7 +510,8 @@ fi
%attr(0755,root,root) %{_initrddir}/%{name}-poller
%endif
%{_sbindir}/%{name}-poller*
-%{_mandir}/man3/%{name}-poller*
+%{_mandir}/man8/%{name}-poller*
+%config(noreplace) %{_sysconfdir}/%{name}/daemons/pollerd.ini
%files broker
%if %{with_systemd}
@@ -509,7 +520,8 @@ fi
%attr(0755,root,root) %{_initrddir}/%{name}-broker
%endif
%{_sbindir}/%{name}-broker*
-%{_mandir}/man3/%{name}-broker*
+%{_mandir}/man8/%{name}-broker*
+%config(noreplace) %{_sysconfdir}/%{name}/daemons/brokerd.ini
%files receiver
%if %{with_systemd}
@@ -518,46 +530,38 @@ fi
%attr(0755,root,root) %{_initrddir}/%{name}-receiver
%endif
%{_sbindir}/%{name}-receiver*
-%{_mandir}/man3/%{name}-receiver*
+%{_mandir}/man8/%{name}-receiver*
+%config(noreplace) %{_sysconfdir}/%{name}/daemons/receiverd.ini
%files
%{python_sitelib}/%{name}
%if %{with_systemd}
-%{python_sitelib}/Shinken-1.4.1-py2.7.egg-info
+%{python_sitelib}/Shinken*.egg-info
%else
-%{python_sitelib}/Shinken-1.4.1-py2.6.egg-info
+%{python_sitelib}/Shinken*.egg-info
%endif
-%{_sbindir}/%{name}-receiver*
+%{_sbindir}/%{name}
%{_sbindir}/%{name}-discovery
-%{_sbindir}/%{name}-admin
-%{_sbindir}/%{name}-hostd
-%{_sbindir}/%{name}-packs
-%{_usr}/lib/%{name}/plugins
-%doc etc/packs COPYING THANKS
-%{_mandir}/man3/%{name}-*
+%doc COPYING THANKS
+%{_mandir}/man8/%{name}-*
%config(noreplace) %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
%attr(-,%{shinken_user} ,%{shinken_group}) %dir %{_localstatedir}/log/%{name}
-%attr(-,%{shinken_user} ,%{shinken_group}) %dir %{_localstatedir}/lib/%{name}
+%attr(-,%{shinken_user} ,%{shinken_group}) %{_localstatedir}/lib/%{name}
%attr(-,%{shinken_user} ,%{shinken_group}) %dir %{_localstatedir}/run/%{name}
%changelog
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Mar 09 2014 David Hannequin <david.hannequin at gmail.com> - 1.4.2-2
-- Update sources,
-- Add man pages.
+* Thu Jul 3 2014 David Hannequin <david.hannequin at gmail.com> - 2.0.3-2
+- Delete python mysql require.
-* Sun Mar 09 2014 David Hannequin <david.hannequin at gmail.com> - 1.4.2-1
-- Update from upstream,
-- Fix source url.
+* Fri Jun 13 2014 David Hannequin <david.hannequin at gmail.com> - 2.0.3-1
+- Update from upstream.
-* Sat Mar 01 2014 David Hannequin <david.hannequin at gmail.com> - 1.4.1-2
-- Fix bug #1070887 - thank Ignacio Torres Masdeu
+* Fri Apr 25 2014 David Hannequin <david.hannequin at gmail.com> - 2.0.2-1
+- Update from upstream.
-* Thu Jan 02 2014 David Hannequin <david.hannequin at gmail.com> - 1.4.1-1
+* Thu Apr 17 2014 David Hannequin <david.hannequin at gmail.com> - 2.0-1
- Update from upstream.
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-2
diff --git a/sources b/sources
index cfa35df..0b68b15 100644
--- a/sources
+++ b/sources
@@ -1 +1,6 @@
-d7d08a85f9a2bdd531a52ca2e5c8ff38 1.4.2.tar.gz
+7a27dee87e1aa7d4c5091a8b2db130a8 shinken-arbiter.service
+d971d100954b1b5c0ff6cd4171bf6650 shinken-broker.service
+827e8d61d2443bf66663ae5aa14111b5 shinken-poller.service
+6583451c1e0c439375674e1dbe40f6d4 shinken-reactionner.service
+ce14b4a17e687e0b10120ca9b67f93a5 shinken-receiver.service
+34c8d400485672493f16d77504d29e0f shinken-scheduler.service
More information about the scm-commits
mailing list