From 32a423888e0d6b5254c55e4faf418b31749dc69e Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 20 Feb 2017 15:34:09 +0000 Subject: [PATCH] Merge what remains of apache::ssl into apache::default --- cookbooks/apache/recipes/default.rb | 8 +++++++ cookbooks/apache/recipes/ssl.rb | 28 ------------------------ cookbooks/blogs/recipes/default.rb | 2 +- cookbooks/cgiirc/recipes/default.rb | 2 +- cookbooks/chef/recipes/server.rb | 2 +- cookbooks/dev/recipes/default.rb | 2 +- cookbooks/dns/recipes/default.rb | 2 +- cookbooks/donate/recipes/default.rb | 2 +- cookbooks/forum/recipes/default.rb | 2 +- cookbooks/foundation/recipes/owg.rb | 2 +- cookbooks/git/recipes/web.rb | 2 +- cookbooks/gps-tile/recipes/default.rb | 2 +- cookbooks/kibana/recipes/default.rb | 2 +- cookbooks/letsencrypt/recipes/default.rb | 2 +- cookbooks/mailman/recipes/default.rb | 2 +- cookbooks/mediawiki/recipes/default.rb | 2 +- cookbooks/munin/recipes/server.rb | 2 +- cookbooks/nominatim/recipes/default.rb | 2 +- cookbooks/osqa/recipes/default.rb | 2 +- cookbooks/otrs/recipes/default.rb | 2 +- cookbooks/piwik/recipes/default.rb | 2 +- cookbooks/planet/recipes/default.rb | 2 +- cookbooks/serverinfo/recipes/default.rb | 2 +- cookbooks/stats/recipes/default.rb | 2 +- cookbooks/subversion/recipes/default.rb | 2 +- cookbooks/taginfo/recipes/default.rb | 2 +- cookbooks/trac/recipes/default.rb | 2 +- cookbooks/web/recipes/backend.rb | 2 +- cookbooks/web/recipes/frontend.rb | 2 +- cookbooks/wordpress/recipes/default.rb | 2 +- 30 files changed, 36 insertions(+), 56 deletions(-) delete mode 100644 cookbooks/apache/recipes/ssl.rb diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb index a24ea18f2..72af9140b 100644 --- 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 index b2818df70..000000000 --- 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 8389b6260..faf12775c 100644 --- 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 2c80239ff..732d251fc 100644 --- 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 fe668ad1d..8edf4e559 100644 --- 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 aefd6594d..08af7112b 100644 --- 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 8db66d6c9..6c19048f2 100644 --- 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 6cfde3722..d1b431bd7 100644 --- 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 7288824b5..e6f131113 100644 --- 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 cc093b3c9..d0dd92a84 100644 --- 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 24307121d..09954bf1d 100644 --- 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 87c2c49ac..ed60f1fd7 100644 --- 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 6a985ae34..788e95513 100644 --- 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 f08fdf3ac..f3ddd9712 100644 --- 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 8fb1b9092..6240d2696 100644 --- 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 8e7d01bfa..2e9ccd1b4 100644 --- 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 5861bf5ea..244493612 100644 --- 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 b098c599d..ac1b27f33 100644 --- 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 5d5b4b1f2..b7a6a8e6f 100644 --- 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 b6861d1a2..946806ea4 100644 --- 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 36bb05d2b..40a740a86 100644 --- 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 452b54276..33c01751b 100644 --- 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 c027480d9..97051e1a1 100644 --- 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 2c92fb2b2..323b67f89 100644 --- 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 51a6de59c..582dbaed3 100644 --- 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 3b0983a25..7d0db9b2d 100644 --- 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 fab0564b0..b149a5751 100644 --- 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 38515b07a..afc852c00 100644 --- 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 636cb56d7..3703cef31 100644 --- 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 187beac66..a694f42b2 100644 --- 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" -- 2.39.5