From: maniacikarus <maniacikarus@ipfire.org>
Date: Sat, 14 Mar 2009 14:05:17 +0000 (+0100)
Subject: This should make nagios more ipfire-like
X-Git-Tag: v2.5-beta1~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae882c001772f964cd435dcfe644e65f0f9dda0c;p=people%2Fstevee%2Fipfire-2.x.git

This should make nagios more ipfire-like
---

diff --git a/config/httpd/vhosts.d/nagios.conf b/config/httpd/vhosts.d/nagios.conf
new file mode 100644
index 0000000000..4a8f1fe15a
--- /dev/null
+++ b/config/httpd/vhosts.d/nagios.conf
@@ -0,0 +1,5 @@
+Listen 1007
+
+<VirtualHost *:1007>
+
+</VirtualHost>
diff --git a/config/rootfiles/packages/nagios b/config/rootfiles/packages/nagios
index 22ed885a6c..694172d815 100644
--- a/config/rootfiles/packages/nagios
+++ b/config/rootfiles/packages/nagios
@@ -1,3 +1,4 @@
+etc/httpd/conf/vhosts.d/esniper.conf
 #etc/nagios
 etc/nagios/cgi.cfg
 etc/nagios/nagios.cfg
diff --git a/lfs/nagios b/lfs/nagios
index 7911a9da6e..bede588494 100644
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -105,6 +105,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--with-nagios-user=nobody --with-nagios-group=nobody
 	cd $(DIR_SRC)/nagios-plugins* && make $(MAKETUNING)
 	cd $(DIR_SRC)/nagios-plugins* && make install
+	chown -R nobody:nobody /var/nagios
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
 
diff --git a/src/paks/nagios/install.sh b/src/paks/nagios/install.sh
index 99dfde1a3e..4abeba6b91 100644
--- a/src/paks/nagios/install.sh
+++ b/src/paks/nagios/install.sh
@@ -24,16 +24,6 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 restore_backup ${NAME}
-chown -R nobody:nobody /var/nagios
-cat > /etc/httpd/conf/vhosts.d/nagios.conf <<EOF
-Listen 1008
-
-<VirtualHost *:1007>
-
-include /etc/httpd/conf/conf.d/nagios.conf
-
-</VirtualHost>
-EOF
 htpasswd -bmc /etc/nagios/htpasswd.users nagiosadmin nagios
 /etc/init.d/apache restart
 start_service --background ${NAME}