From 68f2a39b1494c4959d37d54f1733d169183bab38 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Sat, 9 Apr 2016 23:11:33 -0400
Subject: git: allow more flexibility with hook configs (can be dangerous)

These could/should probably be controlled by vars.
---
 roles/git/defaults/main.yml                 |  3 +++
 roles/git/templates/home_git_gitolite_rc.j2 | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'roles')

diff --git a/roles/git/defaults/main.yml b/roles/git/defaults/main.yml
index f216090..69a2e37 100644
--- a/roles/git/defaults/main.yml
+++ b/roles/git/defaults/main.yml
@@ -1,4 +1,7 @@
 
 gitolite_homedir:   /srv/gitolite/
 gitolite_hostname:  "{{ ansible_nodename }}"
+gitolite_config_keys: "gitweb\.(owner|description|category)"
+
 cgit_hostname:      "{{ ansible_nodename }}"
+
diff --git a/roles/git/templates/home_git_gitolite_rc.j2 b/roles/git/templates/home_git_gitolite_rc.j2
index 18dbd7b..a9cd666 100644
--- a/roles/git/templates/home_git_gitolite_rc.j2
+++ b/roles/git/templates/home_git_gitolite_rc.j2
@@ -21,7 +21,7 @@
     UMASK                           =>  0027,
 
     # look for "git-config" in the documentation
-    GIT_CONFIG_KEYS                 =>  'gitweb\.(owner|description|category)',
+    GIT_CONFIG_KEYS                 =>  '{{ gitolite_config_keys }}',
 
     # comment out if you don't need all the extra detail in the logfile
     LOG_EXTRA                       =>  1,
@@ -42,11 +42,11 @@
         # SITE_INFO                 =>  'Please search for "gitolite" or email site admin for more help',
 
     # the 'desc' command uses this
-        # WRITER_CAN_UPDATE_DESC    =>  1,
+        WRITER_CAN_UPDATE_DESC    =>  1,
 
     # the CpuTime feature uses these
         # display user, system, and elapsed times to user after each git operation
-        # DISPLAY_CPU_TIME          =>  1,
+        DISPLAY_CPU_TIME          =>  1,
         # display a warning if total CPU times (u, s, cu, cs) crosses this limit
         # CPU_TIME_WARN_LIMIT       =>  0.1,
 
@@ -84,10 +84,10 @@
             'writable',
 
             # Uncomment or add new commands here.
-            # 'create',
+            'create',
             # 'fork',
             # 'mirror',
-            # 'sskm',
+            'sskm',
             # 'D',
 
         # These FEATURES are enabled by default.
@@ -138,7 +138,7 @@
             # 'upstream',
 
             # updates 'description' file instead of 'gitweb.description' config item
-            # 'cgit',
+            'cgit',
 
             # allow repo-specific hooks to be added
             # 'repo-specific-hooks',
-- 
cgit v1.2.3