kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

move bureau.conf with the templates, as it is one, should fix #646

This commit is contained in:
Antoine Beaupré 2006-04-26 21:38:32 +00:00
parent c34386e9a4
commit abc975efd9
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -334,9 +334,9 @@ debian/rules -text
debian/templates -text debian/templates -text
etc/alternc/apache-ssl.conf -text etc/alternc/apache-ssl.conf -text
etc/alternc/apache.conf -text etc/alternc/apache.conf -text
etc/alternc/bureau.conf -text
etc/alternc/menulist.txt -text etc/alternc/menulist.txt -text
etc/alternc/phpmyadmin.inc.php -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-ssl/httpd.conf -text
etc/alternc/templates/apache/httpd.conf -text etc/alternc/templates/apache/httpd.conf -text
etc/alternc/templates/bind/automatic.conf -text etc/alternc/templates/bind/automatic.conf -text

0
etc/alternc/bureau.conf → etc/alternc/templates/alternc/bureau.conf
View File

7
install/alternc.install
View File

@ -15,7 +15,8 @@ set -e
TEMPLATE_DIR="/etc/alternc/templates" TEMPLATE_DIR="/etc/alternc/templates"
# Find needed configuration files (without the initial '/') # 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 if [ -e /etc/apache/httpd.conf ]; then
CONFIG_FILES="$CONFIG_FILES etc/apache/httpd.conf" 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" CONFIG_FILES="$CONFIG_FILES etc/default/saslauthd"
fi 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" INSTALLED_CONFIG_TAR="/var/backups/alternc/etc-installed.tar.gz"
####################################################################### #######################################################################