From: Grant Slater <git@firefishy.com>
Date: Sat, 25 Feb 2017 22:25:40 +0000 (+0000)
Subject: Fix historical blog.osm.org file links
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/48811b45144abd8762567fe74634ce986565de3b

Fix historical blog.osm.org file links
---

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 082c34bf9..fd7226288 100644
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -37,8 +37,7 @@ wordpress_site "blog.openstreetmap.org" do
   database_user "osm-blog-user"
   database_password passwords["osm-blog-user"]
   urls "/casts" => "/srv/blog.openstreetmap.org/casts",
-       "/images" => "/srv/blog.openstreetmap.org/images",
-       "/news" => "/srv/blog.openstreetmap.org/news"
+       "/images" => "/srv/blog.openstreetmap.org/images"
 end
 
 wordpress_theme "osmblog-wp-theme" do
diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb
index 6281fc2db..59b63f753 100644
--- a/cookbooks/wordpress/templates/default/apache.erb
+++ b/cookbooks/wordpress/templates/default/apache.erb
@@ -35,6 +35,11 @@
   DocumentRoot <%= @directory %>
 <% @urls.each do |url,directory| -%>
   Alias <%= url %> <%= directory %>
+  <Directory <%= directory %>>
+    AllowOverride None
+    php_admin_flag engine off
+    Require all granted
+  </Directory>
 <% end -%>
 
   php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/tmp/