X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7dbbea65a60915715c0b9f5fac84f47cd38c9dfa..760d6ef7a14a6bcd89804c10aa9b20775f1af3fc:/cookbooks/chef/recipes/server.rb

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index d3a26755a..9581b1a56 100644
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -8,7 +8,7 @@
 # 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,
@@ -19,7 +19,8 @@
 
 include_recipe "apache"
 
-# chef_package = "chef-server-core_#{node[:chef][:server][:version]}_amd64.deb"
+# chef_version = node[:chef][:server][:version]
+# chef_package = "chef-server-core_#{chef_version}-1_amd64.deb"
 #
 # directory "/var/cache/chef" do
 #   owner "root"
@@ -37,7 +38,7 @@ include_recipe "apache"
 # end
 #
 # remote_file "/var/cache/chef/#{chef_package}" do
-#   source "https://web-dl.packagecloud.io/chef/stable/packages/ubuntu/#{node[:lsb][:codename]}/#{chef_package}"
+#   source "https://packages.chef.io/files/stable/chef-server/#{chef_version}/ubuntu/16.04/#{chef_package}"
 #   owner "root"
 #   group "root"
 #   mode 0644
@@ -46,7 +47,7 @@ include_recipe "apache"
 #
 # dpkg_package "chef-server-core" do
 #   source "/var/cache/chef/#{chef_package}"
-#   version node[:chef][:server][:version]
+#   version "#{chef_version}-1"
 #   notifies :run, "execute[chef-server-reconfigure]"
 # end
 
@@ -83,6 +84,10 @@ service "chef-server" do
   subscribes :restart, "systemd_service[chef-server]"
 end
 
+git_allowed = search(:node, node[:git][:allowed_nodes]).collect do |n|
+  n.ipaddresses(:role => :external)
+end.flatten
+
 apache_module "alias"
 apache_module "proxy_http"
 
@@ -94,6 +99,7 @@ end
 
 apache_site "chef.openstreetmap.org" do
   template "apache.erb"
+  variables :git_allowed => git_allowed
 end
 
 template "/etc/cron.daily/chef-server-backup" do