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:
parent
242a1c0460
commit
a8ec39d644
@ -1,3 +1,7 @@
|
|||||||
# This file is generated by Ansible
|
# This file is generated by Ansible
|
||||||
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
|
# 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
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
# This file is generated by Ansible
|
# This file is generated by Ansible
|
||||||
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
|
# 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
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
# This file is generated by Ansible
|
# This file is generated by Ansible
|
||||||
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
|
# 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
|
||||||
|
@ -15,17 +15,18 @@
|
|||||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||||
DESC="Zuul Launcher"
|
DESC="Zuul Launcher"
|
||||||
NAME=zuul-launcher
|
NAME=zuul-launcher
|
||||||
DAEMON=/usr/local/bin/zuul-launcher
|
|
||||||
PIDFILE=/var/run/$NAME/$NAME.pid
|
PIDFILE=/var/run/$NAME/$NAME.pid
|
||||||
SCRIPTNAME=/etc/init.d/$NAME
|
SCRIPTNAME=/etc/init.d/$NAME
|
||||||
USER=zuul
|
USER=zuul
|
||||||
|
|
||||||
# Exit if the package is not installed
|
|
||||||
[ -x "$DAEMON" ] || exit 0
|
|
||||||
|
|
||||||
# Read configuration variable file if it is present
|
# Read configuration variable file if it is present
|
||||||
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
|
[ -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
|
# Load the VERBOSE setting and other rcS variables
|
||||||
. /lib/init/vars.sh
|
. /lib/init/vars.sh
|
||||||
|
|
||||||
|
@ -15,17 +15,18 @@
|
|||||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||||
DESC="Zuul Merger"
|
DESC="Zuul Merger"
|
||||||
NAME=zuul-merger
|
NAME=zuul-merger
|
||||||
DAEMON=/usr/local/bin/zuul-merger
|
|
||||||
PIDFILE=/var/run/$NAME/$NAME.pid
|
PIDFILE=/var/run/$NAME/$NAME.pid
|
||||||
SCRIPTNAME=/etc/init.d/$NAME
|
SCRIPTNAME=/etc/init.d/$NAME
|
||||||
USER=zuul
|
USER=zuul
|
||||||
|
|
||||||
# Exit if the package is not installed
|
|
||||||
[ -x "$DAEMON" ] || exit 0
|
|
||||||
|
|
||||||
# Read configuration variable file if it is present
|
# Read configuration variable file if it is present
|
||||||
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
|
[ -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
|
# Load the VERBOSE setting and other rcS variables
|
||||||
. /lib/init/vars.sh
|
. /lib/init/vars.sh
|
||||||
|
|
||||||
|
@ -13,17 +13,18 @@
|
|||||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||||
DESC="Zuul"
|
DESC="Zuul"
|
||||||
NAME=zuul-server
|
NAME=zuul-server
|
||||||
DAEMON=/usr/local/bin/zuul-server
|
|
||||||
PIDFILE=/var/run/$NAME/$NAME.pid
|
PIDFILE=/var/run/$NAME/$NAME.pid
|
||||||
SCRIPTNAME=/etc/init.d/$NAME
|
SCRIPTNAME=/etc/init.d/$NAME
|
||||||
USER=zuul
|
USER=zuul
|
||||||
|
|
||||||
# Exit if the package is not installed
|
|
||||||
[ -x "$DAEMON" ] || exit 0
|
|
||||||
|
|
||||||
# Read configuration variable file if it is present
|
# Read configuration variable file if it is present
|
||||||
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
|
[ -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
|
# Load the VERBOSE setting and other rcS variables
|
||||||
. /lib/init/vars.sh
|
. /lib/init/vars.sh
|
||||||
|
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
# This file is generated by Ansible
|
# This file is generated by Ansible
|
||||||
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
|
# 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
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
# This file is generated by Ansible
|
# This file is generated by Ansible
|
||||||
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
|
# 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
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
# This file is generated by Ansible
|
# This file is generated by Ansible
|
||||||
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
|
# 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
|
||||||
|
@ -7,7 +7,7 @@ Type=simple
|
|||||||
User=zuul
|
User=zuul
|
||||||
Group=zuul
|
Group=zuul
|
||||||
EnvironmentFile=-/etc/sysconfig/zuul-launcher
|
EnvironmentFile=-/etc/sysconfig/zuul-launcher
|
||||||
ExecStart=/usr/bin/zuul-launcher -d
|
ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-launcher -d"
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
@ -7,7 +7,7 @@ Type=simple
|
|||||||
User=zuul
|
User=zuul
|
||||||
Group=zuul
|
Group=zuul
|
||||||
EnvironmentFile=-/etc/sysconfig/zuul-merger
|
EnvironmentFile=-/etc/sysconfig/zuul-merger
|
||||||
ExecStart=/usr/bin/zuul-merger -d
|
ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-merger -d"
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
@ -7,7 +7,7 @@ Type=simple
|
|||||||
User=zuul
|
User=zuul
|
||||||
Group=zuul
|
Group=zuul
|
||||||
EnvironmentFile=-/etc/sysconfig/zuul-server
|
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
|
ExecReload=/bin/kill -HUP $MAINPID
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user