diff options
| author | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2011-11-09 23:02:27 +0000 |
|---|---|---|
| committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2011-11-09 23:02:27 +0000 |
| commit | daa5b7849f4a1bca689f4a589b71465885fb79f6 (patch) | |
| tree | 61f5b3f1165c61cfa9e40e8babcf4b711ebcbd0f | |
| parent | a5b0049c34e74c5725f31c615254464fe8d61de8 (diff) | |
| download | pykolab-daa5b7849f4a1bca689f4a589b71465885fb79f6.tar.gz | |
Have the sysvinit scripts make use of the -p option
Fix default PID file location for kolab-saslauthd
| -rw-r--r-- | kolabd/kolabd.sysvinit | 2 | ||||
| -rw-r--r-- | saslauthd/__init__.py | 2 | ||||
| -rw-r--r-- | saslauthd/kolab-saslauthd.sysvinit | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kolabd/kolabd.sysvinit b/kolabd/kolabd.sysvinit index ec876c0..6661128 100644 --- a/kolabd/kolabd.sysvinit +++ b/kolabd/kolabd.sysvinit @@ -40,7 +40,7 @@ pidfile=/var/run/kolabd/kolabd.pid start() { [ -x $path ] || exit 5 echo -n $"Starting $prog: " - daemon $DAEMONOPTS $path $FLAGS + daemon $DAEMONOPTS $path -p $pidfile $FLAGS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile diff --git a/saslauthd/__init__.py b/saslauthd/__init__.py index 9756c54..c0951cb 100644 --- a/saslauthd/__init__.py +++ b/saslauthd/__init__.py @@ -55,7 +55,7 @@ class SASLAuthDaemon(object): daemon_group.add_option( "-p", "--pid-file", dest = "pidfile", action = "store", - default = "/var/run/kolabd/kolabd.pid", + default = "/var/run/kolab-saslauthd/kolab-saslauthd.pid", help = _("Path to the PID file to use.")) conf.finalize_conf() diff --git a/saslauthd/kolab-saslauthd.sysvinit b/saslauthd/kolab-saslauthd.sysvinit index a72eab9..f924957 100644 --- a/saslauthd/kolab-saslauthd.sysvinit +++ b/saslauthd/kolab-saslauthd.sysvinit @@ -39,7 +39,7 @@ pidfile=/var/run/kolab-saslauthd/kolab-saslauthd.pid start() { [ -x $path ] || exit 5 echo -n $"Starting $prog: " - daemon $DAEMONOPTS $path $FLAGS + daemon $DAEMONOPTS $path -p $pidfile $FLAGS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile |