formatting changes
This commit is contained in:
parent
39a2bfd88a
commit
1463b74c07
1 changed files with 11 additions and 10 deletions
21
debian/postinst
vendored
21
debian/postinst
vendored
|
@ -90,21 +90,20 @@ EOF
|
||||||
|
|
||||||
# Check if ssl option is selected
|
# Check if ssl option is selected
|
||||||
db_get gitlab/ssl
|
db_get gitlab/ssl
|
||||||
gl_proto="http"
|
gl_proto="http"
|
||||||
if [ "${RET}" = "true" ]; then
|
if [ "${RET}" = "true" ]; then
|
||||||
echo "Configuring nginx with HTTPS..."
|
echo "Configuring nginx with HTTPS..."
|
||||||
if ! grep GITLAB_HTTPS ${gitlab_debian_conf_private}; then
|
if ! grep GITLAB_HTTPS ${gitlab_debian_conf_private}; then
|
||||||
echo GITLAB_HTTPS=${RET} >> ${gitlab_debian_conf_private}
|
echo GITLAB_HTTPS=${RET} >> ${gitlab_debian_conf_private}
|
||||||
# Workaround for #813770
|
# Workaround for #813770
|
||||||
gl_proto="https"
|
gl_proto="https"
|
||||||
echo "Configuring gitlab with HTTPS..."
|
echo "Configuring gitlab with HTTPS..."
|
||||||
sed -i "s/#port: 80/port: 443/" ${gitlab_yml_private}
|
sed -i "s/#port: 80/port: 443/" ${gitlab_yml_private}
|
||||||
sed -i "s/https: false/https: true/" ${gitlab_yml_private}
|
sed -i "s/https: false/https: true/" ${gitlab_yml_private}
|
||||||
echo "Updating gitlab_url in gitlab-shell configuration..."
|
echo "Updating gitlab_url in gitlab-shell configuration..."
|
||||||
sed -i \
|
sed -i \
|
||||||
"s/gitlab_url: http*:\/\/.*/gitlab_url: ${gl_proto}:\/\/${GITLAB_HOST}/"\
|
"s/gitlab_url: http*:\/\/.*/gitlab_url: ${gl_proto}:\/\/${GITLAB_HOST}/"\
|
||||||
${gitlab_shell_root}/config.yml
|
${gitlab_shell_root}/config.yml
|
||||||
|
|
||||||
fi
|
fi
|
||||||
mkdir -p /etc/gitlab/ssl
|
mkdir -p /etc/gitlab/ssl
|
||||||
if [ -f "${nginx_ssl_conf_example_gz}" ]; then
|
if [ -f "${nginx_ssl_conf_example_gz}" ]; then
|
||||||
|
@ -142,9 +141,11 @@ EOF
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Manage gitlab.yml via ucf
|
||||||
echo "Registering ${gitlab_yml} via ucf"
|
echo "Registering ${gitlab_yml} via ucf"
|
||||||
ucf --debconf-ok --three-way ${gitlab_yml_private} ${gitlab_yml}
|
ucf --debconf-ok --three-way ${gitlab_yml_private} ${gitlab_yml}
|
||||||
ucfr gitlab ${gitlab_yml}
|
ucfr gitlab ${gitlab_yml}
|
||||||
|
|
||||||
# Manage gitlab-debian.conf via ucf
|
# Manage gitlab-debian.conf via ucf
|
||||||
echo "Registering ${gitlab_debian_conf} via ucf"
|
echo "Registering ${gitlab_debian_conf} via ucf"
|
||||||
ucf --debconf-ok --three-way ${gitlab_debian_conf_private} ${gitlab_debian_conf}
|
ucf --debconf-ok --three-way ${gitlab_debian_conf_private} ${gitlab_debian_conf}
|
||||||
|
|
Loading…
Reference in a new issue