diff --git a/.gitattributes b/.gitattributes index 8b34758e..37b49784 100644 --- a/.gitattributes +++ b/.gitattributes @@ -334,9 +334,9 @@ debian/rules -text debian/templates -text etc/alternc/apache-ssl.conf -text etc/alternc/apache.conf -text -etc/alternc/bureau.conf -text etc/alternc/menulist.txt -text etc/alternc/phpmyadmin.inc.php -text +etc/alternc/templates/alternc/bureau.conf -text etc/alternc/templates/apache-ssl/httpd.conf -text etc/alternc/templates/apache/httpd.conf -text etc/alternc/templates/bind/automatic.conf -text diff --git a/etc/alternc/bureau.conf b/etc/alternc/templates/alternc/bureau.conf similarity index 100% rename from etc/alternc/bureau.conf rename to etc/alternc/templates/alternc/bureau.conf diff --git a/install/alternc.install b/install/alternc.install index e1243bd8..b512e505 100644 --- a/install/alternc.install +++ b/install/alternc.install @@ -15,7 +15,8 @@ set -e TEMPLATE_DIR="/etc/alternc/templates" # Find needed configuration files (without the initial '/') -CONFIG_FILES="" +# replace this one unconditionnally +CONFIG_FILES="etc/alternc/bureau.conf" if [ -e /etc/apache/httpd.conf ]; then CONFIG_FILES="$CONFIG_FILES etc/apache/httpd.conf" @@ -53,10 +54,6 @@ if [ -e /etc/default/saslauthd ]; then CONFIG_FILES="$CONFIG_FILES etc/default/saslauthd" fi -if [ -e /etc/alternc/bureau.conf ]; then - CONFIG_FILES="$CONFIG_FILES etc/alternc/bureau.conf" -fi - INSTALLED_CONFIG_TAR="/var/backups/alternc/etc-installed.tar.gz" #######################################################################