Remove conffiles and place them in /usr/share/symbiosis/monit/checks/

firewall/debian/install

@@ -4,7 +4,7 @@ rule.d                usr/share/symbiosis/firewall
 action.d              usr/share/symbiosis/firewall
 test.d                etc/symbiosis
 incron.d              etc/
-monit.d               etc/symbiosis
+monit.d/*             usr/share/symbiosis/monit/checks/
 incoming.d            etc/symbiosis/firewall
 outgoing.d            etc/symbiosis/firewall
 local.d               etc/symbiosis/firewall

firewall/debian/maintscript

+rm_conffile /etc/symbiosis/monit.d/incrond 2017:0424

firewall/debian/postinst

@@ -16,6 +16,23 @@ PREFIX=/etc/symbiosis/firewall
 
 chown -R admin:admin $PREFIX
 
+
 #DEBHELPER#
 
+#
+# Add symlinks for the monit script
+# 
+monit_dir="/etc/symbiosis/monit.d"
+mkdir -p "$monit_dir"
+
+for i in incrond; do
+  monit_script = "/usr/share/symbiosis/monit/checks/$i"
+  link_target = "$monit_dir/$i"
+
+  if [ -x "$monit_script" ] && [ ! -e "$link_target" ]; then
+    echo "I: Adding symlink for Symbiosis Monit script for $i"
+    ln -s "$monit_script" "$link_target" || true
+  fi
+done
+
 exit 0

ftpd/debian/install

 sbin/*             usr/sbin/
 default/*          etc/default/
-monit.d/*          etc/symbiosis/monit.d/
+monit.d/*          usr/share/symbiosis/monit/checks/
 test.d/*           etc/symbiosis/test.d/
 patterns.d/*       etc/symbiosis/firewall/patterns.d/
 lib/*              usr/lib/ruby/vendor_ruby/

ftpd/debian/maintscript

 rm_conffile /etc/symbiosis/monit.d/pure-authd 2014:1231
-
-
+rm_conffile /etc/symbiosis/monit.d/pure-ftpd 2017:0424

ftpd/debian/postinst

@@ -74,10 +74,24 @@ if [ -e /etc/ssl/private/pure-ftpd.pem ] ; then
   fi
 fi
 
-
-
 #DEBHELPER#
 
+#
+# Add symlinks for the monit script
+# 
+monit_dir="/etc/symbiosis/monit.d"
+mkdir -p "$monit_dir"
+
+for i in pure-ftpd; do
+  monit_script = "/usr/share/symbiosis/monit/checks/$i"
+  link_target = "$monit_dir/$i"
+
+  if [ -x "$monit_script" ] && [ ! -e "$link_target" ]; then
+    echo "I: Adding symlink for Symbiosis Monit script for $i"
+    ln -s "$monit_script" "$link_target" || true
+  fi
+done
+
 invoke-rc.d pure-ftpd restart
 
 exit 0

httpd/debian/symbiosis-httpd.install

 sbin                      usr/
 test.d                    etc/symbiosis/
 apache.d                  etc/symbiosis/
-monit.d                   etc/symbiosis/
+monit.d/*                 usr/share/symbiosis/monit/checks/
 bytemark/*                usr/share/symbiosis/static/
 apache2                   etc/
 php                       etc/

httpd/debian/symbiosis-httpd.maintscript

+rm_conffile /etc/symbiosis/monit.d/apache2 2017:0424

httpd/debian/symbiosis-httpd.postinst

@@ -75,4 +75,20 @@ symbiosis-httpd-configure --no-reload --verbose
 
 #DEBHELPER#
 
+#
+# Add symlinks for the monit script
+# 
+monit_dir="/etc/symbiosis/monit.d"
+mkdir -p "$monit_dir"
+
+for i in apache2; do
+  monit_script = "/usr/share/symbiosis/monit/checks/$i"
+  link_target = "$monit_dir/$i"
+
+  if [ -x "$monit_script" ] && [ ! -e "$link_target" ]; then
+    echo "I: Adding symlink for Symbiosis Monit script for $i"
+    ln -s "$monit_script" "$link_target" || true
+  fi
+done
+
 exit 0

monit/debian/maintscript

+rm_conffile /etc/symbiosis/monit.d/cron 2017:0424
+rm_conffile /etc/symbiosis/monit.d/sshd 2017:0424

monit/debian/postinst

@@ -46,4 +46,21 @@ fi
 mkdir -p /var/lib/symbiosis/
 
 #DEBHELPER#
+
+#
+# Add symlinks for the monit script
+# 
+monit_dir="/etc/symbiosis/monit.d"
+mkdir -p "$monit_dir"
+
+for i in cron sshd; do
+  monit_script = "/usr/share/symbiosis/monit/checks/$i"
+  link_target = "$monit_dir/$i"
+
+  if [ -x "$monit_script" ] && [ ! -e "$link_target" ]; then
+    echo "I: Adding symlink for Symbiosis Monit script for $i"
+    ln -s "$monit_script" "$link_target" || true
+  fi
+done
+
 exit 0

monit/debian/symbiosis-monit.install

 sbin/symbiosis-monit          usr/sbin/
-monit.d/*                     etc/symbiosis/monit.d/
+monit.d/*                     usr/share/symbiosis/monit/checks/
 templates/*                   usr/share/symbiosis/monit/
 lib/*                         usr/lib/ruby/vendor_ruby/
 test.d/*                      etc/symbiosis/test.d/

mysql/debian/install

-monit.d              etc/symbiosis
+monit.d/*            usr/share/symbiosis/monit/checks/
 mysql                etc

mysql/debian/maintscript

+rm_conffile /etc/symbiosis/monit.d/mysqld 2017:0424

mysql/debian/postinst

@@ -12,6 +12,22 @@ fi
 
 #DEBHELPER#
 
+#
+# Add symlinks for the monit script
+# 
+monit_dir="/etc/symbiosis/monit.d"
+mkdir -p "$monit_dir"
+
+for i in mysqld; do
+  monit_script = "/usr/share/symbiosis/monit/checks/$i"
+  link_target = "$monit_dir/$i"
+
+  if [ -x "$monit_script" ] && [ ! -e "$link_target" ]; then
+    echo "I: Adding symlink for Symbiosis Monit script for $i"
+    ln -s "$monit_script" "$link_target" || true
+  fi
+done
+
 #
 # Restart mysql just in case the config has been modified.
 #

xmpp/debian/install

-monit.d       /etc/symbiosis/
+monit.d/*     /usr/share/symbiosis/monit/checks/
 templates.d/* /etc/symbiosis/xmpp.d
 sbin/*        /usr/sbin

xmpp/debian/maintscript

+rm_conffile /etc/symbiosis/monit.d/prosody 2017:0424

xmpp/debian/postinst

@@ -42,4 +42,21 @@ for i in prosody dovecot; do
 done
 
 #DEBHELPER#
+
+#
+# Add symlinks for the monit script
+# 
+monit_dir="/etc/symbiosis/monit.d"
+mkdir -p "$monit_dir"
+
+for i in prosody; do
+  monit_script = "/usr/share/symbiosis/monit/checks/$i"
+  link_target = "$monit_dir/$i"
+
+  if [ -x "$monit_script" ] && [ ! -e "$link_target" ]; then
+    echo "I: Adding symlink for Symbiosis Monit script for $i"
+    ln -s "$monit_script" "$link_target" || true
+  fi
+done
+
 exit 0