X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6d0fd628cfdf5b2e32c656b78ece007752c522f2..b0e841d7ff50e5c5bea3a3417737c272b09dcd86:/cookbooks/git/recipes/web.rb diff --git a/cookbooks/git/recipes/web.rb b/cookbooks/git/recipes/web.rb index 8eb83bf15..468074e2c 100644 --- a/cookbooks/git/recipes/web.rb +++ b/cookbooks/git/recipes/web.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: git +# Cookbook:: git # Recipe:: web # -# Copyright 2013, OpenStreetMap Foundation +# 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 +# https://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, @@ -23,7 +23,7 @@ package "gitweb" apache_module "rewrite" -git_directory = node[:git][:directory] +git_site = node[:git][:host] template "/etc/gitweb.conf" do source "gitweb.conf.erb" @@ -32,20 +32,31 @@ template "/etc/gitweb.conf" do mode 0o644 end -ssl_certificate node[:git][:host] do - domains [node[:git][:host]] + Array(node[:git][:aliases]) - notifies :reload, "service[apache2]" -end - -apache_site node[:git][:host] do - template "apache.erb" - directory git_directory - variables :aliases => Array(node[:git][:aliases]) +directory "/srv/#{git_site}" do + owner "root" + group "root" + mode 0o755 end -template "#{git_directory}/robots.txt" do +template "/srv/#{git_site}/robots.txt" do source "robots.txt.erb" owner "root" group "root" mode 0o644 end + +ssl_certificate git_site do + domains [git_site] + Array(node[:git][:aliases]) + notifies :reload, "service[apache2]" +end + +private_allowed = search(:node, node[:git][:private_nodes]).collect do |n| + n.ipaddresses(:role => :external) +end.flatten + +apache_site git_site do + template "apache.erb" + directory "/srv/#{git_site}" + variables :aliases => Array(node[:git][:aliases]), + :private_allowed => private_allowed +end