| 1 |
jokey 08/09/28 19:12:22 |
| 2 |
|
| 3 |
Modified: quasselcore.init quasselcore.conf |
| 4 |
Log: |
| 5 |
Import some init script fixes and ebuild improvements from Daniel Pielmeier. Drop old as well |
| 6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 net-irc/quassel/files/quasselcore.init |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/files/quasselcore.init?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/files/quasselcore.init?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/files/quasselcore.init?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: quasselcore.init |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.init,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- quasselcore.init 30 Aug 2008 19:02:54 -0000 1.2 |
| 22 |
+++ quasselcore.init 28 Sep 2008 19:12:21 -0000 1.3 |
| 23 |
@@ -1,23 +1,41 @@ |
| 24 |
#!/sbin/runscript |
| 25 |
# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.init,v 1.2 2008/08/30 19:02:54 jokey Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.init,v 1.3 2008/09/28 19:12:21 jokey Exp $ |
| 29 |
|
| 30 |
depend() { |
| 31 |
need net |
| 32 |
} |
| 33 |
|
| 34 |
+checkconfig() { |
| 35 |
+ if [ -z "${QUASSEL_USER}" ] ; then |
| 36 |
+ eerror "Did you read the elog messages? You need to define the" |
| 37 |
+ eerror "QUASSEL_USER variable in /etc/conf.d/quasselcore first." |
| 38 |
+ return 1 |
| 39 |
+ fi |
| 40 |
+} |
| 41 |
+ |
| 42 |
start() { |
| 43 |
+ checkconfig || return 1 |
| 44 |
+ |
| 45 |
ebegin "Starting Quassel Core" |
| 46 |
- if [ -x /etc/init.d/root ]; then |
| 47 |
+ local LOGFILE="/var/log/quassel.log" |
| 48 |
+ if [ ! -e ${LOGFILE} ] ; then |
| 49 |
+ touch ${LOGFILE} && chown ${QUASSEL_USER} ${LOGFILE} |
| 50 |
+ fi |
| 51 |
+ |
| 52 |
+ if [ -x /etc/init.d/root ] ; then |
| 53 |
# running on baselayout-2/openrc |
| 54 |
start-stop-daemon --start --user ${QUASSEL_USER} --background --make-pidfile \ |
| 55 |
- --pidfile /var/run/quassel.pid --exec /usr/bin/quasselcore -- ${QUASSEL_OPTS} |
| 56 |
+ --pidfile /var/run/quassel.pid --exec /usr/bin/quasselcore -- --logfile=${LOGFILE} \ |
| 57 |
+ --loglevel=${LOGLEVEL:-"Info"} --port=${PORT:-"4242"} \ |
| 58 |
+ --datadir=${DATADIR:-"/home/${QUASSEL_USER}/.quassel"} |
| 59 |
else |
| 60 |
# running on baselayout-1 |
| 61 |
start-stop-daemon --start --chuid ${QUASSEL_USER} --background --make-pidfile \ |
| 62 |
--pidfile /var/run/quassel.pid --env HOME="/home/${QUASSEL_USER}" \ |
| 63 |
- --exec /usr/bin/quasselcore -- ${QUASSEL_OPTS} |
| 64 |
+ --exec /usr/bin/quasselcore -- --logfile=${LOGFILE} --loglevel=${LOGLEVEL:-"Info"} \ |
| 65 |
+ --port=${PORT:-"4242"} --datadir=${DATADIR:-"/home/${QUASSEL_USER}/.quassel"} |
| 66 |
fi |
| 67 |
eend $? |
| 68 |
} |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.2 net-irc/quassel/files/quasselcore.conf |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/files/quasselcore.conf?rev=1.2&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/files/quasselcore.conf?rev=1.2&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/files/quasselcore.conf?r1=1.1&r2=1.2 |
| 77 |
|
| 78 |
Index: quasselcore.conf |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.conf,v |
| 81 |
retrieving revision 1.1 |
| 82 |
retrieving revision 1.2 |
| 83 |
diff -u -r1.1 -r1.2 |
| 84 |
--- quasselcore.conf 26 Aug 2008 12:01:44 -0000 1.1 |
| 85 |
+++ quasselcore.conf 28 Sep 2008 19:12:21 -0000 1.2 |
| 86 |
@@ -1,14 +1,14 @@ |
| 87 |
# /etc/conf.d/quasselcore |
| 88 |
|
| 89 |
+# The user owning the quasselcore daemon |
| 90 |
QUASSEL_USER="" |
| 91 |
|
| 92 |
-#Available options (QUASSEL_OPTS) for quasselcore: |
| 93 |
-#--port -p The port quasselcore will listen at. Default 4242 |
| 94 |
-#--norestore -n Don't restore last core's state |
| 95 |
-#--logfile -l Path to logfile |
| 96 |
-#--loglevel -L Loglevel Debug|Info|Warning|Error. Default Info |
| 97 |
-#--datadir -0 Specify the directory holding datafiles like the Sqlite DB and the SSL Cert |
| 98 |
+# Loglevel Debug|Info|Warning|Error. Default is: Info |
| 99 |
+# The logfile is located at /var/log/quassel.log. |
| 100 |
+LOGLEVEL="Info" |
| 101 |
|
| 102 |
-#QUASSEL_OPTS="--logfile=/var/log/quassel.log" |
| 103 |
-#Does not work now, because of missing write permission to /var/log. |
| 104 |
-#Maybe creating /var/log/quassel with appropiate permissions will do the trick. |
| 105 |
+# The port quasselcore will listen at. Default is: 4242 |
| 106 |
+PORT="4242" |
| 107 |
+ |
| 108 |
+# The directory holding datafiles like the Sqlite DB and the SSL Cert |
| 109 |
+DATADIR="/home/${QUASSEL_USER}/.quassel" |
Archives