Merge branch 'master' of https://github.com/naparuba/shinken

shinken-solutions · Aug 14, 2015 · ec17d07 · ec17d07
2 parents 24de3c8 + 9823e83
commit ec17d07
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/for_fedora/systemd/shinken-arbiter.service b/for_fedora/systemd/shinken-arbiter.service
@@ -5,6 +5,8 @@ After=syslog.target
 [Service]
 Type=forking
 ExecStart=/usr/sbin/shinken-arbiter -d -r -c /etc/shinken/shinken.cfg
+KillMode=process
+TimeoutStopSec=3
 
 [Install]
 WantedBy=multi-user.target
diff --git a/for_fedora/systemd/shinken-broker.service b/for_fedora/systemd/shinken-broker.service
@@ -5,6 +5,8 @@ After=syslog.target
 [Service]
 Type=forking
 ExecStart=/usr/sbin/shinken-broker -d -c /etc/shinken/daemons/brokerd.ini
+KillMode=process
+TimeoutStopSec=3
 
 [Install]
 WantedBy=multi-user.target
diff --git a/for_fedora/systemd/shinken-poller.service b/for_fedora/systemd/shinken-poller.service
@@ -5,6 +5,8 @@ After=syslog.target
 [Service]
 Type=forking
 ExecStart=/usr/sbin/shinken-poller -d -c /etc/shinken/daemons/pollerd.ini
+KillMode=process
+TimeoutStopSec=3
 
 [Install]
 WantedBy=multi-user.target
diff --git a/for_fedora/systemd/shinken-reactionner.service b/for_fedora/systemd/shinken-reactionner.service
@@ -5,6 +5,8 @@ After=syslog.target
 [Service]
 Type=forking
 ExecStart=/usr/sbin/shinken-reactionner -d -c /etc/shinken/daemons/reactionnerd.ini
+KillMode=process
+TimeoutStopSec=3
 
 [Install]
 WantedBy=multi-user.target
diff --git a/for_fedora/systemd/shinken-receiver.service b/for_fedora/systemd/shinken-receiver.service
@@ -5,6 +5,8 @@ After=syslog.target
 [Service]
 Type=forking
 ExecStart=/usr/sbin/shinken-receiver -d -c /etc/shinken/daemons/receiverd.ini
+KillMode=process
+TimeoutStopSec=3
 
 [Install]
 WantedBy=multi-user.target
diff --git a/for_fedora/systemd/shinken-scheduler.service b/for_fedora/systemd/shinken-scheduler.service
@@ -5,6 +5,8 @@ After=syslog.target
 [Service]
 Type=forking
 ExecStart=/usr/sbin/shinken-scheduler -d -c /etc/shinken/daemons/schedulerd.ini
+KillMode=process
+TimeoutStopSec=3
 
 [Install]
 WantedBy=multi-user.target