From a8ec39d644a502c718b22c97f09b6c4a721629cc Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 29 Aug 2016 16:43:01 -0400 Subject: [PATCH] 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 --- files/etc/default/zuul-launcher | 4 ++++ files/etc/default/zuul-merger | 4 ++++ files/etc/default/zuul-server | 4 ++++ files/etc/init.d/zuul-launcher | 9 +++++---- files/etc/init.d/zuul-merger | 9 +++++---- files/etc/init.d/zuul-server | 9 +++++---- files/etc/sysconfig/zuul-launcher | 4 ++++ files/etc/sysconfig/zuul-merger | 4 ++++ files/etc/sysconfig/zuul-server | 4 ++++ files/etc/systemd/system/zuul-launcher.service | 2 +- files/etc/systemd/system/zuul-merger.service | 2 +- files/etc/systemd/system/zuul-server.service | 2 +- 12 files changed, 42 insertions(+), 15 deletions(-) diff --git a/files/etc/default/zuul-launcher b/files/etc/default/zuul-launcher index 602ac8e..9e84766 100644 --- a/files/etc/default/zuul-launcher +++ b/files/etc/default/zuul-launcher @@ -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 diff --git a/files/etc/default/zuul-merger b/files/etc/default/zuul-merger index 602ac8e..6f9b150 100644 --- a/files/etc/default/zuul-merger +++ b/files/etc/default/zuul-merger @@ -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 diff --git a/files/etc/default/zuul-server b/files/etc/default/zuul-server index 602ac8e..9f77105 100644 --- a/files/etc/default/zuul-server +++ b/files/etc/default/zuul-server @@ -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 diff --git a/files/etc/init.d/zuul-launcher b/files/etc/init.d/zuul-launcher index 0d63924..07fd3c5 100644 --- a/files/etc/init.d/zuul-launcher +++ b/files/etc/init.d/zuul-launcher @@ -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 diff --git a/files/etc/init.d/zuul-merger b/files/etc/init.d/zuul-merger index 3daf11a..5250bc0 100644 --- a/files/etc/init.d/zuul-merger +++ b/files/etc/init.d/zuul-merger @@ -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 diff --git a/files/etc/init.d/zuul-server b/files/etc/init.d/zuul-server index d548413..ef37a5e 100644 --- a/files/etc/init.d/zuul-server +++ b/files/etc/init.d/zuul-server @@ -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 diff --git a/files/etc/sysconfig/zuul-launcher b/files/etc/sysconfig/zuul-launcher index 602ac8e..9e84766 100644 --- a/files/etc/sysconfig/zuul-launcher +++ b/files/etc/sysconfig/zuul-launcher @@ -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 diff --git a/files/etc/sysconfig/zuul-merger b/files/etc/sysconfig/zuul-merger index 602ac8e..6f9b150 100644 --- a/files/etc/sysconfig/zuul-merger +++ b/files/etc/sysconfig/zuul-merger @@ -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 diff --git a/files/etc/sysconfig/zuul-server b/files/etc/sysconfig/zuul-server index 602ac8e..9f77105 100644 --- a/files/etc/sysconfig/zuul-server +++ b/files/etc/sysconfig/zuul-server @@ -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 diff --git a/files/etc/systemd/system/zuul-launcher.service b/files/etc/systemd/system/zuul-launcher.service index 71245e9..0b2b6fc 100644 --- a/files/etc/systemd/system/zuul-launcher.service +++ b/files/etc/systemd/system/zuul-launcher.service @@ -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 diff --git a/files/etc/systemd/system/zuul-merger.service b/files/etc/systemd/system/zuul-merger.service index 6a6d39c..ab9990a 100644 --- a/files/etc/systemd/system/zuul-merger.service +++ b/files/etc/systemd/system/zuul-merger.service @@ -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 diff --git a/files/etc/systemd/system/zuul-server.service b/files/etc/systemd/system/zuul-server.service index 180c500..0e0b3c1 100644 --- a/files/etc/systemd/system/zuul-server.service +++ b/files/etc/systemd/system/zuul-server.service @@ -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]