Merge what remains of apache::ssl into apache::default
authorTom Hughes <tom@compton.nu>
Mon, 20 Feb 2017 15:34:09 +0000 (15:34 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 20 Feb 2017 15:35:36 +0000 (15:35 +0000)
30 files changed:
cookbooks/apache/recipes/default.rb
cookbooks/apache/recipes/ssl.rb [deleted file]
cookbooks/blogs/recipes/default.rb
cookbooks/cgiirc/recipes/default.rb
cookbooks/chef/recipes/server.rb
cookbooks/dev/recipes/default.rb
cookbooks/dns/recipes/default.rb
cookbooks/donate/recipes/default.rb
cookbooks/forum/recipes/default.rb
cookbooks/foundation/recipes/owg.rb
cookbooks/git/recipes/web.rb
cookbooks/gps-tile/recipes/default.rb
cookbooks/kibana/recipes/default.rb
cookbooks/letsencrypt/recipes/default.rb
cookbooks/mailman/recipes/default.rb
cookbooks/mediawiki/recipes/default.rb
cookbooks/munin/recipes/server.rb
cookbooks/nominatim/recipes/default.rb
cookbooks/osqa/recipes/default.rb
cookbooks/otrs/recipes/default.rb
cookbooks/piwik/recipes/default.rb
cookbooks/planet/recipes/default.rb
cookbooks/serverinfo/recipes/default.rb
cookbooks/stats/recipes/default.rb
cookbooks/subversion/recipes/default.rb
cookbooks/taginfo/recipes/default.rb
cookbooks/trac/recipes/default.rb
cookbooks/web/recipes/backend.rb
cookbooks/web/recipes/frontend.rb
cookbooks/wordpress/recipes/default.rb

index a24ea18..72af914 100644 (file)
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "ssl"
+
 package "apache2"
 package "libwww-perl"
 
@@ -69,6 +71,12 @@ apache_module "reqtimeout" do
   action [:disable]
 end
 
+apache_module "ssl"
+
+apache_conf "ssl" do
+  template "ssl.erb"
+end
+
 munin_plugin "apache_accesses"
 munin_plugin "apache_processes"
 munin_plugin "apache_volume"
diff --git a/cookbooks/apache/recipes/ssl.rb b/cookbooks/apache/recipes/ssl.rb
deleted file mode 100644 (file)
index b2818df..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Cookbook Name:: apache
-# Recipe:: ssl
-#
-# Copyright 2011, 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
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include_recipe "apache"
-include_recipe "ssl"
-
-apache_module "ssl"
-
-apache_conf "ssl" do
-  template "ssl.erb"
-  notifies :reload, "service[apache2]"
-end
index 8389b62..faf1277 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "git"
 
 package "ruby"
index 2c80239..732d251 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 blocks = data_bag_item("cgiirc", "blocks")
 
index fe668ad..8edf4e5 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 # chef_package = "chef-server-core_#{node[:chef][:server][:version]}_amd64.deb"
 #
index aefd659..08af711 100644 (file)
@@ -20,7 +20,7 @@
 require "yaml"
 require "securerandom"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "passenger"
 include_recipe "git"
 include_recipe "mysql"
index 8db66d6..6c19048 100644 (file)
@@ -18,7 +18,7 @@
 #
 
 include_recipe "git"
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 passwords = data_bag_item("dns", "passwords")
 
index 6cfde37..d1b431b 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "mysql"
 include_recipe "git"
 
index 7288824..e6f1311 100644 (file)
@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "git"
 include_recipe "mysql"
 
index cc093b3..d0dd92a 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "git"
 
 package "ruby"
index 2430712..09954bf 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "gitweb"
 
index 87c2c49..ed60f1f 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "make"
 package "build-essential"
index 6a985ae..788e955 100644 (file)
@@ -20,7 +20,7 @@
 
 require "yaml"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 apache_module "proxy_http"
 
index f08fdf3..f3ddd97 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 keys = data_bag_item("chef", "keys")
 
index 8fb1b90..6240d26 100644 (file)
@@ -19,7 +19,7 @@
 
 require "securerandom"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "mailman"
 
index 8e7d01b..2e9ccd1 100644 (file)
@@ -18,7 +18,7 @@
 #
 
 include_recipe "memcached"
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "mysql"
 include_recipe "git"
 
index 5861bf5..2444936 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "munin"
 package "rrdcached"
index b098c59..ac1b27f 100644 (file)
@@ -293,7 +293,7 @@ file "#{build_directory}/settings/ip_blocks.map" do
   mode 0o664
 end
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "php"
 package "php-fpm"
index 5d5b4b1..b7a6a8e 100644 (file)
@@ -18,7 +18,7 @@
 #
 
 include_recipe "tools"
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "memcached"
 
 package "python-django"
index b6861d1..946806e 100644 (file)
@@ -19,7 +19,7 @@
 
 include_recipe "tools"
 include_recipe "postgresql"
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 passwords = data_bag_item("otrs", "passwords")
 
index 36bb05d..40a740a 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "mysql"
 
 passwords = data_bag_item("piwik", "passwords")
index 452b542..33c0175 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "perl"
 package "pbzip2"
index c027480..97051e1 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "git"
 
 package "ruby"
index 2c92fb2..323b67f 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "awstats"
 package "libgeo-ipfree-perl"
index 51a6de5..582dbae 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "subversion"
 
index 3b0983a..7d0db9b 100644 (file)
@@ -19,7 +19,7 @@
 
 require "json"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "passenger"
 include_recipe "git"
 
index fab0564..b149a57 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "trac"
 package "trac-git"
index 38515b0..afc852c 100644 (file)
@@ -18,7 +18,7 @@
 #
 
 include_recipe "memcached"
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "web::rails"
 include_recipe "web::cgimap"
 
index 636cb56..3703cef 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "web::rails"
 
 web_passwords = data_bag_item("web", "passwords")
index 187beac..a694f42 100644 (file)
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "mysql"
 
 package "subversion"