Enable mod_headers everywhere as we use it for HSTS support

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

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 7a5f8fa5deef2b5b796037f8e5d4dfdaf0147ce8..d3a26755a4b21029c85986d020902b211762b58d 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -17,7 +17,7 @@
 # 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_package = "chef-server-core_#{node[:chef][:server][:version]}_amd64.deb"
 #


@@ -54,7 +54,7 @@ template "/etc/opscode/chef-server.rb" do
   source "server.rb.erb"
   owner "root"
   group "root"
   source "server.rb.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode 0o640

   notifies :run, "execute[chef-server-reconfigure]"
 end
 
   notifies :run, "execute[chef-server-reconfigure]"
 end
 


@@ -65,6 +65,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,11 +80,18 @@ end
 
 service "chef-server" do
   action [:enable, :start]
 
 service "chef-server" do
   action [:enable, :start]

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

 end
 
 apache_module "alias"
 apache_module "proxy_http"
 
 end
 
 apache_module "alias"
 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
   template "apache.erb"
 end
 apache_site "chef.openstreetmap.org" do
   template "apache.erb"
 end


@@ -89,11 +103,4 @@ template "/etc/cron.daily/chef-server-backup" do
   mode 0o755
 end
 
   mode 0o755
 end
 

-template "/etc/logrotate.d/chef-server" do
-  source "logrotate.server.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-end
-

 munin_plugin "chef_status"
 munin_plugin "chef_status"