Use https to access private git repositories

[chef.git] / cookbooks / chef / recipes / server.rb

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 2ebf64f72dc6be392acab827923bf87edc9caa6b..9581b1a56e625f97b1f5f582960fea024093f4b3 100644 (file)
--- 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
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,9 +17,10 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+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"
 #
 # directory "/var/cache/chef" do
 #   owner "root"


@@ -37,7 +38,7 @@ include_recipe "apache::ssl"
 # end
 #
 # remote_file "/var/cache/chef/#{chef_package}" do
 # 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
 #   owner "root"
 #   group "root"
 #   mode 0644


@@ -46,7 +47,7 @@ include_recipe "apache::ssl"
 #
 # dpkg_package "chef-server-core" do
 #   source "/var/cache/chef/#{chef_package}"
 #
 # 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
 
 #   notifies :run, "execute[chef-server-reconfigure]"
 # end
 


@@ -65,6 +66,13 @@ execute "chef-server-reconfigure" do
   group "root"
 end
 
   group "root"
 end
 

+execute "chef-server-restart" do
+  action :nothing
+  command "chef-server-ctl restart"
+  user "root"
+  group "root"
+end
+

 systemd_service "chef-server" do
   description "Chef server"
   after "network.target"
 systemd_service "chef-server" do
   description "Chef server"
   after "network.target"


@@ -73,19 +81,25 @@ end
 
 service "chef-server" do
   action [:enable, :start]
 
 service "chef-server" do
   action [:enable, :start]

+  subscribes :restart, "systemd_service[chef-server]"

 end
 
 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"
 
 ssl_certificate "chef.openstreetmap.org" do
   domains ["chef.openstreetmap.org", "chef.osm.org"]
 apache_module "alias"
 apache_module "proxy_http"
 
 ssl_certificate "chef.openstreetmap.org" do
   domains ["chef.openstreetmap.org", "chef.osm.org"]

-  fallback_certificate "openstreetmap"

   notifies :reload, "service[apache2]"
   notifies :reload, "service[apache2]"

+  notifies :run, "execute[chef-server-restart]"

 end
 
 apache_site "chef.openstreetmap.org" do
   template "apache.erb"
 end
 
 apache_site "chef.openstreetmap.org" do
   template "apache.erb"

+  variables :git_allowed => git_allowed

 end
 
 template "/etc/cron.daily/chef-server-backup" do
 end
 
 template "/etc/cron.daily/chef-server-backup" do