mediawiki: add apache request duration logging

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index b0ff4aec098fd77f4d4fbc4546e502440ca4ecbb..5a876d8a6b16878924abf1d2426221071bb50c97 100644 (file)
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: blog
+# Cookbook:: blog

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, 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
 #
 #
 # 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
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -20,55 +20,89 @@
 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"
   group "wordpress"
 
 directory "/srv/blog.openstreetmap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0755
+  mode "755"

 end
 
 wordpress_site "blog.openstreetmap.org" do
 end
 
 wordpress_site "blog.openstreetmap.org" do

-  aliases "blog.osm.org", "blog.openstreetmap.com",
-          "blog.openstreetmap.net", "blog.openstreetmaps.org",
-          "blog.osmfoundation.org"
+  aliases ["blog.osm.org", "blog.openstreetmap.com",
+           "blog.openstreetmap.net", "blog.openstreetmaps.org",
+           "blog.osmfoundation.org",
+           "opengeodata.org", "www.opengeodata.org",
+           "old.opengeodata.org" # https://blog.openstreetmap.org/2010/02/25/old-opengeodata-posts-now-up-at-old-opengeodata-org/
+          ]

   directory "/srv/blog.openstreetmap.org/wp"
   database_name "osm-blog"
   database_user "osm-blog-user"
   database_password passwords["osm-blog-user"]
   directory "/srv/blog.openstreetmap.org/wp"
   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",
   urls "/casts" => "/srv/blog.openstreetmap.org/casts",
        "/images" => "/srv/blog.openstreetmap.org/images",

-       "/news" => "/srv/blog.openstreetmap.org/news"
+       "/static" => "/srv/blog.openstreetmap.org/static"
+  fpm_prometheus_port 11401

 end
 
 end
 

-wordpress_theme "osmblog-wp-theme" do
+wordpress_theme "blog.openstreetmap.org-osmblog-wp-theme" do
+  theme "osmblog-wp-theme"

   site "blog.openstreetmap.org"
   site "blog.openstreetmap.org"

-  repository "git://github.com/harry-wood/osmblog-wp-theme.git"
+  repository "https://github.com/osmfoundation/osmblog-wp-theme.git"

 end
 
 end
 

-wordpress_plugin "google-analytics-for-wordpress" do
+wordpress_plugin "blog.openstreetmap.org-google-analytics-for-wordpress" do
+  action :delete
+  plugin "google-analytics-for-wordpress"

   site "blog.openstreetmap.org"
 end
 
   site "blog.openstreetmap.org"
 end
 

-wordpress_plugin "google-sitemap-generator" do
+wordpress_plugin "blog.openstreetmap.org-google-sitemap-generator" do
+  action :delete
+  plugin "google-sitemap-generator"

   site "blog.openstreetmap.org"
 end
 
   site "blog.openstreetmap.org"
 end
 

-wordpress_plugin "shareadraft" do
+# wordpress_plugin "blog.openstreetmap.org-www-xml-sitemap-generator-org" do
+#   plugin "www-xml-sitemap-generator-org"
+#   site "blog.openstreetmap.org"
+# end
+
+wordpress_plugin "blog.openstreetmap.org-shareadraft" do
+  action :delete
+  plugin "shareadraft"
+  site "blog.openstreetmap.org"
+end
+
+wordpress_plugin "blog.openstreetmap.org-public-post-preview" do
+  plugin "public-post-preview"

   site "blog.openstreetmap.org"
 end
 
   site "blog.openstreetmap.org"
 end
 

-wordpress_plugin "sitepress-multilingual-cms" do
+wordpress_plugin "blog.openstreetmap.org-sitepress-multilingual-cms" do
+  plugin "sitepress-multilingual-cms"

   site "blog.openstreetmap.org"
   site "blog.openstreetmap.org"

-  repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+  repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
+  revision "master"
+  not_if { kitchen? }

 end
 
 end
 

-wordpress_plugin "wordpress-importer" do
+wordpress_plugin "blog.openstreetmap.org-wordpress-importer" do
+  action :delete
+  plugin "wordpress-importer"
+  site "blog.openstreetmap.org"
+end
+
+wordpress_plugin "blog.openstreetmap.org-wp-piwik" do
+  plugin "wp-piwik"

   site "blog.openstreetmap.org"
 end
 
 git "/srv/blog.openstreetmap.org/casts" do
   action :sync
   site "blog.openstreetmap.org"
 end
 
 git "/srv/blog.openstreetmap.org/casts" do
   action :sync

-  repository "git://github.com/openstreetmap/opengeodata-podcasts.git"
+  repository "https://github.com/openstreetmap/opengeodata-podcasts.git"
+  revision "master"

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


@@ -76,21 +110,26 @@ end
 
 git "/srv/blog.openstreetmap.org/images" do
   action :sync
 
 git "/srv/blog.openstreetmap.org/images" do
   action :sync

-  repository "git://github.com/openstreetmap/opengeodata-images.git"
+  repository "https://github.com/openstreetmap/opengeodata-images.git"
+  revision "master"

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

-apache_site "opengeodata.org" do
-  template "opengeodata.erb"
-  directory "/srv/opengeodata.org"
+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"

 end
 
 template "/etc/cron.daily/blog-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.daily/blog-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0750
+  mode "750"

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