Split stateofthemap cookbook to allow parallel testing

diff --git a/.kitchen.yml b/.kitchen.yml
index 84a501546457fc32f8534d7e2d63a82c28823be4..418b11cf8f2dccda7e840a4ea893d63ec4ffbfd3 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -318,6 +318,15 @@ suites:
   - name: stateofthemap
     run_list:
       - recipe[stateofthemap::default]
   - name: stateofthemap
     run_list:
       - recipe[stateofthemap::default]

+  - name: stateofthemap-static
+    run_list:
+      - recipe[stateofthemap::static]
+  - name: stateofthemap-jekyll
+    run_list:
+      - recipe[stateofthemap::jekyll]
+  - name: stateofthemap-wordpress
+    run_list:
+      - recipe[stateofthemap::wordpress]

   - name: subversion
     run_list:
       - recipe[subversion::default]
   - name: subversion
     run_list:
       - recipe[subversion::default]

diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 06d3eed879965b1136f0e5042baf7db6ed057fca..6b64db9e022c618f6b74950ac69c5e978758ba1d 100644 (file)
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -17,11 +17,6 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "ruby"
-include_recipe "wordpress"
-
-passwords = data_bag_item("stateofthemap", "passwords")
-

 git "/srv/stateofthemap.org" do
   action :sync
   repository "https://git.openstreetmap.org/public/stateofthemap.git"
 git "/srv/stateofthemap.org" do
   action :sync
   repository "https://git.openstreetmap.org/public/stateofthemap.git"


@@ -42,333 +37,3 @@ apache_site "stateofthemap.org" do
   template "apache.erb"
   directory "/srv/stateofthemap.org"
 end
   template "apache.erb"
   directory "/srv/stateofthemap.org"
 end

-
-directory "/srv/2007.stateofthemap.org" do
-  owner "wordpress"
-  group "wordpress"
-  mode "755"
-end
-
-wordpress_site "2007.stateofthemap.org" do
-  aliases "2007.stateofthemap.com"
-  directory "/srv/2007.stateofthemap.org/wp"
-  database_name "sotm2007"
-  database_user "sotm2007"
-  database_password passwords["sotm2007"]
-  database_prefix "wp_sotm_"
-  fpm_prometheus_port 12007
-end
-
-wordpress_theme "2007.stateofthemap.org-refreshwp-11" do
-  theme "refreshwp-11"
-  site "2007.stateofthemap.org"
-  repository "https://git.openstreetmap.org/public/stateofthemap.git"
-  revision "theme-2007"
-end
-
-# wordpress_plugin "2007.stateofthemap.org-geopress" do
-#   plugin "geopress"
-#   site "2007.stateofthemap.org"
-# end
-
-directory "/srv/2008.stateofthemap.org" do
-  owner "wordpress"
-  group "wordpress"
-  mode "755"
-end
-
-wordpress_site "2008.stateofthemap.org" do
-  aliases "2008.stateofthemap.com"
-  directory "/srv/2008.stateofthemap.org/wp"
-  database_name "sotm2008"
-  database_user "sotm2008"
-  database_password passwords["sotm2008"]
-  database_prefix "wp_sotm08_"
-  fpm_prometheus_port 12008
-end
-
-wordpress_theme "2008.stateofthemap.org-refreshwp-11" do
-  theme "refreshwp-11"
-  site "2008.stateofthemap.org"
-  repository "https://git.openstreetmap.org/public/stateofthemap.git"
-  revision "theme-2008"
-end
-
-# wordpress_plugin "2008.stateofthemap.org-geopress" do
-#   plugin "geopress"
-#   site "2008.stateofthemap.org"
-# end
-
-directory "/srv/2009.stateofthemap.org" do
-  owner "wordpress"
-  group "wordpress"
-  mode "755"
-end
-
-git "/srv/2009.stateofthemap.org" do
-  action :sync
-  repository "https://git.openstreetmap.org/public/stateofthemap.git"
-  revision "resources-2009"
-  depth 1
-  user "wordpress"
-  group "wordpress"
-end
-
-wordpress_site "2009.stateofthemap.org" do
-  aliases "2009.stateofthemap.com"
-  directory "/srv/2009.stateofthemap.org/wp"
-  database_name "sotm2009"
-  database_user "sotm2009"
-  database_password passwords["sotm2009"]
-  urls "/register" => "/srv/2009.stateofthemap.org/register",
-       "/register-pro-user" => "/srv/2009.stateofthemap.org/register-pro-user",
-       "/podcasts" => "/srv/2009.stateofthemap.org/podcasts"
-  fpm_prometheus_port 12009
-end
-
-wordpress_theme "2009.stateofthemap.org-aerodrome" do
-  theme "aerodrome"
-  site "2009.stateofthemap.org"
-  repository "https://git.openstreetmap.org/public/stateofthemap.git"
-  revision "theme-2009"
-end
-
-# wordpress_plugin "2009.stateofthemap.org-wp-sticky" do
-#   plugin "wp-sticky"
-#   site "2009.stateofthemap.org"
-# end
-
-directory "/srv/2010.stateofthemap.org" do
-  owner "wordpress"
-  group "wordpress"
-  mode "755"
-end
-
-git "/srv/2010.stateofthemap.org" do
-  action :sync
-  repository "https://git.openstreetmap.org/public/stateofthemap.git"
-  revision "resources-2010"
-  depth 1
-  user "wordpress"
-  group "wordpress"
-end
-
-wordpress_site "2010.stateofthemap.org" do
-  aliases "2010.stateofthemap.com"
-  directory "/srv/2010.stateofthemap.org/wp"
-  database_name "sotm2010"
-  database_user "sotm2010"
-  database_password passwords["sotm2010"]
-  urls "/register" => "/srv/2010.stateofthemap.org/register"
-  fpm_prometheus_port 12010
-end
-
-wordpress_theme "2010.stateofthemap.org-aerodrome" do
-  theme "aerodrome"
-  site "2010.stateofthemap.org"
-  repository "https://git.openstreetmap.org/public/stateofthemap.git"
-  revision "theme-2010"
-end
-
-wordpress_plugin "2010.stateofthemap.org-sitepress-multilingual-cms" do
-  plugin "sitepress-multilingual-cms"
-  site "2010.stateofthemap.org"
-  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
-  revision "master"
-  not_if { kitchen? }
-end
-
-# wordpress_plugin "2010.stateofthemap.org-wp-sticky" do
-#   plugin "wp-sticky"
-#   site "2010.stateofthemap.org"
-# end
-
-directory "/srv/2011.stateofthemap.org" do
-  owner "wordpress"
-  group "wordpress"
-  mode "755"
-end
-
-git "/srv/2011.stateofthemap.org" do
-  action :sync
-  repository "https://git.openstreetmap.org/public/stateofthemap.git"
-  revision "resources-2011"
-  depth 1
-  user "wordpress"
-  group "wordpress"
-end
-
-wordpress_site "2011.stateofthemap.org" do
-  aliases "2011.stateofthemap.com"
-  directory "/srv/2011.stateofthemap.org/wp"
-  database_name "sotm2011"
-  database_user "sotm2011"
-  database_password passwords["sotm2011"]
-  urls "/register" => "/srv/2011.stateofthemap.org/register"
-  fpm_prometheus_port 12011
-end
-
-wordpress_theme "2011.stateofthemap.org-aerodrome" do
-  theme "aerodrome"
-  site "2011.stateofthemap.org"
-  repository "https://git.openstreetmap.org/public/stateofthemap.git"
-  revision "theme-2011"
-end
-
-wordpress_plugin "2011.stateofthemap.org-sitepress-multilingual-cms" do
-  plugin "sitepress-multilingual-cms"
-  site "2011.stateofthemap.org"
-  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
-  revision "master"
-  not_if { kitchen? }
-end
-
-# wordpress_plugin "2011.stateofthemap.org-wp-sticky" do
-#   plugin "wp-sticky"
-#   site "2011.stateofthemap.org"
-# end
-
-directory "/srv/2012.stateofthemap.org" do
-  owner "wordpress"
-  group "wordpress"
-  mode "755"
-end
-
-git "/srv/2012.stateofthemap.org" do
-  action :sync
-  repository "https://git.openstreetmap.org/public/stateofthemap.git"
-  revision "resources-2012"
-  depth 1
-  user "wordpress"
-  group "wordpress"
-end
-
-wordpress_site "2012.stateofthemap.org" do
-  aliases "2012.stateofthemap.com"
-  directory "/srv/2012.stateofthemap.org/wp"
-  database_name "sotm2012"
-  database_user "sotm2012"
-  database_password passwords["sotm2012"]
-  urls "/register" => "/srv/2012.stateofthemap.org/register"
-  fpm_prometheus_port 12012
-end
-
-wordpress_theme "2012.stateofthemap.org-aerodrome" do
-  theme "aerodrome"
-  site "2012.stateofthemap.org"
-  repository "https://git.openstreetmap.org/public/stateofthemap.git"
-  revision "theme-2012"
-end
-
-wordpress_plugin "2012.stateofthemap.org-leaflet-maps-marker" do
-  plugin "leaflet-maps-marker"
-  site "2012.stateofthemap.org"
-end
-
-wordpress_plugin "2012.stateofthemap.org-sitepress-multilingual-cms" do
-  plugin "sitepress-multilingual-cms"
-  site "2012.stateofthemap.org"
-  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
-  revision "master"
-  not_if { kitchen? }
-end
-
-# wordpress_plugin "2012.stateofthemap.org-wp-sticky" do
-#   plugin "wp-sticky"
-#   site "2012.stateofthemap.org"
-# end
-
-%w[2013].each do |year|
-  git "/srv/#{year}.stateofthemap.org" do
-    action :sync
-    repository "https://git.openstreetmap.org/public/stateofthemap.git"
-    revision "site-#{year}"
-    depth 1
-    user "root"
-    group "root"
-  end
-
-  ssl_certificate "#{year}.stateofthemap.org" do
-    domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com", "#{year}.sotm.org"]
-    notifies :reload, "service[apache2]"
-  end
-
-  apache_site "#{year}.stateofthemap.org" do
-    template "apache.static.erb"
-    directory "/srv/#{year}.stateofthemap.org"
-    variables :year => year
-  end
-end
-
-package %w[
-  gcc
-  g++
-  make
-  libssl-dev
-  zlib1g-dev
-  pkg-config
-]
-
-apache_module "expires"
-apache_module "rewrite"
-
-%w[2016 2017 2018 2019 2020 2021 2022].each do |year|
-  git "/srv/#{year}.stateofthemap.org" do
-    action :sync
-    repository "https://github.com/openstreetmap/stateofthemap-#{year}.git"
-    depth 1
-    user "root"
-    group "root"
-    notifies :run, "bundle_install[/srv/#{year}.stateofthemap.org]"
-  end
-
-  directory "/srv/#{year}.stateofthemap.org/_site" do
-    mode "755"
-    owner "nobody"
-    group "nogroup"
-  end
-
-  # Workaround https://github.com/jekyll/jekyll/issues/7804
-  # by creating a .jekyll-cache folder
-  directory "/srv/#{year}.stateofthemap.org/.jekyll-cache" do
-    mode "755"
-    owner "nobody"
-    group "nogroup"
-  end
-
-  bundle_install "/srv/#{year}.stateofthemap.org" do
-    action :nothing
-    options "--deployment --jobs #{node[:cpu][:total]}"
-    user "root"
-    group "root"
-    notifies :run, "bundle_exec[/srv/#{year}.stateofthemap.org]"
-    only_if { ::File.exist?("/srv/#{year}.stateofthemap.org/Gemfile") }
-  end
-
-  bundle_exec "/srv/#{year}.stateofthemap.org" do
-    action :nothing
-    command "jekyll build --trace --baseurl=https://#{year}.stateofthemap.org"
-    user "nobody"
-    group "nogroup"
-    environment "LANG" => "C.UTF-8"
-  end
-
-  ssl_certificate "#{year}.stateofthemap.org" do
-    domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com", "#{year}.sotm.org"]
-    notifies :reload, "service[apache2]"
-  end
-
-  apache_site "#{year}.stateofthemap.org" do
-    template "apache.jekyll.erb"
-    directory "/srv/#{year}.stateofthemap.org/_site"
-    variables :year => year
-  end
-end
-
-template "/etc/cron.daily/sotm-backup" do
-  source "backup.cron.erb"
-  owner "root"
-  group "root"
-  mode "750"
-  variables :passwords => passwords
-end

diff --git a/cookbooks/stateofthemap/recipes/jekyll.rb b/cookbooks/stateofthemap/recipes/jekyll.rb
new file mode 100644 (file)
index 0000000..a9dd65c
--- /dev/null
+++ b/cookbooks/stateofthemap/recipes/jekyll.rb
@@ -0,0 +1,85 @@
+#
+# Cookbook:: stateofthemap
+# Recipe:: jekyll
+#
+# Copyright:: 2022, OpenStreetMap Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe "ruby"
+
+package %w[
+  gcc
+  g++
+  make
+  libssl-dev
+  zlib1g-dev
+  pkg-config
+]
+
+apache_module "expires"
+apache_module "rewrite"
+
+%w[2016 2017 2018 2019 2020 2021 2022].each do |year|
+  git "/srv/#{year}.stateofthemap.org" do
+    action :sync
+    repository "https://github.com/openstreetmap/stateofthemap-#{year}.git"
+    depth 1
+    user "root"
+    group "root"
+    notifies :run, "bundle_install[/srv/#{year}.stateofthemap.org]"
+  end
+
+  directory "/srv/#{year}.stateofthemap.org/_site" do
+    mode "755"
+    owner "nobody"
+    group "nogroup"
+  end
+
+  # Workaround https://github.com/jekyll/jekyll/issues/7804
+  # by creating a .jekyll-cache folder
+  directory "/srv/#{year}.stateofthemap.org/.jekyll-cache" do
+    mode "755"
+    owner "nobody"
+    group "nogroup"
+  end
+
+  bundle_install "/srv/#{year}.stateofthemap.org" do
+    action :nothing
+    options "--deployment --jobs #{node[:cpu][:total]}"
+    user "root"
+    group "root"
+    notifies :run, "bundle_exec[/srv/#{year}.stateofthemap.org]"
+    only_if { ::File.exist?("/srv/#{year}.stateofthemap.org/Gemfile") }
+  end
+
+  bundle_exec "/srv/#{year}.stateofthemap.org" do
+    action :nothing
+    command "jekyll build --trace --baseurl=https://#{year}.stateofthemap.org"
+    user "nobody"
+    group "nogroup"
+    environment "LANG" => "C.UTF-8"
+  end
+
+  ssl_certificate "#{year}.stateofthemap.org" do
+    domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com", "#{year}.sotm.org"]
+    notifies :reload, "service[apache2]"
+  end
+
+  apache_site "#{year}.stateofthemap.org" do
+    template "apache.jekyll.erb"
+    directory "/srv/#{year}.stateofthemap.org/_site"
+    variables :year => year
+  end
+end

diff --git a/cookbooks/stateofthemap/recipes/static.rb b/cookbooks/stateofthemap/recipes/static.rb
new file mode 100644 (file)
index 0000000..a25f7e0
--- /dev/null
+++ b/cookbooks/stateofthemap/recipes/static.rb
@@ -0,0 +1,40 @@
+#
+# Cookbook:: stateofthemap
+# Recipe:: static
+#
+# Copyright:: 2022, OpenStreetMap Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+%w[2013].each do |year|
+  git "/srv/#{year}.stateofthemap.org" do
+    action :sync
+    repository "https://git.openstreetmap.org/public/stateofthemap.git"
+    revision "site-#{year}"
+    depth 1
+    user "root"
+    group "root"
+  end
+
+  ssl_certificate "#{year}.stateofthemap.org" do
+    domains ["#{year}.stateofthemap.org", "#{year}.stateofthemap.com", "#{year}.sotm.org"]
+    notifies :reload, "service[apache2]"
+  end
+
+  apache_site "#{year}.stateofthemap.org" do
+    template "apache.static.erb"
+    directory "/srv/#{year}.stateofthemap.org"
+    variables :year => year
+  end
+end

diff --git a/cookbooks/stateofthemap/recipes/wordpress.rb b/cookbooks/stateofthemap/recipes/wordpress.rb
new file mode 100644 (file)
index 0000000..99efc7f
--- /dev/null
+++ b/cookbooks/stateofthemap/recipes/wordpress.rb
@@ -0,0 +1,265 @@
+#
+# Cookbook:: stateofthemap
+# Recipe:: wordpress
+#
+# Copyright:: 2022, OpenStreetMap Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe "wordpress"
+
+passwords = data_bag_item("stateofthemap", "passwords")
+
+directory "/srv/2007.stateofthemap.org" do
+  owner "wordpress"
+  group "wordpress"
+  mode "755"
+end
+
+wordpress_site "2007.stateofthemap.org" do
+  aliases "2007.stateofthemap.com"
+  directory "/srv/2007.stateofthemap.org/wp"
+  database_name "sotm2007"
+  database_user "sotm2007"
+  database_password passwords["sotm2007"]
+  database_prefix "wp_sotm_"
+  fpm_prometheus_port 12007
+end
+
+wordpress_theme "2007.stateofthemap.org-refreshwp-11" do
+  theme "refreshwp-11"
+  site "2007.stateofthemap.org"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
+  revision "theme-2007"
+end
+
+# wordpress_plugin "2007.stateofthemap.org-geopress" do
+#   plugin "geopress"
+#   site "2007.stateofthemap.org"
+# end
+
+directory "/srv/2008.stateofthemap.org" do
+  owner "wordpress"
+  group "wordpress"
+  mode "755"
+end
+
+wordpress_site "2008.stateofthemap.org" do
+  aliases "2008.stateofthemap.com"
+  directory "/srv/2008.stateofthemap.org/wp"
+  database_name "sotm2008"
+  database_user "sotm2008"
+  database_password passwords["sotm2008"]
+  database_prefix "wp_sotm08_"
+  fpm_prometheus_port 12008
+end
+
+wordpress_theme "2008.stateofthemap.org-refreshwp-11" do
+  theme "refreshwp-11"
+  site "2008.stateofthemap.org"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
+  revision "theme-2008"
+end
+
+# wordpress_plugin "2008.stateofthemap.org-geopress" do
+#   plugin "geopress"
+#   site "2008.stateofthemap.org"
+# end
+
+directory "/srv/2009.stateofthemap.org" do
+  owner "wordpress"
+  group "wordpress"
+  mode "755"
+end
+
+git "/srv/2009.stateofthemap.org" do
+  action :sync
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
+  revision "resources-2009"
+  depth 1
+  user "wordpress"
+  group "wordpress"
+end
+
+wordpress_site "2009.stateofthemap.org" do
+  aliases "2009.stateofthemap.com"
+  directory "/srv/2009.stateofthemap.org/wp"
+  database_name "sotm2009"
+  database_user "sotm2009"
+  database_password passwords["sotm2009"]
+  urls "/register" => "/srv/2009.stateofthemap.org/register",
+       "/register-pro-user" => "/srv/2009.stateofthemap.org/register-pro-user",
+       "/podcasts" => "/srv/2009.stateofthemap.org/podcasts"
+  fpm_prometheus_port 12009
+end
+
+wordpress_theme "2009.stateofthemap.org-aerodrome" do
+  theme "aerodrome"
+  site "2009.stateofthemap.org"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
+  revision "theme-2009"
+end
+
+# wordpress_plugin "2009.stateofthemap.org-wp-sticky" do
+#   plugin "wp-sticky"
+#   site "2009.stateofthemap.org"
+# end
+
+directory "/srv/2010.stateofthemap.org" do
+  owner "wordpress"
+  group "wordpress"
+  mode "755"
+end
+
+git "/srv/2010.stateofthemap.org" do
+  action :sync
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
+  revision "resources-2010"
+  depth 1
+  user "wordpress"
+  group "wordpress"
+end
+
+wordpress_site "2010.stateofthemap.org" do
+  aliases "2010.stateofthemap.com"
+  directory "/srv/2010.stateofthemap.org/wp"
+  database_name "sotm2010"
+  database_user "sotm2010"
+  database_password passwords["sotm2010"]
+  urls "/register" => "/srv/2010.stateofthemap.org/register"
+  fpm_prometheus_port 12010
+end
+
+wordpress_theme "2010.stateofthemap.org-aerodrome" do
+  theme "aerodrome"
+  site "2010.stateofthemap.org"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
+  revision "theme-2010"
+end
+
+wordpress_plugin "2010.stateofthemap.org-sitepress-multilingual-cms" do
+  plugin "sitepress-multilingual-cms"
+  site "2010.stateofthemap.org"
+  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
+  revision "master"
+  not_if { kitchen? }
+end
+
+# wordpress_plugin "2010.stateofthemap.org-wp-sticky" do
+#   plugin "wp-sticky"
+#   site "2010.stateofthemap.org"
+# end
+
+directory "/srv/2011.stateofthemap.org" do
+  owner "wordpress"
+  group "wordpress"
+  mode "755"
+end
+
+git "/srv/2011.stateofthemap.org" do
+  action :sync
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
+  revision "resources-2011"
+  depth 1
+  user "wordpress"
+  group "wordpress"
+end
+
+wordpress_site "2011.stateofthemap.org" do
+  aliases "2011.stateofthemap.com"
+  directory "/srv/2011.stateofthemap.org/wp"
+  database_name "sotm2011"
+  database_user "sotm2011"
+  database_password passwords["sotm2011"]
+  urls "/register" => "/srv/2011.stateofthemap.org/register"
+  fpm_prometheus_port 12011
+end
+
+wordpress_theme "2011.stateofthemap.org-aerodrome" do
+  theme "aerodrome"
+  site "2011.stateofthemap.org"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
+  revision "theme-2011"
+end
+
+wordpress_plugin "2011.stateofthemap.org-sitepress-multilingual-cms" do
+  plugin "sitepress-multilingual-cms"
+  site "2011.stateofthemap.org"
+  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
+  revision "master"
+  not_if { kitchen? }
+end
+
+# wordpress_plugin "2011.stateofthemap.org-wp-sticky" do
+#   plugin "wp-sticky"
+#   site "2011.stateofthemap.org"
+# end
+
+directory "/srv/2012.stateofthemap.org" do
+  owner "wordpress"
+  group "wordpress"
+  mode "755"
+end
+
+git "/srv/2012.stateofthemap.org" do
+  action :sync
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
+  revision "resources-2012"
+  depth 1
+  user "wordpress"
+  group "wordpress"
+end
+
+wordpress_site "2012.stateofthemap.org" do
+  aliases "2012.stateofthemap.com"
+  directory "/srv/2012.stateofthemap.org/wp"
+  database_name "sotm2012"
+  database_user "sotm2012"
+  database_password passwords["sotm2012"]
+  urls "/register" => "/srv/2012.stateofthemap.org/register"
+  fpm_prometheus_port 12012
+end
+
+wordpress_theme "2012.stateofthemap.org-aerodrome" do
+  theme "aerodrome"
+  site "2012.stateofthemap.org"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
+  revision "theme-2012"
+end
+
+wordpress_plugin "2012.stateofthemap.org-leaflet-maps-marker" do
+  plugin "leaflet-maps-marker"
+  site "2012.stateofthemap.org"
+end
+
+wordpress_plugin "2012.stateofthemap.org-sitepress-multilingual-cms" do
+  plugin "sitepress-multilingual-cms"
+  site "2012.stateofthemap.org"
+  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
+  revision "master"
+  not_if { kitchen? }
+end
+
+# wordpress_plugin "2012.stateofthemap.org-wp-sticky" do
+#   plugin "wp-sticky"
+#   site "2012.stateofthemap.org"
+# end
+
+template "/etc/cron.daily/sotm-backup" do
+  source "backup.cron.erb"
+  owner "root"
+  group "root"
+  mode "750"
+  variables :passwords => passwords
+end

diff --git a/roles/stateofthemap.rb b/roles/stateofthemap.rb
index 5afe706c2d6628b4c29f14516d9dd56591f307f4..9eba0c4198666e6f255d0f1bb19cbe89c8ea6304 100644 (file)
--- a/roles/stateofthemap.rb
+++ b/roles/stateofthemap.rb
@@ -2,5 +2,8 @@ name "stateofthemap"
 description "Role applied to State of the Map servers"
 
 run_list(
 description "Role applied to State of the Map servers"
 
 run_list(

-  "recipe[stateofthemap]"
+  "recipe[stateofthemap]",
+  "recipe[stateofthemap::jekyll]",
+  "recipe[stateofthemap::static]",
+  "recipe[stateofthemap::wordpress]"

 )
 )