Fixing bug from Pilou's patch, which causes debconf values having priority over *existing* local.sh file.
This commit is contained in:
parent
8e1fb4145b
commit
bc645605f6
|
@ -108,8 +108,28 @@ while [ "$QUEST_STATE" != 0 -a "$QUEST_STATE" != 14 ]; do
|
|||
if [ -r /etc/alternc/local.sh ]; then
|
||||
# source the current config
|
||||
. /etc/alternc/local.sh
|
||||
# and push it into debconf (its values have priority over anything
|
||||
|
||||
# and push it into debconf (its values have priority over anything!)
|
||||
db_set alternc/hostingname "$HOSTING"
|
||||
db_set alternc/desktopname "`echo $FQDN | tr '[:upper:]' '[:lower:]'`"
|
||||
db_set alternc/public_ip "$PUBLIC_IP"
|
||||
db_set alternc/internal_ip "$INTERNAL_IP"
|
||||
db_set alternc/ns1 "$NS1_HOSTNAME"
|
||||
db_set alternc/ns2 "$NS2_HOSTNAME"
|
||||
db_set alternc/default_mx "$DEFAULT_MX"
|
||||
db_set alternc/alternc_html "$ALTERNC_HTML"
|
||||
db_set alternc/alternc_mail "$ALTERNC_MAIL"
|
||||
db_set alternc/alternc_logs "$ALTERNC_LOGS"
|
||||
db_set alternc/monitor_ip "$MONITOR_IP"
|
||||
db_set alternc/default_mx2 "$DEFAULT_SECONDARY_MX"
|
||||
db_set alternc/mysql/host "$MYSQL_HOST"
|
||||
db_set alternc/mysql/db "$MYSQL_DATABASE"
|
||||
db_set alternc/mysql/user "$MYSQL_USER"
|
||||
db_set alternc/mysql/password "$MYSQL_PASS"
|
||||
db_set alternc/mysql/client "$MYSQL_CLIENT"
|
||||
db_set alternc/sql/backup_type "$SQLBACKUP_TYPE"
|
||||
db_set alternc/sql/backup_overwrite "$SQLBACKUP_OVERWRITE"
|
||||
db_set alternc/mysql/alternc_mail_user "$MYSQL_MAIL_USER"
|
||||
db_set alternc/mysql/alternc_mail_password "$MYSQL_MAIL_PASS"
|
||||
fi
|
||||
# upgrade <= 3.0 to >= 3.1
|
||||
if [ "x$ALTERNC_LOC" != "x" ]; then
|
||||
|
|
Loading…
Reference in New Issue