Add clone civicrm-staging cookbook

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 46b6902ad57f5db1d5320c381670998dbe7a2ff9..8e4c21539f85fd4ab180a8832541ec5fd86d7d44 100644 (file)
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -20,6 +20,7 @@
 include_recipe "wordpress"
 
 passwords = data_bag_item("blog", "passwords")
 include_recipe "wordpress"
 
 passwords = data_bag_item("blog", "passwords")

+wp2fa_encrypt_keys = data_bag_item("blog", "wp2fa_encrypt_keys")

 
 directory "/srv/blog.openstreetmap.org" do
   owner "wordpress"
 
 directory "/srv/blog.openstreetmap.org" do
   owner "wordpress"


@@ -35,6 +36,7 @@ wordpress_site "blog.openstreetmap.org" do
   database_name "osm-blog"
   database_user "osm-blog-user"
   database_password passwords["osm-blog-user"]
   database_name "osm-blog"
   database_user "osm-blog-user"
   database_password passwords["osm-blog-user"]

+  wp2fa_encrypt_key wp2fa_encrypt_keys["key"]

   urls "/casts" => "/srv/blog.openstreetmap.org/casts",
        "/images" => "/srv/blog.openstreetmap.org/images",
        "/static" => "/srv/blog.openstreetmap.org/static"
   urls "/casts" => "/srv/blog.openstreetmap.org/casts",
        "/images" => "/srv/blog.openstreetmap.org/images",
        "/static" => "/srv/blog.openstreetmap.org/static"


@@ -97,6 +99,7 @@ end
 git "/srv/blog.openstreetmap.org/casts" do
   action :sync
   repository "https://github.com/openstreetmap/opengeodata-podcasts.git"
 git "/srv/blog.openstreetmap.org/casts" do
   action :sync
   repository "https://github.com/openstreetmap/opengeodata-podcasts.git"

+  revision "master"

   depth 1
   user "wordpress"
   group "wordpress"
   depth 1
   user "wordpress"
   group "wordpress"


@@ -105,6 +108,7 @@ end
 git "/srv/blog.openstreetmap.org/images" do
   action :sync
   repository "https://github.com/openstreetmap/opengeodata-images.git"
 git "/srv/blog.openstreetmap.org/images" do
   action :sync
   repository "https://github.com/openstreetmap/opengeodata-images.git"

+  revision "master"

   depth 1
   user "wordpress"
   group "wordpress"
   depth 1
   user "wordpress"
   group "wordpress"


@@ -113,6 +117,7 @@ end
 git "/srv/blog.openstreetmap.org/static" do
   action :sync
   repository "https://github.com/openstreetmap/opengeodata-static.git"
 git "/srv/blog.openstreetmap.org/static" do
   action :sync
   repository "https://github.com/openstreetmap/opengeodata-static.git"

+  revision "master"

   depth 1
   user "wordpress"
   group "wordpress"
   depth 1
   user "wordpress"
   group "wordpress"