[DRE-commits] [gitlab] 02/04: make letsencryt conditional

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master-8.5
in repository gitlab.

commit 408e0194d98bfc67b0cf30ea70965657c348bf1b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Apr 3 11:37:40 2016 +0530

    make letsencryt conditional
---
 debian/README.Debian |  6 ++++++
 debian/config        | 15 +++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 2f3160a..d32a3f0 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -40,6 +40,12 @@ links are added to enable write access to gitlab app
 > shared/cache -> /var/lib/gitlab/cache
 > /usr/share/gitlab/.secret -> /var/lib/gitlab/.secret
 
+8. ssl certificates: This package tries to use letsencrypt package to obtain
+ssl certificates, if it is installed (via Recommends). If letsencrypt is not
+required, you can copy ssl certificate and key to /etc/gitlab/ssl as gitlab.crt
+and gitlab.key. If letsencrypt option is selected, symbolic links are added for
+certificates obtained using letsencrypt to /etc/gitlab/ssl.
+
 Useful diagnostics
 ==================
 
diff --git a/debian/config b/debian/config
index 70600ba..b65d6b3 100755
--- a/debian/config
+++ b/debian/config
@@ -14,10 +14,13 @@ db_go
 db_input high gitlab/ssl || true
 db_go
 
-# Do you want Let's Encrypt?
-db_get gitlab/ssl
-if [ "${RET}" = "true" ]
-then
-	db_input high gitlab/letsencrypt || true
-	db_go
+# Don't prompt for letsencrypt if not installed
+if command -v letsencrypt; then
+  # Do you want Let's Encrypt?
+  db_get gitlab/ssl
+  if [ "${RET}" = "true" ]
+  then
+    db_input high gitlab/letsencrypt || true
+    db_go
+  fi
 fi

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