[DRE-commits] [gitlab] 04/06: formatting changes

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit 1463b74c07945ff089e4b33c7949dc59f2631bcc
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Apr 8 17:03:46 2016 +0530

    formatting changes
---
 debian/postinst | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/postinst b/debian/postinst
index 0969b1b..6f9c6ff 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -90,21 +90,20 @@ EOF
 
       # Check if ssl option is selected
       db_get gitlab/ssl
- 	gl_proto="http"
+      gl_proto="http"
       if [ "${RET}" = "true" ]; then
         echo "Configuring nginx with HTTPS..."
         if ! grep GITLAB_HTTPS ${gitlab_debian_conf_private}; then
 	  echo GITLAB_HTTPS=${RET} >> ${gitlab_debian_conf_private}
 	  # Workaround for #813770
-	    gl_proto="https"
-	    echo "Configuring gitlab with HTTPS..."
+	  gl_proto="https"
+	  echo "Configuring gitlab with HTTPS..."
  	  sed -i "s/#port: 80/port: 443/" ${gitlab_yml_private}
 	  sed -i "s/https: false/https: true/" ${gitlab_yml_private}
-	echo "Updating gitlab_url in gitlab-shell configuration..."
-	sed -i \
-	"s/gitlab_url: http*:\/\/.*/gitlab_url: ${gl_proto}:\/\/${GITLAB_HOST}/"\
-	 ${gitlab_shell_root}/config.yml
-
+          echo "Updating gitlab_url in gitlab-shell configuration..."
+          sed -i \
+	  "s/gitlab_url: http*:\/\/.*/gitlab_url: ${gl_proto}:\/\/${GITLAB_HOST}/"\
+	  ${gitlab_shell_root}/config.yml
 	fi
         mkdir -p /etc/gitlab/ssl
         if [ -f "${nginx_ssl_conf_example_gz}" ]; then
@@ -142,9 +141,11 @@ EOF
         fi
       fi
 
+      # Manage gitlab.yml via ucf
       echo "Registering ${gitlab_yml} via ucf"
-	  ucf --debconf-ok --three-way ${gitlab_yml_private} ${gitlab_yml}
-	  ucfr gitlab ${gitlab_yml}
+      ucf --debconf-ok --three-way ${gitlab_yml_private} ${gitlab_yml}
+      ucfr gitlab ${gitlab_yml}
+
       # Manage gitlab-debian.conf via ucf
       echo "Registering ${gitlab_debian_conf} via ucf"
       ucf --debconf-ok --three-way ${gitlab_debian_conf_private} ${gitlab_debian_conf}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git