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/patches/bitlbee.conf.diff | |
| 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/patches/bitlbee.conf.diff')
| -rw-r--r-- | debian/patches/bitlbee.conf.diff | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/debian/patches/bitlbee.conf.diff b/debian/patches/bitlbee.conf.diff index b80bcb4c..e42611bb 100644 --- a/debian/patches/bitlbee.conf.diff +++ b/debian/patches/bitlbee.conf.diff @@ -1,13 +1,22 @@ -=== modified file 'bitlbee.conf' ---- debian/bitlbee/etc/bitlbee/bitlbee.conf 2008-08-26 22:33:54 +0000 -+++ debian/bitlbee/etc/bitlbee/bitlbee.conf 2008-08-27 23:18:13 +0000 -@@ -23,7 +23,7 @@ +--- bitlbee.conf 2009-06-01 00:20:24.000000000 +0100 ++++ /tmp/bitlbee.conf 2009-06-07 21:16:19.000000000 +0100 +@@ -23,13 +23,18 @@ ## If BitlBee is started by root as a daemon, it can drop root privileges, ## and change to the specified user. ## -# User = bitlbee ++## DEBIAN NOTE: Without this, BitlBee will run as root! ++## +User = bitlbee ## DaemonPort/DaemonInterface: ## - + ## For daemon mode, you can specify on what interface and port the daemon + ## should be listening for connections. + ## ++## DEBIAN NOTE: The init script passes the -p flag to use the port number ++## set using debconf, this overrides the DaemonPort setting here. ++## + # DaemonInterface = 0.0.0.0 + # DaemonPort = 6667 + |