Fix historical blog.osm.org file links

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 082c34bf929b7ebc4ab481f97dee29cb6aecf514..fd72262883e7c41dd8c5ef5b708a80c58e0ff9da 100644 (file)
--- 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",
   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
 end
 
 wordpress_theme "osmblog-wp-theme" do

diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb
index 6281fc2dbb859459cc887430d0ef31e304f375fd..59b63f753b72f0b5562483a506c923e307aaf5d1 100644 (file)
--- 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 %>
   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/
 <% end -%>
 
   php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/tmp/