From caafb405d73fc098f8a799a040da8cb8dcbc1003 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@humbughq.com>
Date: Fri, 14 Jun 2013 13:57:21 -0400
Subject: [PATCH] puppet: Finish puppetizing git/wiki configuration.

(imported from commit 423083269cea7b23f8b5805561919b9c6b9a8f4d)
---
 servers/puppet/modules/humbug/manifests/git.pp  | 17 ++++++++++++++---
 servers/puppet/modules/humbug/manifests/wiki.pp |  1 -
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/servers/puppet/modules/humbug/manifests/git.pp b/servers/puppet/modules/humbug/manifests/git.pp
index b5222e6e5a..4dffe30b86 100644
--- a/servers/puppet/modules/humbug/manifests/git.pp
+++ b/servers/puppet/modules/humbug/manifests/git.pp
@@ -1,10 +1,21 @@
 class humbug::git {
   class { 'humbug::base': }
 
+  # We run our wiki off of git.humbughq.com; this may change.
+  class { 'humbug::wiki': }
+
   $git_packages = [ ]
   package { $git_packages: ensure => "installed" }
 
-  # TODO: Should confirm git repos at /srv/git and then setup
-  # /srv/git/humbug.git/hooks/post-receive ->
-  # /home/humbug/humbug/tools/post-receive
+  file { '/srv/git/humbug.git':
+    ensure => 'directory',
+    owner  => 'humbug',
+    group  => 'humbug',
+    mode   => 755,
+  }
+
+  file { '/srv/git/humbug.git/hooks/post-receive':
+    ensure => 'link',
+    target => '/home/humbug/humbug/tools/post-receive',
+  }
 }
diff --git a/servers/puppet/modules/humbug/manifests/wiki.pp b/servers/puppet/modules/humbug/manifests/wiki.pp
index 9a6210af9c..198c62ff37 100644
--- a/servers/puppet/modules/humbug/manifests/wiki.pp
+++ b/servers/puppet/modules/humbug/manifests/wiki.pp
@@ -1,5 +1,4 @@
 class humbug::wiki {
-  class { 'humbug::base': }
   class { 'humbug::apache': }
   class { 'humbug::supervisor': }