--- tracd.in.orig 2014-01-24 04:14:07.000000000 +0400 +++ tracd.in 2018-06-24 10:32:46.000000000 +0300 @@ -18,11 +18,13 @@ # tracd_port (str): The port number to bind to, 80 by default. # tracd_pidfile (str): When daemonizing, file to which to write pid # if not to /var/run/tracd.pid. -# tracd_envdir (str): Directory of the project environments. Set to -# "/home/trac" by default. -# tracd_env (str): The project environment name while using single -# environment mode. The default is empty, meaning -# multiproject mode. +# tracd_envparent (str): Directory of parent project environments +# (multiple projects). Set to "/home/trac" by +# default. Set to empty , meaning single project +# mode. +# tracd_envsingle (str): The project environment name while using single +# environment mode. The default is empty, meaning +# multiple projects mode. # tracd_args (str): Extra arguments passed to tracd startup # command. Empty by default. # @@ -36,8 +38,8 @@ tracd_listen=${tracd_listen:-"0.0.0.0"} tracd_port=${tracd_port:-"80"} tracd_pidfile=${tracd_pidfile:-"/var/run/tracd.pid"} -tracd_envdir=${tracd_envdir:-"/home/trac"} -tracd_env=${tracd_env:-""} +tracd_envparent=${tracd_envparent:-"/home/trac"} +tracd_envsingle=${tracd_envsingle:-""} tracd_args=${tracd_args:-""} load_rc_config ${name} @@ -45,14 +47,14 @@ command_args="--daemonize --hostname=${tracd_listen} --port=${tracd_port}" command_args="${command_args} --pidfile=${tracd_pidfile} ${tracd_args}" -required_dirs=${tracd_envdir} pidfile=${tracd_pidfile} -if [ -z "${tracd_env}" ]; then - _trac_env="--env-parent-dir ${tracd_envdir}" +if [ -z "${tracd_envsingle}" ]; then + _trac_env="--env-parent-dir ${tracd_envparent}" + required_dirs=${tracd_envparent} else - _trac_env="${tracd_envdir}/${tracd_env}" - command_args="${command_args} --single-env" + _trac_env="--single-env ${tracd_envsingle}" + required_dirs=${tracd_envsingle} fi command_args="%%PREFIX%%/bin/tracd ${command_args} ${_trac_env}"