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 (file)
index 0000000..4a8f1fe
--- /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 22ed885a6c820b4b715387c9e4b98f53d9481799..694172d8154539deeb93dc663a550acc1ef6088f 100644 (file)
--- 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 7911a9da6e3479cf68a199fde5faf889bfd0fb2c..bede588494f179c7c91ca5b56a8456033211e9c2 100644 (file)
--- 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 99dfde1a3e3717567d18f46b4f44566f05fb91eb..4abeba6b91abc97a96b2cb377161892947d7d461 100644 (file)
--- 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}