From 2b11cc8648d4c82c9b5d2b455abd6d647785b4f3 Mon Sep 17 00:00:00 2001
From: Peter Pfeiffer <peterman@ipfire.org>
Date: Tue, 10 Mar 2009 12:39:10 +0100
Subject: [PATCH] Modified config default-server.conf for nagios.

---
 config/httpd/default-server.conf | 2 +-
 config/rootfiles/packages/nagios | 6 +++---
 lfs/nagios                       | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/config/httpd/default-server.conf b/config/httpd/default-server.conf
index db082298a0..a0326fda8b 100644
--- a/config/httpd/default-server.conf
+++ b/config/httpd/default-server.conf
@@ -5,4 +5,4 @@
 
 DocumentRoot /srv/web/ipfire/html
 
-#Include /etc/httpd/conf/conf.d/*.conf
+Include /etc/httpd/conf/conf.d/*.conf
diff --git a/config/rootfiles/packages/nagios b/config/rootfiles/packages/nagios
index 453db35d86..22ed885a6c 100644
--- a/config/rootfiles/packages/nagios
+++ b/config/rootfiles/packages/nagios
@@ -439,6 +439,6 @@ usr/share/nagios/stylesheets
 #usr/share/nagios/stylesheets/summary.css
 #usr/share/nagios/stylesheets/tac.css
 #usr/share/nagios/stylesheets/trends.css
-var/archives
-var/rw
-var/spool/checkresults
+var/nagios/archives
+var/nagios/rw
+var/nagios/spool/checkresults
diff --git a/lfs/nagios b/lfs/nagios
index 0365b6a7ce..7911a9da6e 100644
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -85,7 +85,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--sysconfdir=/etc/nagios \
 			--datadir=/usr/share/nagios \
 			--sbindir=/usr/share/nagios/cgi-bin \
-			--localstatedir=/var \
+			--localstatedir=/var/nagios \
+			--libexecdir=/usr/lib/nagios \
 			--with-lockfile=/var/lock/nagios.lock \
 			--with-nagios-user=nobody \
 			--with-nagios-group=nobody \
@@ -96,8 +97,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--with-httpd-conf=/etc/httpd/conf/conf.d \
 			--enable-nanosleep
 	cd $(DIR_APP) && make all $(MAKETUNING)
-	cd $(DIR_APP) && make install install-init install-commandmode install-config
-	
+	cd $(DIR_APP) && make install install-init install-commandmode install-config install-webconf
+
 	cd $(DIR_SRC) && tar xfz $(DIR_DL)/nagios-plugins-1.4.13.tar.gz
 	cd $(DIR_SRC)/nagios-plugins* && ./configure --prefix=/usr \
 		--libexecdir=/usr/lib/nagios \
@@ -106,3 +107,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_SRC)/nagios-plugins* && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
+
-- 
2.39.2