Add $PREFIX to server configuration files

Since it is possible for zuul to be installed into a virtualenv, we
need to expose the ability for a user to update the prefix for
services.

Change-Id: Ifb7e174a5ed338ed3d299e7e8a5deabd01b2f429
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-08-29 16:43:01 -04:00
parent 242a1c0460
commit a8ec39d644
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
12 changed files with 42 additions and 15 deletions

View File

@ -1,3 +1,7 @@
# This file is generated by Ansible
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
#
# The prefix used when zuul-launcher was installed. Be sure to update this value
# if you are using a virtualenv.
PREFIX=/usr

View File

@ -1,3 +1,7 @@
# This file is generated by Ansible
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
#
# The prefix used when zuul-merger was installed. Be sure to update this value
# if you are using a virtualenv.
PREFIX=/usr

View File

@ -1,3 +1,7 @@
# This file is generated by Ansible
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
#
# The prefix used when zuul-server was installed. Be sure to update this value
# if you are using a virtualenv.
PREFIX=/usr

View File

@ -15,17 +15,18 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Zuul Launcher"
NAME=zuul-launcher
DAEMON=/usr/local/bin/zuul-launcher
PIDFILE=/var/run/$NAME/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
USER=zuul
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
# Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
DAEMON=$PREFIX/bin/zuul-launcher
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
# Load the VERBOSE setting and other rcS variables
. /lib/init/vars.sh

View File

@ -15,17 +15,18 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Zuul Merger"
NAME=zuul-merger
DAEMON=/usr/local/bin/zuul-merger
PIDFILE=/var/run/$NAME/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
USER=zuul
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
# Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
DAEMON=$PREFIX/bin/zuul-merger
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
# Load the VERBOSE setting and other rcS variables
. /lib/init/vars.sh

View File

@ -13,17 +13,18 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Zuul"
NAME=zuul-server
DAEMON=/usr/local/bin/zuul-server
PIDFILE=/var/run/$NAME/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
USER=zuul
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
# Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
DAEMON=$PREFIX/bin/zuul-server
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
# Load the VERBOSE setting and other rcS variables
. /lib/init/vars.sh

View File

@ -1,3 +1,7 @@
# This file is generated by Ansible
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
#
# The prefix used when zuul-launcher was installed. Be sure to update this value
# if you are using a virtualenv.
PREFIX=/usr

View File

@ -1,3 +1,7 @@
# This file is generated by Ansible
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
#
# The prefix used when zuul-merger was installed. Be sure to update this value
# if you are using a virtualenv.
PREFIX=/usr

View File

@ -1,3 +1,7 @@
# This file is generated by Ansible
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
#
# The prefix used when zuul-server was installed. Be sure to update this value
# if you are using a virtualenv.
PREFIX=/usr

View File

@ -7,7 +7,7 @@ Type=simple
User=zuul
Group=zuul
EnvironmentFile=-/etc/sysconfig/zuul-launcher
ExecStart=/usr/bin/zuul-launcher -d
ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-launcher -d"
[Install]
WantedBy=multi-user.target

View File

@ -7,7 +7,7 @@ Type=simple
User=zuul
Group=zuul
EnvironmentFile=-/etc/sysconfig/zuul-merger
ExecStart=/usr/bin/zuul-merger -d
ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-merger -d"
[Install]
WantedBy=multi-user.target

View File

@ -7,7 +7,7 @@ Type=simple
User=zuul
Group=zuul
EnvironmentFile=-/etc/sysconfig/zuul-server
ExecStart=/usr/bin/zuul-server -d
ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-server -d"
ExecReload=/bin/kill -HUP $MAINPID
[Install]