Changeset 25dfb16 for debian/config

Timestamp:

2009-06-07T20:19:25Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0c41177

Parents:

5916995

Message:

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.

File:

• debian/config (modified) (1 diff)

debian/config

@@ -2 +2 @@
 
 . /usr/share/debconf/confmodule
+[ -f /etc/default/bitlbee ] && . /etc/default/bitlbee
 
 db_title BitlBee
 
-db_get bitlbee/serveport
-if [ "$RET" = "stillhavetoask" ]; then
-        listens=$(netstat -ltn | awk '{print $4}')
-        for port in 6667 6666 6668 6669; do
-                if [ $(expr "$listens " : ".*:$port\s") = "0" ]; then
-                        break
-                fi
-        done
-        db_set bitlbee/serveport $port;
+if [ -n "$BITLBEE_PORT" ]; then
+        db_set bitlbee/serveport "$BITLBEE_PORT"
+else
+        db_get bitlbee/serveport
+        if [ "$RET" = "stillhavetoask" ]; then
+                listens=$(netstat -ltn | awk '{print $4}')
+                for port in 6667 6666 6668 6669; do
+                        if [ $(expr "$listens " : ".*:$port\s") = "0" ]; then
+                                break
+                        fi
+                done
+                db_set bitlbee/serveport $port;
+        fi
 fi