From 03692e4a1643f4f8e3393d6efc33ea86548324f2 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Thu, 12 Sep 2013 12:20:58 +0000
Subject: [PATCH] Fix incron launch

---
 .gitattributes                                        | 4 ++--
 etc/alternc/templates/incron.d/alternc_do_action      | 3 ---
 etc/alternc/templates/incron.d/alternc_update_domains | 3 ---
 etc/incron.d/alternc_do_action                        | 1 +
 etc/incron.d/alternc_update_domains                   | 1 +
 install/alternc.install                               | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 etc/alternc/templates/incron.d/alternc_do_action
 delete mode 100644 etc/alternc/templates/incron.d/alternc_update_domains
 create mode 100644 etc/incron.d/alternc_do_action
 create mode 100644 etc/incron.d/alternc_update_domains

diff --git a/.gitattributes b/.gitattributes
index 1e1c775f..14d8e2f5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -482,8 +482,6 @@ etc/alternc/templates/default/saslauthd -text
 etc/alternc/templates/dovecot/dovecot-dict-quota.conf -text
 etc/alternc/templates/dovecot/dovecot-sql.conf -text
 etc/alternc/templates/dovecot/dovecot.conf -text
-etc/alternc/templates/incron.d/alternc_do_action -text
-etc/alternc/templates/incron.d/alternc_update_domains -text
 etc/alternc/templates/opendkim.conf -text
 etc/alternc/templates/postfix/master.cf -text
 etc/alternc/templates/postfix/myalias.cf -text
@@ -498,6 +496,8 @@ etc/alternc/templates/postfix/sasl/smtpd.conf -text
 etc/alternc/templates/proftpd/modules.conf -text
 etc/alternc/templates/proftpd/proftpd.conf -text
 etc/alternc/templates/proftpd/welcome.msg -text
+etc/incron.d/alternc_do_action -text
+etc/incron.d/alternc_update_domains -text
 install/alternc.install -text
 install/body_checks -text
 install/domaines.template -text
diff --git a/etc/alternc/templates/incron.d/alternc_do_action b/etc/alternc/templates/incron.d/alternc_do_action
deleted file mode 100644
index 107bcbc2..00000000
--- a/etc/alternc/templates/incron.d/alternc_do_action
+++ /dev/null
@@ -1,3 +0,0 @@
-# WARNING: Do not edit this file, edit the one in /etc/alternc/templates and launch alternc.install again.
-
-/var/run/alternc/ IN_CREATE,IN_ATTRIB,IN_NO_LOOP /usr/lib/alternc/inotify_do_actions.sh
diff --git a/etc/alternc/templates/incron.d/alternc_update_domains b/etc/alternc/templates/incron.d/alternc_update_domains
deleted file mode 100644
index 3a0ae91e..00000000
--- a/etc/alternc/templates/incron.d/alternc_update_domains
+++ /dev/null
@@ -1,3 +0,0 @@
-# WARNING: Do not edit this file, edit the one in /etc/alternc/templates and launch alternc.install again.
-
-/var/run/alternc/ IN_CREATE,IN_ATTRIB,IN_NO_LOOP /usr/lib/alternc/inotify_update_domains.sh
diff --git a/etc/incron.d/alternc_do_action b/etc/incron.d/alternc_do_action
new file mode 100644
index 00000000..509d73d5
--- /dev/null
+++ b/etc/incron.d/alternc_do_action
@@ -0,0 +1 @@
+/var/run/alternc/ IN_CREATE,IN_ATTRIB,IN_NO_LOOP /usr/lib/alternc/inotify_do_actions.sh
diff --git a/etc/incron.d/alternc_update_domains b/etc/incron.d/alternc_update_domains
new file mode 100644
index 00000000..528275eb
--- /dev/null
+++ b/etc/incron.d/alternc_update_domains
@@ -0,0 +1 @@
+/var/run/alternc/ IN_CREATE,IN_ATTRIB,IN_NO_LOOP /usr/lib/alternc/inotify_update_domains.sh
diff --git a/install/alternc.install b/install/alternc.install
index b570f4bf..20ae7c36 100644
--- a/install/alternc.install
+++ b/install/alternc.install
@@ -60,7 +60,7 @@ TEMPLATE_DIR="/etc/alternc/templates"
 
 # Find needed configuration files (without the initial '/')
 # replace this one unconditionnally
-CONFIG_FILES="etc/alternc/bureau.conf etc/incron.d/alternc etc/apache2/envvars etc/alternc/apache2.conf etc/alternc/apache_logformat.conf etc/alternc/phpmyadmin.inc.php"
+CONFIG_FILES="etc/alternc/bureau.conf etc/apache2/envvars etc/alternc/apache2.conf etc/alternc/apache_logformat.conf etc/alternc/phpmyadmin.inc.php"
 
 if [ -e /etc/bind/named.conf ]; then
     CONFIG_FILES="$CONFIG_FILES etc/bind/named.conf.options"