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

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 9581b1a56..cd54cf426 100644
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: chef
+# Cookbook:: chef
 # Recipe:: server
 #
-# Copyright 2010, OpenStreetMap Foundation
+# Copyright:: 2010, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,26 +18,24 @@
 #
 
 include_recipe "apache"
+include_recipe "chef::knife"
+include_recipe "munin"
 
+# cache_dir = Chef::Config[:file_cache_path]
+#
 # chef_version = node[:chef][:server][:version]
 # chef_package = "chef-server-core_#{chef_version}-1_amd64.deb"
 #
-# directory "/var/cache/chef" do
-#   owner "root"
-#   group "root"
-#   mode 0755
-# end
+# Dir.glob("#{cache_dir}/chef-server-core_*.deb").each do |deb|
+#   next if deb == "#{cache_dir}/#{chef_package}"
 #
-# Dir.glob("/var/cache/chef/chef-server-core_*.deb").each do |deb|
-#   next if deb == "/var/cache/chef/#{chef_package}"
-
 #   file deb do
 #     action :delete
 #     backup false
 #   end
 # end
 #
-# remote_file "/var/cache/chef/#{chef_package}" do
+# remote_file "#{cache_dir}/#{chef_package}" do
 #   source "https://packages.chef.io/files/stable/chef-server/#{chef_version}/ubuntu/16.04/#{chef_package}"
 #   owner "root"
 #   group "root"
@@ -46,7 +44,7 @@ include_recipe "apache"
 # end
 #
 # dpkg_package "chef-server-core" do
-#   source "/var/cache/chef/#{chef_package}"
+#   source "#{cache_dir}/#{chef_package}"
 #   version "#{chef_version}-1"
 #   notifies :run, "execute[chef-server-reconfigure]"
 # end
@@ -55,7 +53,7 @@ template "/etc/opscode/chef-server.rb" do
   source "server.rb.erb"
   owner "root"
   group "root"
-  mode 0o640
+  mode "640"
   notifies :run, "execute[chef-server-reconfigure]"
 end
 
@@ -84,10 +82,6 @@ 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"
 
@@ -99,14 +93,13 @@ end
 
 apache_site "chef.openstreetmap.org" do
   template "apache.erb"
-  variables :git_allowed => git_allowed
 end
 
 template "/etc/cron.daily/chef-server-backup" do
   source "server-backup.cron.erb"
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
 end
 
 munin_plugin "chef_status"