Switch forum.osm.org to letsencrypt

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

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 4bf5765f2220126207039a37c3877b0fed8d4483..7130c17289c08bf39e2f56dc9b342415087bbb3f 100644 (file)
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -25,12 +25,16 @@ passwords = data_bag_item("forum", "passwords")
 package "php"
 package "php-cli"
 package "php-mysql"
+package "php-xml"
 package "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"]
+  fallback_certificate "openstreetmap"
+  notifies :reload, "service[apache2]"
 end
 
 apache_site "forum.openstreetmap.org" do
@@ -46,10 +50,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
@@ -67,7 +72,7 @@ end
 template "/srv/forum.openstreetmap.org/html/config.php" do
   source "config.php.erb"
   owner "forum"
-  group "forum"
+  group "www-data"
   mode 0o440
   variables :passwords => passwords
 end