Developers of Sympa

[Guillaume Rousse <address@concealed>]

Hello.

The attached patch does the following:
- it remove 3 options from the configure script (piddir, lockdir, initdir)
- it stop substituting them in the sympa initscript template
- it stop installing the sympa initscript
- it transfers the no-more-a-template initscript from sources directory 
to documentation directory, as a sample
- it turns SYMPA::PIDDIR constant into a piddir configuration directive, 
as other directories

The benefits are:
- code simplification, especially in non-critical part of the project 
(installation)
- more consistency in configuration handling, by making all runtime 
directories part of the configuration (currently, tempdir is 
configurable, piddir isn't)
The configuration change will benefits to all users, whatever their 
installation method.

This change will negatively affects only users installing from sources 
AND using a standard sysinit init system: users installing from packages 
won't be affected. And the change is quite minimal: instead of passing 
switches to the configure script, they'll have to manually install and 
adapt the script themselves.

Remember also than sysinit is more and more deprecated, in favor of 
alternatives such as systemd or upstart. It will far easier for us to 
just document and provide relevant samples, rather than actively support 
each alternative by introducing additional switches and complexity into 
our installation procedure.
--
Guillaume Rousse
INRIA, Direction des systèmes d'information
Domaine de Voluceau
Rocquencourt - BP 105
78153 Le Chesnay
Tel: 01 39 63 58 31
Index: configure.ac
===================================================================
--- configure.ac	(révision 10787)
+++ configure.ac	(copie de travail)
@@ -25,9 +25,6 @@
 AM_PO_SUBDIRS
 
 # only define custom variables
-initdir=$sysconfdir/rc.d/init.d
-piddir=$localstatedir/run/sympa
-lockdir=$localstatedir/lock/subsys
 modulesdir=$datadir/sympa/lib
 scriptdir=$datadir/sympa/bin
 defaultdir=$datadir/sympa/default
@@ -40,9 +37,6 @@
 confdir=$sysconfdir
  
 # substitute custom variables
-AC_SUBST(initdir)
-AC_SUBST(piddir)
-AC_SUBST(lockdir)
 AC_SUBST(modulesdir)
 AC_SUBST(scriptdir)
 AC_SUBST(defaultdir)
@@ -118,33 +112,6 @@
 )
 
 AC_ARG_WITH(
-    initdir,
-    AS_HELP_STRING(
-	[--with-initdir=DIR],
-	[install System V init script @<:@SYSCONFDIR/rc.d/init.d@:>@]
-    ),
-    [initdir="$withval"]
-)
-
-AC_ARG_WITH(
-    lockdir,
-    AS_HELP_STRING(
-	[--with-lockdir=DIR],
-	[lock files @<:@LOCALSTATEDIR/lock/subsys@:>@]
-    ),
-    [lockdir="$withval"]
-)
-
-AC_ARG_WITH(
-    piddir,
-    AS_HELP_STRING(
-	[--with-piddir=DIR],
-	[.pid files @<:@LOCALSTATEDIR/run@:>@]
-    ),
-    [piddir="$withval"]
-)
-
-AC_ARG_WITH(
     modulesdir,
     AS_HELP_STRING(
 	[--with-modulesdir=DIR],
@@ -353,8 +320,6 @@
 AC_CONFIG_FILES([
     Makefile
     src/Makefile
-    src/etc/Makefile
-    src/etc/script/Makefile
     src/lib/Makefile
     src/libexec/Makefile
     src/cgi/Makefile
Index: doc/samples/sympa.init
===================================================================
--- doc/samples/sympa.init	(révision 10787)
+++ doc/samples/sympa.init	(copie de travail)
@@ -14,9 +14,9 @@
 # chkconfig: 345 95 05
 # description: Sympa is a powerful mailing list management system.
 
-if [ -f --initdir--/functions ]; then
+if [ -f /etc/init.d/functions ]; then
     # Source function library.
-    . --initdir--/functions
+    . /etc/init.d/functions
     
     ## Set a flag 
     use_functions=1
@@ -25,12 +25,12 @@
 # Sympa parameters
 
 # Sympa binaries directory
-sympadir="--sbindir--"
+sympadir="/usr/sbin"
 # Sympa config files directory
-sympaconf="--CONFIG--"
+sympaconf="/etc/sympa"
 
-sympapiddir="--piddir--"
-sympalockdir="--lockdir--"
+sympapiddir="/var/run"
+sympalockdir="/var/lock"
 
 
 
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(révision 10787)
+++ src/Makefile.am	(copie de travail)
@@ -18,4 +18,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-SUBDIRS = etc lib cgi sbin libexec bin
+SUBDIRS = lib cgi sbin libexec bin
Index: src/etc/Makefile.am
===================================================================
--- src/etc/Makefile.am	(révision 10787)
+++ src/etc/Makefile.am	(copie de travail)
@@ -1,18 +0,0 @@
-# Sympa - SYsteme de Multi-Postage Automatique
-# Copyright (c) 1997, 1998, 1999, 2000, 2001 Comite Reseau des Universites
-# Copyright (c) 1997,1998, 1999 Institut Pasteur & Christophe Wolfhugel
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-SUBDIRS = script
Index: src/etc/script/Makefile.am
===================================================================
--- src/etc/script/Makefile.am	(révision 10787)
+++ src/etc/script/Makefile.am	(copie de travail)
@@ -1,39 +0,0 @@
-# Makefile - This Makefile does the Sympa scripts installation
-# RCS Identication ; $Revision$ ; $Date$ 
-#
-# Sympa - SYsteme de Multi-Postage Automatique
-# Copyright (c) 1997, 1998, 1999, 2000, 2001 Comite Reseau des Universites
-# Copyright (c) 1997,1998, 1999 Institut Pasteur & Christophe Wolfhugel
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-init_SCRIPTS = sympa
-
-EXTRA_DIST = sympa.in
-
-CLEANFILES = $(init_SCRIPTS)
-
-sympa: Makefile
-	rm -f $@
-	$(AM_V_GEN)$(SED) \
-		-e 's|--CONFIG--|$(CONFIG)|' \
-		-e 's|--WWSCONFIG--|$(WWSCONFIG)|' \
-		-e 's|--sbindir--|$(sbindir)|' \
-		-e 's|--initdir--|$(initdir)|' \
-		-e 's|--piddir--|$(piddir)|' \
-		-e 's|--lockdir--|$(lockdir)|' \
-		< $(srcdir)/$@.in > $@
-	chmod +x $@
-
-sympa: sympa.in
Index: src/etc/script/sympa.in
===================================================================
--- src/etc/script/sympa.in	(révision 10787)
+++ src/etc/script/sympa.in	(copie de travail)
@@ -1,303 +0,0 @@
-#!/bin/sh
-#
-# sympa			Mailing Lists Management System
-#
-# Written by Michel Bouissou  20/07/2000
-#
-# Modified by Olivier Salaun 27/07/2000
-#    - translations
-#    - lang parameter deleted (defined in sympa.conf)
-#    - introduced --VARS-- parsed by Makefile
-#    - no more sympauser since sympa sets its UID
-# Modified by Michel Bouissou  27/07/2000
-#
-# chkconfig: 345 95 05
-# description: Sympa is a powerful mailing list management system.
-
-if [ -f --initdir--/functions ]; then
-    # Source function library.
-    . --initdir--/functions
-    
-    ## Set a flag 
-    use_functions=1
-fi
-
-# Sympa parameters
-
-# Sympa binaries directory
-sympadir="--sbindir--"
-# Sympa config files directory
-sympaconf="--CONFIG--"
-
-sympapiddir="--piddir--"
-sympalockdir="--lockdir--"
-
-
-
-if [ -f /etc/sysconfig/network ]; then
-    # Get config.
-    . /etc/sysconfig/network
-fi
-
-# OSTYPE is not defined on Solaris
-if [ ! "${OSTYPE}" ]; then
-    OSTYPE=`uname -s`
-fi
-
-# OSTYPE *is* defined on Solaris 10! (bug #3149)
-case "$OSTYPE" in
-        *solaris*)
-        OSTYPE=SunOS
-        ;;
-esac
-
-if [ -f /etc/SuSE-release ] ; then
-    OSTYPE='Suse'
-fi
-
-if [ -f /etc/debian_version ] ; then
-    OSTYPE='Debian'
-fi
-
-if [ -f /etc/slackware-version ] ; then
-    OSTYPE='Slack'
-fi
-
-
-##'echo -n' not supported with SH on Solaris
-if [ ${OSTYPE} = "SunOS" ]; then
-  echo_opt=""
-else
-  echo_opt="-n"
-fi
-
-# End of parameters
-
-# Current state of the module
-sympa_status() {
-    # Test syntax.
-    if [ $# = 0 ] ; then
-        echo "Usage: sympa_status {program}"
-        return 1
-    fi
- 
-    if [ ${use_functions} ]; then
-
-      status $1.pl
-
-    else
-       # First try "/u1/home/sympa/*.pid" files
-       if [ -f ${sympapiddir}/$1.pid ] ; then
-             pid=`head -1 ${sympapiddir}/$1.pid | tr -s ' ' '|'`
-             if [ "$pid" != "" ] ; then
-                 running=`ps -A | egrep "$pid"`
-                 if [ "$running" != "" ]; then
-                     echo "$1 (pid(s) $pid) is active..."
-                     return 0
-                 else
-                     echo "$1 died, pid file remains."
-                     return 1
-                 fi
-             fi
-        fi
-        echo "$1 is stopped."
-        return 3
-    fi
-}
-
-# Health check
-sympa_check() {
-	echo $echo_opt "Checking environment: "
-	if [ ${use_functions} ]; then
-		$sympadir/sympa.pl --health_check && success || failure
-		return $?
-	else
-		if $sympadir/sympa.pl --health_check; then
-			echo "success"
-			return 0
-		else
-			echo "failure"
-			return 1
-		fi
-	fi
-        echo
-}
-
-# Start a module
-sympa_module_start() {
-    if [ $# = 0 ] ; then
-        echo "Usage: sympa_module_start {program}"
-        return 1
-    fi
-
-#	if [ $1 = "sympa" -a $lang != "" ]; then
-#		startparam="-l $lang"
-#	else
-#		startparam=""
-#	fi
- 
-	if [ ${use_functions} ]; then
-		$sympadir/$1.pl $startparam && success || failure
-	else
-		$sympadir/$1.pl $startparam && echo "success" || echo "failure"
-	fi
-	echo
-}
-
-# Test state of module before startup
-sympa_start() {
-    if [ $# = 0 ] ; then
-        echo "Usage: sympa_start {program}"
-        return 1
-    fi
- 
-	sympa_status $1 > /dev/null
-	case "$?" in
-		3)
-			echo $echo_opt "Starting module $1.pl: "
-			sympa_module_start $1
-			;;
-		1) 
-			echo $echo_opt "Starting $1, overwriting old pid file."
-			sympa_module_start $1
-			;;
-		0)
-			echo "$1 seems active. No action will be taken."
-			echo "Try \"sympa status\" or \"sympa restart"\".
-			;;
-	esac
-}
-
-# Stop a module
-sympa_stop() {
-    if [ $# = 0 ] ; then
-        echo "Usage: sympa_stop {program}"
-        return 1
-    fi
- 
-    if [ -f ${sympapiddir}/$1.pid ]; then
-	echo $echo_opt "Stopping module $1.pl: "
-	pids=`head -1 ${sympapiddir}/$1.pid`
-	runcount=0
-	if [ "$pids" != "" ]; then
-	    for pid in $pids; do
-		killcount=0
-		running=`ps -A | grep "$pid ..* $1\\.pl"`
-		while [ "$running" != "" ]; do
-		    if [ $killcount -gt 10 ]; then
-			if [ ${use_functions} ]; then
-			    failure
-			else
-			    echo 'failure'
-			fi
-			return 3
-		    fi
-
-		    kill -TERM $pid >/dev/null 2>&1
-		    running=`ps -A | grep "$pid ..* $1\\.pl"`
-		    if [ "$running" = "" ]; then
-			runcount=`expr $runcount + 1`
-			break
-		    fi
-		    sleep 2
-		    running=`ps -A | grep "$pid ..* $1\\.pl"`
-		    if [ "$running" = "" ]; then
-			runcount=`expr $runcount + 1`
-			break
-		    fi
-		    killcount=`expr $killcount + 1`
-		done
-	    done
-	fi
-	if [ $runcount -gt 0 ]; then
-	    if [ ${use_functions} ]; then
-		success
-	    else
-		echo 'success'
-	    fi
-	else
-	    echo 'died'
-	fi
-	echo
-    else
-	echo "Module $1.pl not running"
-    fi
-    return 0
-}
-
-
-# Check that networking is up.
-if [ ${OSTYPE} != "Slack" -a ${OSTYPE} != "FreeBSD" -a ${OSTYPE} != "SunOS" -a ${OSTYPE} != "darwin7.0" -a ${OSTYPE} != "Debian" -a ${OSTYPE} != "Suse" ]; then
-    if [ ${NETWORKING} = "no" ]
-    then
-	    exit 0
-    fi
-fi
-
-# Check config files
-[ -d $sympadir ] || exit 0
-[ -f $sympaconf ] || exit 0
-
-# See how we were called.
-case "$1" in
-  start)
-	if [ ! -f ${sympalockdir}/sympa ]; then
-		echo "Starting Sympa subsystem: "
-		sympa_check || exit 1
-		sympa_start sympa
-		sympa_start bulk
-		sympa_start archived
-		sympa_start bounced
-		sympa_start task_manager
-		touch ${sympalockdir}/sympa
-		echo
-	else
-
-		echo "Sympa seems active. No action will be taken."
-		echo "Try \"sympa status\" or \"sympa restart"\".
-
-	fi
-	;;
-  stop)
-	echo "Stopping Sympa subsystem: "
-	sympa_stop bounced
-	sympa_stop archived
-	sympa_stop bulk
-	sympa_stop sympa
-	#if [ -f ${sympapiddir}/sympa-distribute.pid ]; then
-	#	sympa_stop sympa-distribute
-	#fi
-	if [ -f ${sympapiddir}/sympa-creation.pid ]; then
-		sympa_stop sympa-creation
-	fi
-	sympa_stop task_manager
-	if [ -f ${sympalockdir}/sympa ]; then
-		rm -f ${sympalockdir}/sympa
-	fi
-	;;
-  status)
-	echo "Status of Sympa subsystem: "
-	if [ -f ${sympalockdir}/sympa ]; then
-		echo "Status file for subsystem found."
-	else
-		echo "Status file for subsystem NOT found."
-	fi
-	sympa_status sympa
-	sympa_status bulk
-	sympa_status archived
-	sympa_status bounced
-	sympa_status task_manager
-	;;
-  restart)
-	echo "Restarting Sympa subsystem: "
-	$0 stop && $0 start
-	echo
-	;;
-  *)
-	echo "Usage: $0 {start|stop|status|restart}"
-	exit 1
-	;;
-esac
-
-exit 0
-
Index: src/lib/Sympa/Constants.pm.in
===================================================================
--- src/lib/Sympa/Constants.pm.in	(révision 10787)
+++ src/lib/Sympa/Constants.pm.in	(copie de travail)
@@ -33,7 +33,6 @@
 use constant WWSCONFIG        => '--WWSCONFIG--';
 use constant SENDMAIL_ALIASES => '--SENDMAIL_ALIASES--';
 
-use constant PIDDIR     => '--piddir--';
 use constant EXPLDIR    => '--expldir--';
 use constant SPOOLDIR   => '--spooldir--';
 use constant SYSCONFDIR => '--sysconfdir--';
Index: src/sbin/archived.pl.in
===================================================================
--- src/sbin/archived.pl.in	(révision 10789)
+++ src/sbin/archived.pl.in	(copie de travail)
@@ -218,7 +218,7 @@
 # check presence of a PID file from a previous execution
 Sympa::Tools::Daemon::check_old_pid_file(
     name   => 'archived',
-    piddir => Sympa::Constants::PIDDIR,
+    piddir => Sympa::Site->piddir(),
     tmpdir => Sympa::Site->tmpdir(),
 );
 
@@ -226,7 +226,7 @@
 Sympa::Tools::Daemon::write_pid(
     name   => 'archived',
     pid    => $PID,
-    piddir => Sympa::Constants::PIDDIR,
+    piddir => Sympa::Site->piddir(),
     user   => Sympa::Constants::USER,
     group  => Sympa::Constants::GROUP,
 );
@@ -503,7 +503,7 @@
 Sympa::Tools::Daemon::remove_pid(
     name   => 'archived',
     pid    => $PID,
-    piddir => Sympa::Constants::PIDDIR,
+    piddir => Sympa::Site->piddir(),
     tmpdir => Sympa::Site->tmpdir(),
 );
 
Index: src/sbin/bounced.pl.in
===================================================================
--- src/sbin/bounced.pl.in	(révision 10789)
+++ src/sbin/bounced.pl.in	(copie de travail)
@@ -219,7 +219,7 @@
 # check presence of a PID file from a previous execution
 Sympa::Tools::Daemon::check_old_pid_file(
     name   => 'bounced',
-    piddir => Sympa::Constants::PIDDIR,
+    piddir => Sympa::Site->piddir(),
     tmpdir => Sympa::Site->tmpdir(),
 );
 
@@ -227,7 +227,7 @@
 Sympa::Tools::Daemon::write_pid(
     name   => 'bounced',
     pid    => $PID,
-    piddir => Sympa::Constants::PIDDIR,
+    piddir => Sympa::Site->piddir(),
     user   => Sympa::Constants::USER,
     group  => Sympa::Constants::GROUP,
 );
@@ -343,7 +343,7 @@
 Sympa::Tools::Daemon::remove_pid(
     name   => 'bounced',
     pid    => $PID,
-    piddir => Sympa::Constants::PIDDIR,
+    piddir => Sympa::Site->piddir(),
     tmpdir => Sympa::Site->tmpdir(),
 );
 
Index: src/sbin/bulk.pl.in
===================================================================
--- src/sbin/bulk.pl.in	(révision 10789)
+++ src/sbin/bulk.pl.in	(copie de travail)
@@ -193,7 +193,7 @@
 # check presence of a PID file from a previous execution
 Sympa::Tools::Daemon::check_old_pid_file(
     name   => 'task_manager',
-    piddir => Sympa::Constants::PIDDIR,
+    piddir => Sympa::Site->piddir(),
     tmpdir => Sympa::Site->tmpdir(),
 );
 
@@ -201,7 +201,7 @@
 Sympa::Tools::Daemon::write_pid(
     name   => 'bulk',
     pid    => $PID,
-    piddir => Sympa::Constants::PIDDIR,
+    piddir => Sympa::Site->piddir(),
     user   => Sympa::Constants::USER,
     group  => Sympa::Constants::GROUP,
 );
@@ -210,7 +210,7 @@
 unless ($options{'foreground'}) {
     Sympa::Tools::Daemon::direct_stderr_to_file(
         pid    => $PID,
-        tmpdir => Sympa::Site->tmpdir(),
+        piddir => Sympa::Site->piddir(),
         user   => Sympa::Constants::USER,
         group  => Sympa::Constants::GROUP,
     );
@@ -301,7 +301,7 @@
                 );
                 my $pids_in_pfile = Sympa::Tools::Daemon::get_pids_in_pid_file(
                     name   => 'bulk',
-                    piddir => Sympa::Constants::PIDDIR,
+                    piddir => Sympa::Site->piddir(),
                 );
                 foreach my $fpid (@{$pids_in_pfile}) {
                     if (defined $dead_children{$fpid}) {
@@ -317,7 +317,7 @@
                         Sympa::Tools::Daemon::remove_pid(
                             name             => 'bulk',
                             pid              => $fpid,
-                            piddir           => Sympa::Constants::PIDDIR,
+                            piddir           => Sympa::Site->piddir(),
                             tmpdir           => Sympa::Site->tmpdir(),
                             multiple_process => 1
                         );
@@ -328,13 +328,13 @@
             }
             my $pids_in_pfile = Sympa::Tools::Daemon::get_pids_in_pid_file(
                 name   => 'bulk',
-                piddir => Sympa::Constants::PIDDIR,
+                piddir => Sympa::Site->piddir(),
             );
             unless (defined($pids_in_pfile)) {
                 Sympa::Tools::Daemon::write_pid(
                     name             => 'bulk',
                     pid              => $PID,
-                    piddir           => Sympa::Constants::PIDDIR,
+                    piddir           => Sympa::Site->piddir(),
                     tmpdir           => Sympa::Site->tmpdir(),
                     user             => Sympa::Constants::USER,
                     group            => Sympa::Constants::GROUP,
@@ -385,7 +385,7 @@
                             Sympa::Tools::Daemon::write_pid(
                                 name             => 'bulk',
                                 pid              => $child_pid,
-                                piddir           => Sympa::Constants::PIDDIR,
+                                piddir           => Sympa::Site->piddir(),
                                 tmpdir           => Sympa::Site->tmpdir(),
                                 user             => Sympa::Constants::USER,
                                 group            => Sympa::Constants::GROUP,
@@ -664,7 +664,7 @@
 Sympa::Tools::Daemon::remove_pid(
     name             => 'bulk',
     pid              => $PID,
-    piddir           => Sympa::Constants::PIDDIR,
+    piddir           => Sympa::Site->piddir(),
     tmpdir           => Sympa::Site->tmpdir(),
     multiple_process => 1
 );
Index: src/sbin/sympa.pl.in
===================================================================
--- src/sbin/sympa.pl.in	(révision 10789)
+++ src/sbin/sympa.pl.in	(copie de travail)
@@ -368,7 +368,7 @@
         # check presence of a PID file from a previous execution
         Sympa::Tools::Daemon::check_old_pid_file(
             name   => 'sympa',
-            piddir => Sympa::Constants::PIDDIR,
+            piddir => Sympa::Site->piddir(),
             tmpdir => Sympa::Site->tmpdir(),
         );
 
@@ -376,7 +376,7 @@
         Sympa::Tools::Daemon::write_pid(
             name   => 'sympa',
             pid    => $PID,
-            piddir => Sympa::Constants::PIDDIR,
+            piddir => Sympa::Site->piddir(),
             user   => Sympa::Constants::USER,
             group  => Sympa::Constants::GROUP,
         );
@@ -585,7 +585,7 @@
 Sympa::Tools::Daemon::remove_pid(
     name   => 'sympa',
     pid    => $PID,
-    piddir => Sympa::Constants::PIDDIR,
+    piddir => Sympa::Site->piddir(),
     tmpdir => Sympa::Site->tmpdir(),
 );
 
Index: src/sbin/task_manager.pl.in
===================================================================
--- src/sbin/task_manager.pl.in	(révision 10789)
+++ src/sbin/task_manager.pl.in	(copie de travail)
@@ -68,9 +68,6 @@
 
 F<--spooldir--/task/> directory for task spool.
 
-F<--piddir--/task_manager.pid> this file contains the process ID
-of F<task_manager.pl>.
-
 =head1 MORE DOCUMENTATION
 
 The full documentation in HTML and PDF formats can be
@@ -185,7 +182,7 @@
 # check presence of a PID file from a previous execution
 Sympa::Tools::Daemon::check_old_pid_file(
     name   => 'task_manager',
-    piddir => Sympa::Constants::PIDDIR,
+    piddir => Sympa::Site->piddid(),
     tmpdir => Sympa::Site->tmpdir(),
 );
 
@@ -193,7 +190,7 @@
 Sympa::Tools::Daemon::write_pid(
     name   => 'task_manager',
     pid    => $PID,
-    piddir => Sympa::Constants::PIDDIR,
+    piddir => Sympa::Site->piddid(),
     user   => Sympa::Constants::USER,
     group  => Sympa::Constants::GROUP,
 );
@@ -310,7 +307,7 @@
 Sympa::Tools::Daemon::remove_pid(
     name   => 'task_manager',
     pid    => $PID,
-    piddir => Sympa::Constants::PIDDIR,
+    piddir => Sympa::Site->piddid(),
     tmpdir => Sympa::Site->tmpdir(),
 );

Attachment: smime.p7s
Description: Signature cryptographique S/MIME