[SCM] quassel packaging branch, master, updated. debian/1%0.12.4-2-2-g86c7ba6

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/quassel.git;a=commitdiff;h=86c7ba6

The following commit has been merged in the master branch:
commit 86c7ba6a91a87f52cf3089a4f028d5faecbe62bf
Author: Felix Geyer <fgeyer at debian.org>
Date:   Wed Dec 13 22:01:32 2017 +0100

    Provide support for --listen option in the init script and systemd service.
    
    Closes: #590645
---
 debian/changelog                        | 2 ++
 debian/quassel-core.quasselcore.default | 3 +++
 debian/quassel-core.quasselcore.init    | 3 ++-
 debian/quassel-core.quasselcore.service | 4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b6aa189..eafbaae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ quassel (1:0.12.4-3) UNRELEASED; urgency=medium
 
   * Depend on default-dbus-session-bus | dbus-session-bus instead of dbus-x11.
     (Closes: #836142)
+  * Provide support for --listen option in the init script and systemd service.
+    (Closes: #590645)
 
  -- Felix Geyer <fgeyer at debian.org>  Thu, 20 Oct 2016 20:42:43 +0200
 
diff --git a/debian/quassel-core.quasselcore.default b/debian/quassel-core.quasselcore.default
index c832087..448472d 100644
--- a/debian/quassel-core.quasselcore.default
+++ b/debian/quassel-core.quasselcore.default
@@ -6,3 +6,6 @@ LOGLEVEL="Info"
 
 # The port quasselcore will listen at. Default is: 4242
 PORT="4242"
+
+# Network address to listen on
+LISTEN="::,0.0.0.0"
diff --git a/debian/quassel-core.quasselcore.init b/debian/quassel-core.quasselcore.init
index 747aa6e..5ca4377 100644
--- a/debian/quassel-core.quasselcore.init
+++ b/debian/quassel-core.quasselcore.init
@@ -58,6 +58,7 @@ DAEMONUSER=quasselcore
 # defaulting LOGLEVEL and PORT, just in case /etc/default/$name gets deleted
 LOGLEVEL="Info"
 PORT="4242"
+LISTEN="::,0.0.0.0"
 
 # source default
 if [ -f /etc/default/$NAME ] ; then
@@ -77,7 +78,7 @@ start_server() {
     start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \
         --background --chuid $DAEMONUSER --exec $DAEMON \
         -- --logfile=$LOGFILE --loglevel=$LOGLEVEL --configdir=$DATADIR \
-           --port=$PORT \
+           --port=$PORT --listen=$LISTEN \
            $DAEMON_OPTS
 }
 
diff --git a/debian/quassel-core.quasselcore.service b/debian/quassel-core.quasselcore.service
index e0231c2..1bb9910 100644
--- a/debian/quassel-core.quasselcore.service
+++ b/debian/quassel-core.quasselcore.service
@@ -8,9 +8,9 @@ After=network-online.target postgresql.service
 User=quasselcore
 Group=quassel
 WorkingDirectory=/var/lib/quassel
-Environment="DATADIR=/var/lib/quassel" "LOGFILE=/var/log/quassel/core.log" "LOGLEVEL=Info" "PORT=4242"
+Environment="DATADIR=/var/lib/quassel" "LOGFILE=/var/log/quassel/core.log" "LOGLEVEL=Info" "PORT=4242" "LISTEN=::,0.0.0.0"
 EnvironmentFile=-/etc/default/quasselcore
-ExecStart=/usr/bin/quasselcore --configdir=${DATADIR} --logfile=${LOGFILE} --loglevel=${LOGLEVEL} --port=${PORT}
+ExecStart=/usr/bin/quasselcore --configdir=${DATADIR} --logfile=${LOGFILE} --loglevel=${LOGLEVEL} --port=${PORT} --listen=${LISTEN}
 Restart=on-failure
 
 [Install]

-- 
quassel packaging