iservchk script must be iconf'd or it gets deleted on every call; link in Makefile

diff --git a/Makefile b/Makefile
index d79d23f..a5fa08f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,10 @@ links: sourcedoc
        $(MKDIR) $(DESTDIR)/usr/share/iserv/iconf/etc/iserv/config.template/
        $(LN) config/82error-reporter $(DESTDIR)/usr/share/iserv/iconf/etc/iserv/config.template/
        
        $(MKDIR) $(DESTDIR)/usr/share/iserv/iconf/etc/iserv/config.template/
        $(LN) config/82error-reporter $(DESTDIR)/usr/share/iserv/iconf/etc/iserv/config.template/
        

+       # iservchk
+       $(MKDIR) $(DESTDIR)/usr/share/iserv/iconf/etc/iserv/chk.d/99errorreporter/
+       $(LN) iservchk/* $(DESTDIR)/usr/share/iserv/iconf/etc/iserv/chk.d/99errorreporter/
+       

        # maintenance files
        $(MKDIR) $(DESTDIR)/usr/share/iserv/modules/error-reporter/
        $(LN) maint/* $(DESTDIR)/usr/share/iserv/modules/error-reporter
        # maintenance files
        $(MKDIR) $(DESTDIR)/usr/share/iserv/modules/error-reporter/
        $(LN) maint/* $(DESTDIR)/usr/share/iserv/modules/error-reporter

diff --git a/iservchk/20base b/iservchk/20base
new file mode 100644 (file)
index 0000000..cfe9937
--- /dev/null
+++ b/iservchk/20base
@@ -0,0 +1,8 @@
+Test 'import configuration from IServ 1' 
+  '[ ! -f /old/opt/iserv/idesk/inc/error-reporter/config.inc.rpmsave ]'
+  /usr/share/iserv/modules/error-reporter/update-config-from-iserv1.sh
+Test 'update old config'
+  '[ ! -f /usr/share/iserv/www/inc/mod_error-reporter/config.inc ]'
+  /usr/share/iserv/modules/error-reporter/update-config
+Shell 'update database' /usr/share/iserv/modules/error-reporter/update-database
+

diff --git a/iservchk/99errorreporter b/iservchk/99errorreporter
deleted file mode 100644 (file)
index cfe9937..0000000
--- a/iservchk/99errorreporter
+++ /dev/null
@@ -1,8 +0,0 @@
-Test 'import configuration from IServ 1' 
-  '[ ! -f /old/opt/iserv/idesk/inc/error-reporter/config.inc.rpmsave ]'
-  /usr/share/iserv/modules/error-reporter/update-config-from-iserv1.sh
-Test 'update old config'
-  '[ ! -f /usr/share/iserv/www/inc/mod_error-reporter/config.inc ]'
-  /usr/share/iserv/modules/error-reporter/update-config
-Shell 'update database' /usr/share/iserv/modules/error-reporter/update-database
-