Modified config default-server.conf for nagios.

diff --git a/config/httpd/default-server.conf b/config/httpd/default-server.conf
index db082298a0bd645134c384ba6e555670c38f1e92..a0326fda8b5c5afa2c0125757ca63b01ced27700 100644 (file)
--- 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 453db35d86bd705d5168d87192efd942dec02fbc..22ed885a6c820b4b715387c9e4b98f53d9481799 100644 (file)
--- 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 0365b6a7cee98ab0b17939b280a5d955cb7596c4..7911a9da6e3479cf68a199fde5faf889bfd0fb2c 100644 (file)
--- 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)
+