donate: add missing redirects

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index c5ab30ebe6f868ab62fdfb36b433e5e076858210..66a112339f7d69dc9e9b3f39eaaf46e6776f2814 100644 (file)
--- 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
 
   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"
 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 4d6cd5efa76e8327e7493e934a48dc70fc87de57..df3a98bd37d95c4ea767080970242b2388edea1a 100644 (file)
--- 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
   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/
 
   Redirect permanent /server2013 https://donate.openstreetmap.org/
   Redirect permanent /server2015 https://donate.openstreetmap.org/