Update piwik to 3.2.0

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

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index ec21f90a9ff74de3cefc7d2b03f1146c6e547481..b05dd8d19671b998bf32644a9b716ebbf36af923 100644 (file)
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -21,10 +21,30 @@ include_recipe "wordpress"
 
 passwords = data_bag_item("stateofthemap", "passwords")
 
 
 passwords = data_bag_item("stateofthemap", "passwords")
 

+git "/srv/stateofthemap.org" do
+  action :sync
+  repository "git://git.openstreetmap.org/stateofthemap.git"
+  revision "chooser"
+  user "root"
+  group "root"
+end
+
+ssl_certificate "stateofthemap.org" do
+  domains ["stateofthemap.org", "www.stateofthemap.org",
+           "stateofthemap.com", "www.stateofthemap.com",
+           "sotm.org", "www.sotm.org"]
+  notifies :reload, "service[apache2]"
+end
+
+apache_site "stateofthemap.org" do
+  template "apache.erb"
+  directory "/srv/stateofthemap.org"
+end
+

 directory "/srv/2007.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
 directory "/srv/2007.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 wordpress_site "2007.stateofthemap.org" do
 end
 
 wordpress_site "2007.stateofthemap.org" do


@@ -37,25 +57,22 @@ wordpress_site "2007.stateofthemap.org" do
   database_prefix "wp_sotm_"
 end
 
   database_prefix "wp_sotm_"
 end
 

-wordpress_theme "refreshwp-11" do
+wordpress_theme "2007.stateofthemap.org-refreshwp-11" do
+  name "refreshwp-11"

   site "2007.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2007"
 end
 
   site "2007.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2007"
 end
 

-wordpress_plugin "geopress" do
-  site "2007.stateofthemap.org"
-end
-
-wordpress_plugin "sem-static-front" do
+wordpress_plugin "2007.stateofthemap.org-geopress" do
+  name "geopress"

   site "2007.stateofthemap.org"
   site "2007.stateofthemap.org"

-  repository "git://chef.openstreetmap.org/sem-static-front.git"

 end
 
 directory "/srv/2008.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
 end
 
 directory "/srv/2008.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 wordpress_site "2008.stateofthemap.org" do
 end
 
 wordpress_site "2008.stateofthemap.org" do


@@ -68,20 +85,22 @@ wordpress_site "2008.stateofthemap.org" do
   database_prefix "wp_sotm08_"
 end
 
   database_prefix "wp_sotm08_"
 end
 

-wordpress_theme "refreshwp-11" do
+wordpress_theme "2008.stateofthemap.org-refreshwp-11" do
+  name "refreshwp-11"

   site "2008.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2008"
 end
 
   site "2008.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2008"
 end
 

-wordpress_plugin "geopress" do
+wordpress_plugin "2008.stateofthemap.org-geopress" do
+  name "geopress"

   site "2008.stateofthemap.org"
 end
 
 directory "/srv/2009.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
   site "2008.stateofthemap.org"
 end
 
 directory "/srv/2009.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 git "/srv/2009.stateofthemap.org" do
 end
 
 git "/srv/2009.stateofthemap.org" do


@@ -104,20 +123,22 @@ wordpress_site "2009.stateofthemap.org" do
        "/podcasts" => "/srv/2009.stateofthemap.org/podcasts"
 end
 
        "/podcasts" => "/srv/2009.stateofthemap.org/podcasts"
 end
 

-wordpress_theme "aerodrome" do
+wordpress_theme "2009.stateofthemap.org-aerodrome" do
+  name "aerodrome"

   site "2009.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2009"
 end
 
   site "2009.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2009"
 end
 

-wordpress_plugin "wp-sticky" do
+wordpress_plugin "2009.stateofthemap.org-wp-sticky" do
+  name "wp-sticky"

   site "2009.stateofthemap.org"
 end
 
 directory "/srv/2010.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
   site "2009.stateofthemap.org"
 end
 
 directory "/srv/2010.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 git "/srv/2010.stateofthemap.org" do
 end
 
 git "/srv/2010.stateofthemap.org" do


@@ -138,25 +159,28 @@ wordpress_site "2010.stateofthemap.org" do
   urls "/register" => "/srv/2010.stateofthemap.org/register"
 end
 
   urls "/register" => "/srv/2010.stateofthemap.org/register"
 end
 

-wordpress_theme "aerodrome" do
+wordpress_theme "2010.stateofthemap.org-aerodrome" do
+  name "aerodrome"

   site "2010.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2010"
 end
 
   site "2010.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2010"
 end
 

-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "2010.stateofthemap.org-sitepress-multilingual-cms" do
+  name "sitepress-multilingual-cms"

   site "2010.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
   site "2010.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 

-wordpress_plugin "wp-sticky" do
+wordpress_plugin "2010.stateofthemap.org-wp-sticky" do
+  name "wp-sticky"

   site "2010.stateofthemap.org"
 end
 
 directory "/srv/2011.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
   site "2010.stateofthemap.org"
 end
 
 directory "/srv/2011.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 git "/srv/2011.stateofthemap.org" do
 end
 
 git "/srv/2011.stateofthemap.org" do


@@ -177,25 +201,28 @@ wordpress_site "2011.stateofthemap.org" do
   urls "/register" => "/srv/2011.stateofthemap.org/register"
 end
 
   urls "/register" => "/srv/2011.stateofthemap.org/register"
 end
 

-wordpress_theme "aerodrome" do
+wordpress_theme "2011.stateofthemap.org-aerodrome" do
+  name "aerodrome"

   site "2011.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2011"
 end
 
   site "2011.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2011"
 end
 

-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "2011.stateofthemap.org-sitepress-multilingual-cms" do
+  name "sitepress-multilingual-cms"

   site "2011.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
   site "2011.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 

-wordpress_plugin "wp-sticky" do
+wordpress_plugin "2011.stateofthemap.org-wp-sticky" do
+  name "wp-sticky"

   site "2011.stateofthemap.org"
 end
 
 directory "/srv/2012.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"
   site "2011.stateofthemap.org"
 end
 
 directory "/srv/2012.stateofthemap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode 0o755

 end
 
 git "/srv/2012.stateofthemap.org" do
 end
 
 git "/srv/2012.stateofthemap.org" do


@@ -216,22 +243,26 @@ wordpress_site "2012.stateofthemap.org" do
   urls "/register" => "/srv/2012.stateofthemap.org/register"
 end
 
   urls "/register" => "/srv/2012.stateofthemap.org/register"
 end
 

-wordpress_theme "aerodrome" do
+wordpress_theme "2012.stateofthemap.org-aerodrome" do
+  name "aerodrome"

   site "2012.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2012"
 end
 
   site "2012.stateofthemap.org"
   repository "git://git.openstreetmap.org/stateofthemap.git"
   revision "theme-2012"
 end
 

-wordpress_plugin "leaflet-maps-marker" do
+wordpress_plugin "2012.stateofthemap.org-leaflet-maps-marker" do
+  name "leaflet-maps-marker"

   site "2012.stateofthemap.org"
 end
 
   site "2012.stateofthemap.org"
 end
 

-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "2012.stateofthemap.org-sitepress-multilingual-cms" do
+  name "sitepress-multilingual-cms"

   site "2012.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 
   site "2012.stateofthemap.org"
   repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
 end
 

-wordpress_plugin "wp-sticky" do
+wordpress_plugin "2012.stateofthemap.org-wp-sticky" do
+  name "wp-sticky"

   site "2012.stateofthemap.org"
 end
 
   site "2012.stateofthemap.org"
 end
 


@@ -239,6 +270,6 @@ template "/etc/cron.daily/sotm-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0750
+  mode 0o750

   variables :passwords => passwords
 end
   variables :passwords => passwords
 end