From 19f60d1fb981a1eedacab6c87fcbc11e90695f78 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 2 Oct 2013 19:00:45 +0100
Subject: [PATCH 1/1] Split gitweb configuration into a separate recipe

---
 cookbooks/git/attributes/default.rb |  1 +
 cookbooks/git/recipes/server.rb     | 24 ---------------
 cookbooks/git/recipes/web.rb        | 45 +++++++++++++++++++++++++++++
 roles/git.rb                        |  6 ++--
 4 files changed, 49 insertions(+), 27 deletions(-)
 create mode 100644 cookbooks/git/attributes/default.rb
 create mode 100644 cookbooks/git/recipes/web.rb

diff --git a/cookbooks/git/attributes/default.rb b/cookbooks/git/attributes/default.rb
new file mode 100644
index 000000000..efeaa6aae
--- /dev/null
+++ b/cookbooks/git/attributes/default.rb
@@ -0,0 +1 @@
+default[:git][:directory] = "/var/lib/git"
diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index 66f4dd1fc..12b576aa1 100644
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -17,13 +17,8 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
 include_recipe "networking"
 
-package "gitweb"
-
-apache_module "rewrite"
-
 git_directory = node[:git][:directory]
 
 directory git_directory do
@@ -32,25 +27,6 @@ directory git_directory do
   mode 02775
 end
 
-template "/etc/gitweb.conf" do
-  source "gitweb.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
-end
-
-apache_site node[:git][:host] do
-  template "apache.erb"
-  directory git_directory
-end
-
-template "#{git_directory}/robots.txt" do
-  source "robots.txt.erb"
-  owner "root"
-  group "root"
-  mode 0644
-end
-
 firewall_rule "accept-git" do
   action :accept
   source "net"
diff --git a/cookbooks/git/recipes/web.rb b/cookbooks/git/recipes/web.rb
new file mode 100644
index 000000000..74e722a0c
--- /dev/null
+++ b/cookbooks/git/recipes/web.rb
@@ -0,0 +1,45 @@
+#
+# Cookbook Name:: git
+# Recipe:: web
+#
+# Copyright 2013, OpenStreetMap Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe "apache"
+
+package "gitweb"
+
+apache_module "rewrite"
+
+git_directory = node[:git][:directory]
+
+template "/etc/gitweb.conf" do
+  source "gitweb.conf.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+
+apache_site node[:git][:host] do
+  template "apache.erb"
+  directory git_directory
+end
+
+template "#{git_directory}/robots.txt" do
+  source "robots.txt.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
diff --git a/roles/git.rb b/roles/git.rb
index 19ebfcdea..0b4176223 100644
--- a/roles/git.rb
+++ b/roles/git.rb
@@ -23,11 +23,11 @@ default_attributes(
     }
   },
   :git => {
-    :host => "git.openstreetmap.org",
-    :directory => "/var/lib/git"
+    :host => "git.openstreetmap.org"
   }
 )
 
 run_list(
-  "recipe[git::server]"
+  "recipe[git::server]",
+  "recipe[git::web]"
 )
-- 
2.43.2