Merge what remains of apache::ssl into apache::default

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index a24ea18f2f441844444d63794c2cdb921983e45f..72af9140b9b64b6c8caa034ece4c0a69c1cbb23c 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -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
--- a/cookbooks/apache/recipes/ssl.rb
+++ /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

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 8389b6260ad7f76283a09b32675288f95194571e..faf12775c9bc848c1e63f823552b985784cbf1f3 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "git"
 
 package "ruby"

diff --git a/cookbooks/cgiirc/recipes/default.rb b/cookbooks/cgiirc/recipes/default.rb
index 2c80239ff6566cc4d830530b92a364484792d052..732d251fca17a37cc9309a695c70678f3f4c703e 100644 (file)
--- a/cookbooks/cgiirc/recipes/default.rb
+++ b/cookbooks/cgiirc/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 blocks = data_bag_item("cgiirc", "blocks")
 

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index fe668ad1d74ddcaa6128fecd279255b83a85842c..8edf4e5593fac583dd180862a3497e7d87c4edab 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -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"
 #

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index aefd6594d0e8989c99eb74a1eed4633778f59e23..08af7112be3deab9fa103d5d018cd8ef04a4e901 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -20,7 +20,7 @@
 require "yaml"
 require "securerandom"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "passenger"
 include_recipe "git"
 include_recipe "mysql"

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 8db66d6c986e2a0c49d03714ef69ee51a9e53213..6c19048f20aa5d747a4f0813c74171a1669efa69 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -18,7 +18,7 @@
 #
 
 include_recipe "git"
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 passwords = data_bag_item("dns", "passwords")
 

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index 6cfde3722739edf9c9bc32a1896eaa8143f004fb..d1b431bd782d20b310d5c303e3acefaa8e0a15dc 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "mysql"
 include_recipe "git"
 

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 7288824b5ba897f3932b9de53b440a261a89f0b8..e6f131113298220a301031cc0396cac0e3308222 100644 (file)
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -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"
 

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index cc093b3c9036fd2ef8a670229333663283a83c9c..d0dd92a843b4e4d2a2222d90b309053cb665c767 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "git"
 
 package "ruby"

diff --git a/cookbooks/git/recipes/web.rb b/cookbooks/git/recipes/web.rb
index 24307121d00256ff535ffb5a0e16151b2c944e09..09954bf1dcb3d983a56ba2add82248d1e66c9374 100644 (file)
--- a/cookbooks/git/recipes/web.rb
+++ b/cookbooks/git/recipes/web.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "gitweb"
 

diff --git a/cookbooks/gps-tile/recipes/default.rb b/cookbooks/gps-tile/recipes/default.rb
index 87c2c49ac92a3bb4a916279c4b3094e57db3a12d..ed60f1fd7619fedd456157caad50a2a9acd2f2ed 100644 (file)
--- a/cookbooks/gps-tile/recipes/default.rb
+++ b/cookbooks/gps-tile/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "make"
 package "build-essential"

diff --git a/cookbooks/kibana/recipes/default.rb b/cookbooks/kibana/recipes/default.rb
index 6a985ae344a12bd46ee7634ace62891521100e47..788e9551387b8420b72b39f2ed63dfe89c959d4e 100644 (file)
--- a/cookbooks/kibana/recipes/default.rb
+++ b/cookbooks/kibana/recipes/default.rb
@@ -20,7 +20,7 @@
 
 require "yaml"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 apache_module "proxy_http"
 

diff --git a/cookbooks/letsencrypt/recipes/default.rb b/cookbooks/letsencrypt/recipes/default.rb
index f08fdf3acc890ff01e36c699e1f879b0252c3589..f3ddd9712ccacb66138d9a1db91624a7dc5eaffc 100644 (file)
--- a/cookbooks/letsencrypt/recipes/default.rb
+++ b/cookbooks/letsencrypt/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 keys = data_bag_item("chef", "keys")
 

diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index 8fb1b90923f1edddaedd533786666c395324c0fc..6240d26968039fc1deb106ce50d45a4e7feaca98 100644 (file)
--- a/cookbooks/mailman/recipes/default.rb
+++ b/cookbooks/mailman/recipes/default.rb
@@ -19,7 +19,7 @@
 
 require "securerandom"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "mailman"
 

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 8e7d01bfa9aa805cd309d272485a1d9e46543bf7..2e9ccd1b41b3d5563445067c21fc1a3b00b28ad0 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -18,7 +18,7 @@
 #
 
 include_recipe "memcached"
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "mysql"
 include_recipe "git"
 

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index 5861bf5ea6e1b6fbe2d72901e67e4e58e3a7bca8..244493612d1625fa72466139613f29b30cf2dce9 100644 (file)
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "munin"
 package "rrdcached"

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index b098c599d1e43a5f810f1cf9f9857cb64242317f..ac1b27f3314f1e356221f803fb7fd129b69587aa 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -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"

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 5d5b4b1f2dee2521f15c7234db3867eeb7756930..b7a6a8e6faa0b793b011f6c8e4afdf88521eeb22 100644 (file)
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -18,7 +18,7 @@
 #
 
 include_recipe "tools"
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "memcached"
 
 package "python-django"

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index b6861d1a2e5b630543473d2ffdf7bf8d823f16aa..946806ea4088fe1038359d6aba9ffcac1cb058b5 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -19,7 +19,7 @@
 
 include_recipe "tools"
 include_recipe "postgresql"
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 passwords = data_bag_item("otrs", "passwords")
 

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 36bb05d2bba20d2d455681d6f6f7447b6e9feec8..40a740a861ea3ed2ed8c97af5a18662b971969ab 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "mysql"
 
 passwords = data_bag_item("piwik", "passwords")

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 452b54276f991f5fb801eaf35c53b320dfece3fe..33c01751b2d09e5348250aea8c4429b4c1ea85ef 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "perl"
 package "pbzip2"

diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb
index c027480d9b0df9ef6d2a67153ddaf816c527769f..97051e1a13467b77d1578fe54e959247e9c1b7b7 100644 (file)
--- a/cookbooks/serverinfo/recipes/default.rb
+++ b/cookbooks/serverinfo/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "git"
 
 package "ruby"

diff --git a/cookbooks/stats/recipes/default.rb b/cookbooks/stats/recipes/default.rb
index 2c92fb2b2368f3e01fb60b73e9ae21a8766ec8cc..323b67f897c51247c101c957f22d02d5c4c63e7b 100644 (file)
--- a/cookbooks/stats/recipes/default.rb
+++ b/cookbooks/stats/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "awstats"
 package "libgeo-ipfree-perl"

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index 51a6de59ce6a390ed193452c72d8e06ec06b53c7..582dbaed370d8dabd8f737550118ea4661e6ea53 100644 (file)
--- a/cookbooks/subversion/recipes/default.rb
+++ b/cookbooks/subversion/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "subversion"
 

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 3b0983a25cf412a3aed2bc5575ff47f91bfc9a63..7d0db9b2d16e49f8ce70c8ce9de2f7f5e6bbf2f2 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -19,7 +19,7 @@
 
 require "json"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "passenger"
 include_recipe "git"
 

diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb
index fab0564b03977cfa3bc4281c2353beb5c67e990c..b149a5751cfa7ac6c620b857bbd9d15141a659f8 100644 (file)
--- a/cookbooks/trac/recipes/default.rb
+++ b/cookbooks/trac/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "trac"
 package "trac-git"

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index 38515b07aed8ff36f58896254878fd7338e6299e..afc852c00772dee772952437715ec2712c3a1ea9 100644 (file)
--- a/cookbooks/web/recipes/backend.rb
+++ b/cookbooks/web/recipes/backend.rb
@@ -18,7 +18,7 @@
 #
 
 include_recipe "memcached"
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "web::rails"
 include_recipe "web::cgimap"
 

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index 636cb56d726274642a2bf068d4ea0dcd2ee10a2a..3703cef31e2f2213a927525ff425f70f8d83ef6e 100644 (file)
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -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")

diff --git a/cookbooks/wordpress/recipes/default.rb b/cookbooks/wordpress/recipes/default.rb
index 187beac66a3ac932fc6eccbdf67e9248ec3be57d..a694f42b2a5b1f28b287d4a8c78e2c517257ba5d 100644 (file)
--- a/cookbooks/wordpress/recipes/default.rb
+++ b/cookbooks/wordpress/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "mysql"
 
 package "subversion"