diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2009-06-07 21:19:25 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2009-06-07 21:19:25 +0100 |
| commit | 25dfb16035f12ba15ad5fcfb6d428386ac4c38ce (patch) | |
| tree | 02b6472d33af972827538d0754f3f74d57aa3114 /debian/postinst | |
| parent | 59169956e1f7a5dd86e3c1aab41bc6a252f7b653 (diff) | |
Forgot to commit before starting to work on the second item, so here's a
monster commit. :-)
* Removing code that edits bitlbee.conf from postinst (and chown code in
the init script), it's not really necessary anymore; bitlbee may only
still run as root if the admin doesn't read conffile diffs.
(Closes: #514572)
* No longer overwriting port number info in /etc/default/bitlbee with
what's in debconf. (Closes: #514148)
* Added notes about the above two changes to bitlbee.conf.
Diffstat (limited to 'debian/postinst')
| -rwxr-xr-x | debian/postinst | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/debian/postinst b/debian/postinst index db324b65..db541f6c 100755 --- a/debian/postinst +++ b/debian/postinst @@ -32,7 +32,7 @@ fi cat<<EOF>/etc/default/bitlbee ## /etc/default/bitlbee: Auto-generated/updated script. ## -## Don't edit this line, use dpkg-reconfigure bitlbee +## If running in (fork)daemon mode, listen on this TCP port. BITLBEE_PORT="$PORT" ## Use single-process or forking daemon mode? Can't be changed from debconf, @@ -63,13 +63,6 @@ if [ -e /usr/share/bitlbee/help.upgrading ]; then fi fi -if ! grep -qi '^User *= *' /etc/bitlbee/bitlbee.conf; then - echo 'Updating configuration file, enabling User-setting...' - if ! sed -i -e 's/# *User *= *.*/User = bitlbee/i' /etc/bitlbee/bitlbee.conf; then - echo 'Failed! BitlBee may run as root now, please check your configs.' - fi -fi - if [ -n "$2" -a "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then if which invoke-rc.d >/dev/null 2>&1; then invoke-rc.d bitlbee restart |