From 52f5f22c76d46226b054d493dcb19dc8aae4ae07 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@sevenseas.org>
Date: Fri, 25 Mar 2016 17:33:35 +0100
Subject: [PATCH] library/roles/gitblit: Startup service, sleep during restart
 otherwise the start part fails silently, ldap authentication in
 gitblit.properties.

---
 gitblit/defaults/main.yml               |  2 ++
 gitblit/files/service-ubuntu.sh         |  3 ++-
 gitblit/handlers/main.yml               |  2 +-
 gitblit/templates/gitblit-default.j2    | 10 +++++-----
 gitblit/templates/gitblit.properties.j2 |  7 +++++++
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/gitblit/defaults/main.yml b/gitblit/defaults/main.yml
index 65e699a1..c2b3341a 100644
--- a/gitblit/defaults/main.yml
+++ b/gitblit/defaults/main.yml
@@ -11,6 +11,7 @@ gitblit_user: gitblit
 gitblit_home: '/srv/{{ gitblit_user }}'
 gitblit_data_dir: /srv/gitblit_data
 gitblit_java_heap: 2048M
+gitblit_jvm_opts: ""
 gitblit_http_port: 8080
 gitblit_https_port: 0
 gitblit_redirect_to_https: "false"
@@ -31,6 +32,7 @@ gitblit_enable_git_servlet: "true"
 gitblit_tickets_service: ""
 gitblit_accept_new_tickets: "false"
 gitblit_allow_deleting_non_empty_repo: "false"
+gitblit_auth_ldap_enabled: True
 gitblit_auth_providers: ldap
 gitblit_web_sitename: ""
 gitblit_web_logo: "${baseFolder}/logo.png"
diff --git a/gitblit/files/service-ubuntu.sh b/gitblit/files/service-ubuntu.sh
index 61ed95aa..ce43ed99 100644
--- a/gitblit/files/service-ubuntu.sh
+++ b/gitblit/files/service-ubuntu.sh
@@ -19,11 +19,12 @@ GITBLIT_PATH=/opt/gitblit
 GITBLIT_BASE_FOLDER=/opt/gitblit/data
 GITBLIT_USER="gitblit"
 GITBLIT_JAVA_HEAP=1024M
+JVM_OPTS=
 #source ${GITBLIT_PATH}/java-proxy-config.sh
 if [ -f /etc/default/gitblit ] ; then
     . /etc/default/gitblit
 fi
-ARGS="-server -Xmx${GITBLIT_JAVA_HEAP} ${JAVA_PROXY_CONFIG} -Djava.awt.headless=true -jar gitblit.jar --baseFolder $GITBLIT_BASE_FOLDER --dailyLogFile"
+ARGS="-server -Xmx${GITBLIT_JAVA_HEAP} ${JVM_OPTS} ${JAVA_PROXY_CONFIG} -Djava.awt.headless=true -jar gitblit.jar --baseFolder $GITBLIT_BASE_FOLDER --dailyLogFile"
 
 RETVAL=0
 
diff --git a/gitblit/handlers/main.yml b/gitblit/handlers/main.yml
index 8c37ff7d..67e17c90 100644
--- a/gitblit/handlers/main.yml
+++ b/gitblit/handlers/main.yml
@@ -1,4 +1,4 @@
 ---
 - name: Restart gitblit
-  service: name=gitblit state=restarted
+  service: name=gitblit state=restarted sleep=60
   when: gitblit_enabled
diff --git a/gitblit/templates/gitblit-default.j2 b/gitblit/templates/gitblit-default.j2
index b6f737d3..fe17f1d8 100644
--- a/gitblit/templates/gitblit-default.j2
+++ b/gitblit/templates/gitblit-default.j2
@@ -1,5 +1,5 @@
-GITBLIT_PATH={{ gitblit_home }}/service
-GITBLIT_BASE_FOLDER={{ gitblit_data_dir }}
-GITBLIT_USER="{{ gitblit_user }}"
-GITBLIT_JAVA_HEAP={{ gitblit_java_heap }}
-ARGS="-server -Xmx${GITBLIT_JAVA_HEAP} ${JAVA_PROXY_CONFIG} -Djava.awt.headless=true -jar gitblit.jar --baseFolder $GITBLIT_BASE_FOLDER --dailyLogFile"
+export GITBLIT_PATH={{ gitblit_home }}/service
+export GITBLIT_BASE_FOLDER={{ gitblit_data_dir }}
+export GITBLIT_USER="{{ gitblit_user }}"
+export GITBLIT_JAVA_HEAP={{ gitblit_java_heap }}
+export JVM_OPTS="{{ gitblit_jvm_opts }}"
diff --git a/gitblit/templates/gitblit.properties.j2 b/gitblit/templates/gitblit.properties.j2
index 0d7e0476..84d1878c 100644
--- a/gitblit/templates/gitblit.properties.j2
+++ b/gitblit/templates/gitblit.properties.j2
@@ -56,6 +56,13 @@ web.headerLogo = {{ gitblit_web_logo }}
 web.canonicalUrl = {{ gitblit_canonical_url }}
 #
 # Auth
+#
+#
+{% if gitblit_auth_ldap_enabled %}
+realm.userService = com.gitblit.LdapUserService
+realm.ldap.backingUserService = ${baseFolder}/users.conf
+{% endif %}
+
 realm.windows.permitBuiltInAdministrators = {{ gitblit_windows_permitbuiltinadmin }}
 # Redmine backend
 realm.redmine.url = {{ gitblit_redmine_url }}