[Pkg-nagios-changes] [pkg-nagios3] 12/18: Move /var/run/nagios3 creation to initscript

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch master
in repository pkg-nagios3.

commit de834dfc8ddc9a19c5cf8a528f09aa258aa3a50d
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Nov 14 08:54:06 2013 +0100

    Move /var/run/nagios3 creation to initscript
    
    Closes: #689901
---
 debian/nagios3-common.dirs         | 1 -
 debian/nagios3-common.nagios3.init | 4 ----
 debian/nagios3-common.postinst     | 1 -
 3 files changed, 6 deletions(-)

diff --git a/debian/nagios3-common.dirs b/debian/nagios3-common.dirs
index aea5fba..d208935 100644
--- a/debian/nagios3-common.dirs
+++ b/debian/nagios3-common.dirs
@@ -6,6 +6,5 @@ var/lib/nagios3/rw
 var/lib/nagios3/spool
 var/lib/nagios3/spool/checkresults
 var/log/nagios3/archives
-var/run/nagios3
 var/cache/nagios3
 usr/share/nagios3/debian
diff --git a/debian/nagios3-common.nagios3.init b/debian/nagios3-common.nagios3.init
index 2d1979c..3a1a03d 100644
--- a/debian/nagios3-common.nagios3.init
+++ b/debian/nagios3-common.nagios3.init
@@ -140,10 +140,6 @@ start () {
 	  exit 0
   fi
 
-  DIRECTORY=$(dirname $THEPIDFILE)
-  [ ! -d $DIRECTORY ] && mkdir -p $DIRECTORY
-  chown nagios:nagios $DIRECTORY
-
   if ! check_started; then
     if ! check_named_pipe; then
       log_action_msg "named pipe exists - removing"
diff --git a/debian/nagios3-common.postinst b/debian/nagios3-common.postinst
index 95e45bb..57900ca 100644
--- a/debian/nagios3-common.postinst
+++ b/debian/nagios3-common.postinst
@@ -40,7 +40,6 @@ case "$1" in
         setperm root nagios 0640 $en/resource.cfg
         setperm nagios adm 2751 /var/log/nagios3
         setperm nagios adm 2751 /var/log/nagios3/archives
-        setperm nagios nagios 0750 /var/run/nagios3
         setperm nagios nagios 0750 /var/lib/nagios3
 	setperm nagios nagios 0750 /var/lib/nagios3/spool
 	setperm nagios nagios 0750 /var/lib/nagios3/spool/checkresults

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios3.git