Use EXTERNAL_URL as flag variable

This commit is contained in:
Balasankar C 2017-08-22 16:34:44 +05:30
parent 6dd6a7758b
commit d0f30ef282
No known key found for this signature in database
GPG Key ID: 96EDAB9B2E6B7171
2 changed files with 5 additions and 7 deletions

View File

@ -4,7 +4,6 @@
# after package is installed.
#
DEST_DIR=<%= install_dir %>
EXTERNAL_URL="http://gitlab.example.com"
notify()
{
@ -88,12 +87,12 @@ if [ -n "${GITLAB_DEBUG}" ] ; then
notify "debug: arguments: $@"
fi
if [ -n "${GITLAB_URL}" ]; then
EXTERNAL_URL=${GITLAB_URL}
else
if [ -z "${EXTERNAL_URL}" ]; then
check_if_ec2
if [ $? -eq 0 ] ; then
get_ec2_hostname
else
EXTERNAL_URL="http://gitlab.example.com"
fi
fi

View File

@ -5,9 +5,8 @@ set -e
source /etc/lsb-release
source /RELEASE
# Install GitLab. Setting GITLAB_URL to placeholder so as to skip automatic
# reconfigure
DOWNLOAD_URL=${DOWNLOAD_URL} TRIGGER_PRIVATE_TOKEN=${TRIGGER_PRIVATE_TOKEN} /assets/download-package && GITLAB_URL="http://gitlab.example.com" dpkg -i /tmp/gitlab.deb && rm /tmp/gitlab.deb
# Install GitLab
DOWNLOAD_URL=${DOWNLOAD_URL} TRIGGER_PRIVATE_TOKEN=${TRIGGER_PRIVATE_TOKEN} /assets/download-package && dpkg -i /tmp/gitlab.deb && rm /tmp/gitlab.deb
rm -rf /var/lib/apt/lists/*
# Create sshd daemon