diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-18 22:22:46 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-18 22:22:46 +0000 |
| commit | 5fbec3ddda0e3dcf2c300926978b9b363a77a0f7 (patch) | |
| tree | c8fcffaeffc418a7b0af54ed30da9a923166b333 /debian/patches/bitlbee.conf.diff | |
| parent | 84622397b1780e4afa7bd36f0d2f089398ec3597 (diff) | |
| parent | b788246cec5a718115a0aa620b72cdaf0315cac2 (diff) | |
Merging recent debian/ changes.
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..c98fa546 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 @@ +--- debian/bitlbee/etc/bitlbee/bitlbee.conf 2009-06-01 00:20:24.000000000 +0100 ++++ debian/bitlbee/etc/bitlbee/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 + |