From: Grant Slater <git@firefishy.com>
Date: Wed, 21 Sep 2016 22:04:30 +0000 (+0100)
Subject: donate: add missing redirects
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/9bd884562817e0d9320de88485ae457c9535da76?hp=9f895d605dd45ff875f72d26d441773a23e9263c

donate: add missing redirects
---

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index c5ab30ebe..66a112339 100644
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -51,6 +51,12 @@ mysql_database "donate" do
   permissions "donate@localhost" => :all
 end
 
+directory "/srv/donate.openstreetmap.org" do
+  owner "donate"
+  group "donate"
+  mode 0o755
+end
+
 git "/srv/donate.openstreetmap.org" do
   action :sync
   repository "git://github.com/osmfoundation/donation-drive.git"
diff --git a/cookbooks/donate/templates/default/apache.erb b/cookbooks/donate/templates/default/apache.erb
index 4d6cd5efa..df3a98bd3 100644
--- a/cookbooks/donate/templates/default/apache.erb
+++ b/cookbooks/donate/templates/default/apache.erb
@@ -43,6 +43,9 @@
   Alias /donors.csv /srv/donate.openstreetmap.org/data/donors.csv
 
   # Redirect previous compaigns to homepage
+  Redirect permanent /domain https://donate.openstreetmap.org/
+  Redirect permanent /memorial https://donate.openstreetmap.org/
+  Redirect permanent /server2011 https://donate.openstreetmap.org/
   Redirect permanent /server2013 https://donate.openstreetmap.org/
   Redirect permanent /server2015 https://donate.openstreetmap.org/