Allow hsts preload

[chef.git] / cookbooks / forum / recipes / default.rb

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 4ab841062159a7e15c63c9e850fd149fcbb79053..395f2ce390d8c61cc7a9a73dfb6ac0d377d31246 100644 (file)
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -8,7 +8,7 @@
 # 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,
@@ -16,22 +16,26 @@
 # 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"
 
 passwords = data_bag_item("forum", "passwords")
 
-package "php"
-package "php-cli"
-package "php-mysql"
-package "php-apcu"
+package %w[
+  php
+  php-cli
+  php-mysql
+  php-xml
+  php-apcu
+]
 
 apache_module "php7.0"
 apache_module "rewrite"
 
-apache_site "default" do
-  action [:disable]
+ssl_certificate "forum.openstreetmap.org" do
+  domains ["forum.openstreetmap.org", "forum.osm.org"]
+  notifies :reload, "service[apache2]"
 end
 
 apache_site "forum.openstreetmap.org" do
@@ -47,10 +51,11 @@ end
 git "/srv/forum.openstreetmap.org/html/" do
   action :sync
   repository "http://github.com/openstreetmap/openstreetmap-forum.git"
-  revision "openstreetmap"
+  revision "openstreetmap-1.5.10"
   depth 1
   user "forum"
   group "forum"
+  notifies :reload, "service[apache2]"
 end
 
 directory "/srv/forum.openstreetmap.org/html/cache/" do