diff options
| author | Julien Valroff <julien@kirya.net> | 2010-09-04 14:15:48 +0200 |
|---|---|---|
| committer | Julien Valroff <julien@kirya.net> | 2010-09-04 14:15:48 +0200 |
| commit | 0672a9a0be1ff5351b9ed64104c737488c093def (patch) | |
| tree | 0b56680d02d36e1e4d632478a86229d1e76a5d2a | |
| parent | c5740eb67fa4fbb23f2a3daf38832f3348f7de63 (diff) | |
Fixes for previous commit
| -rw-r--r-- | debian/mailgraph.default | 6 | ||||
| -rw-r--r-- | debian/mailgraph.postinst | 16 |
2 files changed, 9 insertions, 13 deletions
diff --git a/debian/mailgraph.default b/debian/mailgraph.default index 12f380a..f302084 100644 --- a/debian/mailgraph.default +++ b/debian/mailgraph.default @@ -4,14 +4,14 @@ # # Should Mailgraph start on boot (true|false) (default: true) -BOOT_START=$BOOT_START +BOOT_START=true # Logfile used by mailgraph (default: /var/log/mail.log) -MAIL_LOG=$MAIL_LOG +MAIL_LOG=/var/log/mail.log # Ignore mails from localhost (true|false) (default: false) # When true, this will pass --ignore-localhost to mailgraph daemon -IGNORE_LOCALHOST=$IGNORE_LOCALHOST +IGNORE_LOCALHOST=false # Extra options to be passed to mailgraph daemon # See mailgraph -h output (default: "") diff --git a/debian/mailgraph.postinst b/debian/mailgraph.postinst index 2464098..2bfa4db 100644 --- a/debian/mailgraph.postinst +++ b/debian/mailgraph.postinst @@ -21,22 +21,18 @@ set -e case "$1" in configure) - db_get mailgraph/start_on_boot || true - BOOT_START=$RET - - db_get mailgraph/mail_log || true - MAIL_LOG=$RET - - db_get mailgraph/ignore_localhost - IGNORE_LOCALHOST=$RET - TEMPFILE=`tempfile` cp -p /usr/share/mailgraph/mailgraph.default ${TEMPFILE} + # Merge debconf values into the configuration + for i in BOOT_START=start_on_boot MAIL_LOG=mail_log IGNORE_LOCALHOST=ignore_localhost; do + db_get rkhunter/${i%=*} + sed -i -re "s@^(${i#*=}=).*@\1\"${RET}\"@" "$TEMPFILE" + done + ucf --three-way --debconf-ok ${TEMPFILE} /etc/default/mailgraph ucfr mailgraph /etc/default/mailgraph rm -f ${TEMPFILE} - ;; abort-upgrade|abort-remove|abort-deconfigure) |