Fix nagioql packagename

diff --git a/config/rootfiles/packages/nagiosql b/config/rootfiles/packages/nagiosql
index 63010462639ddd3a0570dbc9abb2752b2b909f6c..f76a2fdb20d7238a3731776d7e7f1d297fe39881 100644 (file)
--- a/config/rootfiles/packages/nagiosql
+++ b/config/rootfiles/packages/nagiosql
@@ -1,7 +1,5 @@
 #etc/nagiosql
-etc/nagiosql/.placeholder
 #etc/nagiosql/backup
-etc/nagiosql/backup/.placeholder
 #etc/nagiosql/backup/hosts
 etc/nagiosql/backup/hosts/.placeholder
 #etc/nagiosql/backup/services
@@ -402,4 +400,4 @@ usr/share/nagiosql
 #usr/share/nagiosql/templates/files/timeperiods.tpl.dat
 #usr/share/nagiosql/templates/index.tpl.htm
 #usr/share/nagiosql/templates/main.tpl.htm
-#etc/httpd/conf/vhosts.d/nagios.conf
+etc/httpd/conf/vhosts.d/nagios.conf

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 7c8a621d51a2abeb157e0a8b896990004d305dec..bc88e8b13f371459336dfd8338ce1c1c8eb2213d 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -219,6 +219,8 @@
 * mtools-3.9.10
 * mysql-5.0.24a
 * nagios-3.0.6
+* nagiosql-303
+* nagiosql303
 * nagiosql303-
 * nano-2.0.9
 * nasm-0.98.39

diff --git a/lfs/nagiosql b/lfs/nagiosql
index d6cb0ca1744191120a20f0304996ba1359330a53..1157ee2e8f5731c20f53ce97322e45e4e4da1fd4 100644 (file)
--- a/lfs/nagiosql
+++ b/lfs/nagiosql
@@ -30,8 +30,9 @@ THISAPP    = nagiosql$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/nagiosql3
-TARGET     = $(DIR_INFO)/$(THISAPP)-
-PROG       = nagiosql-
+TARGET     = $(DIR_INFO)/nagiosql-$(VER)
+
+PROG       = nagiosql
 PAK_VER    = 1
 
 DEPS       = "nagios"