X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/32a423888e0d6b5254c55e4faf418b31749dc69e..7a3a01f710421e67b96dfebd5a51c4374be73035:/cookbooks/chef/recipes/server.rb?ds=inline diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb index 8edf4e559..eb2a33ae4 100644 --- a/cookbooks/chef/recipes/server.rb +++ b/cookbooks/chef/recipes/server.rb @@ -1,14 +1,14 @@ # -# 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. # 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 @@ -65,6 +66,13 @@ execute "chef-server-reconfigure" do 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" @@ -73,6 +81,7 @@ end service "chef-server" do action [:enable, :start] + subscribes :restart, "systemd_service[chef-server]" end apache_module "alias" @@ -81,6 +90,7 @@ apache_module "proxy_http" ssl_certificate "chef.openstreetmap.org" do domains ["chef.openstreetmap.org", "chef.osm.org"] notifies :reload, "service[apache2]" + notifies :run, "execute[chef-server-restart]" end apache_site "chef.openstreetmap.org" do