From a9d86a36207b94b72c303d743a9001c52838c288 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 26 Apr 2016 15:04:32 -0700 Subject: [PATCH] install: Add DEPLOYMENT_TYPE variable. --- scripts/lib/install | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/lib/install b/scripts/lib/install index 615f28748e..6e7515a29a 100755 --- a/scripts/lib/install +++ b/scripts/lib/install @@ -3,10 +3,12 @@ set -xe # Assumes we've already been untarred -# Specify options for apt +# Specify options for apt. APT_OPTIONS="${APT_OPTIONS:-}" -# Install additional packages using apt +# Install additional packages using apt. ADDITIONAL_PACKAGES=${ADDITIONAL_PACKAGES:-} +# Deployment type is almost always voyager. +DEPLOYMENT_TYPE="${DEPLOYMENT_TYPE:-voyager}" # First, install any updates from the apt repo that may be needed wget -O /root/zulip-ppa.asc https://zulip.com/dist/keys/zulip-ppa.asc @@ -21,7 +23,7 @@ apt-get -y dist-upgrade $APT_OPTIONS apt-get install -y puppet git python $ADDITIONAL_PACKAGES mkdir -p /etc/zulip -echo -e "[machine]\npuppet_classes = zulip::voyager\ndeploy_type = voyager" > /etc/zulip/zulip.conf +echo -e "[machine]\npuppet_classes = zulip::voyager\ndeploy_type = $DEPLOYMENT_TYPE" > /etc/zulip/zulip.conf /root/zulip/scripts/zulip-puppet-apply -f # These server restarting bits should be moveable into puppet-land, ideally