Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

install-aws-server: Assume zulip_ops::profile:: prefix on all roles. 

This will require that any profile-specific sections of
`$HOME/.zulip-install-server.conf` be renamed to their short form.
This commit is contained in:
Alex Vandiver 2022-06-23 12:00:40 -07:00 committed by M@
parent 9a3be2af64
commit 1be9ab2690
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/setup/bootstrap-aws-installer
View File

@ -3,7 +3,7 @@
# Prepended to this automatically are the following: # Prepended to this automatically are the following:
#SERVER= #SERVER=
#HOSTNAME= #HOSTNAME=
#ROLES= #FULL_ROLES=
#REPO_URL= #REPO_URL=
#BRANCH= #BRANCH=
#SSH_SECRET_ID= #SSH_SECRET_ID=
@ -82,9 +82,9 @@ git clone "$REPO_URL" zulip -b "$BRANCH"
git -C zulip checkout "$BRANCH" git -C zulip checkout "$BRANCH"
( (
VIRTUALENV_NEEDED=$(if echo "$ROLES" | grep -q app_frontend; then echo -n yes; else echo -n no; fi) VIRTUALENV_NEEDED=$(if echo "$FULL_ROLES" | grep -q app_frontend; then echo -n yes; else echo -n no; fi)
export VIRTUALENV_NEEDED export VIRTUALENV_NEEDED
export PUPPET_CLASSES="$ROLES" export PUPPET_CLASSES="$FULL_ROLES"
export APT_OPTIONS="-o Dpkg::Options::=--force-confnew" export APT_OPTIONS="-o Dpkg::Options::=--force-confnew"
/root/zulip/scripts/setup/install \ /root/zulip/scripts/setup/install \
--self-signed-cert \ --self-signed-cert \

17
tools/setup/install-aws-server
View File

@ -11,8 +11,9 @@ if [ -z "$SERVER" ] || [ -z "$ROLES" ]; then
echo "Installs an empty Ubuntu server in AWS with a Zulip server role." echo "Installs an empty Ubuntu server in AWS with a Zulip server role."
echo echo
echo " * server is the local part of the hostname (e.g. postgres0)" echo " * server is the local part of the hostname (e.g. postgres0)"
echo " * roles is a comma-separated list of Puppet rules to be passed to scripts/lib/install" echo " * roles is a comma-separated list of Puppet profile names; these"
echo " E.g. 'zulip::profile::postgresql'" echo " will get 'zulip_ops::profile::' prepended to them, and passed"
echo " to scripts/lib/install -- e.g. 'postgresql'"
echo " * branch is used to override the default branch to install from." echo " * branch is used to override the default branch to install from."
echo echo
echo "Reads configuration from $HOME/.zulip-install-server.conf, which should look like:" echo "Reads configuration from $HOME/.zulip-install-server.conf, which should look like:"
@ -45,6 +46,14 @@ if [ -z "$BRANCH" ]; then
BRANCH=$(crudini --get "$zulip_install_config_file" repo default_branch) BRANCH=$(crudini --get "$zulip_install_config_file" repo default_branch)
fi fi
for role in ${ROLES//,/ }; do
if ! [ -f "../../puppet/zulip_ops/manifests/profile/$role.pp" ]; then
echo "No such role zulip_ops::profile::$role !"
exit 1
fi
done
FULL_ROLES=$(echo "$ROLES" | perl -pe '$_=join(",",map{"zulip_ops::profile::$_"} split ",")')
function lookup() { function lookup() {
KEY="$1" KEY="$1"
crudini --get "$zulip_install_config_file" "aws-$ROLES" "$KEY" 2>/dev/null \ crudini --get "$zulip_install_config_file" "aws-$ROLES" "$KEY" 2>/dev/null \
@ -90,14 +99,14 @@ BOOTDATA=$(mktemp)
echo "#!/bin/bash" echo "#!/bin/bash"
echo "SERVER=$SERVER" echo "SERVER=$SERVER"
echo "HOSTNAME=$HOSTNAME" echo "HOSTNAME=$HOSTNAME"
echo "ROLES=$ROLES" echo "FULL_ROLES=$FULL_ROLES"
echo "REPO_URL=$REPO_URL" echo "REPO_URL=$REPO_URL"
echo "BRANCH=$BRANCH" echo "BRANCH=$BRANCH"
echo "SSH_SECRET_ID=$SSH_SECRET_ID" echo "SSH_SECRET_ID=$SSH_SECRET_ID"
sed '/^AWS=/ r ./bootstrap-awscli.sh' bootstrap-aws-installer sed '/^AWS=/ r ./bootstrap-awscli.sh' bootstrap-aws-installer
} >>"$BOOTDATA" } >>"$BOOTDATA"
TAG_ROLE_NAMES=$(echo "$ROLES" | perl -pe 's/\w+::profile::(\w+)/$1/g') TAG_ROLE_NAMES="$ROLES"
TAGS="[{Key=Name,Value=$SERVER},{Key=role,Value=\"$TAG_ROLE_NAMES\"}]" TAGS="[{Key=Name,Value=$SERVER},{Key=role,Value=\"$TAG_ROLE_NAMES\"}]"
INSTANCE_DATA=$($AWS ec2 run-instances \ INSTANCE_DATA=$($AWS ec2 run-instances \
--tag-specifications "ResourceType=instance,Tags=$TAGS" \ --tag-specifications "ResourceType=instance,Tags=$TAGS" \