diff --git a/files/etc/default/zuul-web b/files/etc/default/zuul-web deleted file mode 100644 index 3482b32..0000000 --- a/files/etc/default/zuul-web +++ /dev/null @@ -1,10 +0,0 @@ -# This file is generated by Ansible -# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN -# - -# The prefix used when zuul-scheduler was installed. Be sure to update this value -# if you are using a virtualenv. -PREFIX=/usr/local - -# The user used to start zuul-scheduler service. -RUNASUSER=zuul diff --git a/templates/etc/systemd/system/zuul-executor.service b/templates/etc/systemd/system/zuul-executor.service index c2e0a14..afc9450 100644 --- a/templates/etc/systemd/system/zuul-executor.service +++ b/templates/etc/systemd/system/zuul-executor.service @@ -4,11 +4,10 @@ After=syslog.target network.target [Service] Type=simple -Environment="PREFIX=/usr/local" Group=zuul User=zuul -ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-executor -d" -ExecStop=/bin/sh -c "${PREFIX}/bin/zuul-executor stop" +ExecStart={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-executor -d +ExecStop={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-executor stop [Install] WantedBy=multi-user.target diff --git a/templates/etc/systemd/system/zuul-fingergw.service b/templates/etc/systemd/system/zuul-fingergw.service index 1853d97..815860f 100644 --- a/templates/etc/systemd/system/zuul-fingergw.service +++ b/templates/etc/systemd/system/zuul-fingergw.service @@ -4,11 +4,10 @@ After=syslog.target network.target [Service] Type=simple -Environment="PREFIX=/usr/local" Group=root User=root -ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-fingergw -d" -ExecStop=/bin/sh -c "${PREFIX}/bin/zuul-fingergw stop" +ExecStart={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-fingergw -d +ExecStop={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-fingergw stop [Install] WantedBy=multi-user.target diff --git a/templates/etc/systemd/system/zuul-merger.service b/templates/etc/systemd/system/zuul-merger.service index 940033b..874b7fa 100644 --- a/templates/etc/systemd/system/zuul-merger.service +++ b/templates/etc/systemd/system/zuul-merger.service @@ -4,11 +4,10 @@ After=syslog.target network.target [Service] Type=simple -Environment="PREFIX=/usr/local" Group=zuul User=zuul -ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-merger -d" -ExecStop=/bin/sh -c "${PREFIX}/bin/zuul-merger stop" +ExecStart={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-merger -d +ExecStop={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-merger stop [Install] WantedBy=multi-user.target diff --git a/templates/etc/systemd/system/zuul-scheduler.service b/templates/etc/systemd/system/zuul-scheduler.service index 96bf6b9..763078a 100644 --- a/templates/etc/systemd/system/zuul-scheduler.service +++ b/templates/etc/systemd/system/zuul-scheduler.service @@ -4,11 +4,10 @@ After=syslog.target network.target [Service] Type=simple -Environment="PREFIX=/usr/local" Group=zuul User=zuul -ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-scheduler -d" -ExecStop=/bin/sh -c "${PREFIX}/bin/zuul-scheduler stop" +ExecStart={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-scheduler -d +ExecStop={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-scheduler stop ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/templates/etc/systemd/system/zuul-web.service b/templates/etc/systemd/system/zuul-web.service index af565f1..40f65d4 100644 --- a/templates/etc/systemd/system/zuul-web.service +++ b/templates/etc/systemd/system/zuul-web.service @@ -4,10 +4,9 @@ After=syslog.target network.target [Service] Type=simple -Environment="PREFIX=/usr/local" Group=zuul User=zuul -ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-web -d" +ExecStart={{ zuul_pip_virtualenv | default('/usr/local') }}/bin/zuul-web -d [Install] WantedBy=multi-user.target