Modified config default-server.conf for nagios.
authorPeter Pfeiffer <peterman@ipfire.org>
Tue, 10 Mar 2009 11:39:10 +0000 (12:39 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 10 Mar 2009 11:39:10 +0000 (12:39 +0100)
config/httpd/default-server.conf
config/rootfiles/packages/nagios
lfs/nagios

index db08229..a0326fd 100644 (file)
@@ -5,4 +5,4 @@
 
 DocumentRoot /srv/web/ipfire/html
 
-#Include /etc/httpd/conf/conf.d/*.conf
+Include /etc/httpd/conf/conf.d/*.conf
index 453db35..22ed885 100644 (file)
@@ -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
index 0365b6a..7911a9d 100644 (file)
@@ -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)
+