Sort wireguard peers to keep file content stable

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

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 83f022ee3b7c8fcd3a9aa1fe7fc4055378715ed0..2f80e2b13f78aa2437c9ae905650971a4c540a0e 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,


@@ -24,14 +24,13 @@ passwords = data_bag_item("blog", "passwords")
 directory "/srv/blog.openstreetmap.org" do
   owner "wordpress"
   group "wordpress"
 directory "/srv/blog.openstreetmap.org" do
   owner "wordpress"
   group "wordpress"

-  mode 0o755
+  mode "755"

 end
 
 wordpress_site "blog.openstreetmap.org" do
   aliases ["blog.osm.org", "blog.openstreetmap.com",
            "blog.openstreetmap.net", "blog.openstreetmaps.org",
            "blog.osmfoundation.org"]
 end
 
 wordpress_site "blog.openstreetmap.org" do
   aliases ["blog.osm.org", "blog.openstreetmap.com",
            "blog.openstreetmap.net", "blog.openstreetmaps.org",
            "blog.osmfoundation.org"]

-  ssl_enabled true

   directory "/srv/blog.openstreetmap.org/wp"
   database_name "osm-blog"
   database_user "osm-blog-user"
   directory "/srv/blog.openstreetmap.org/wp"
   database_name "osm-blog"
   database_user "osm-blog-user"


@@ -39,37 +38,45 @@ wordpress_site "blog.openstreetmap.org" do
   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"

+  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/harry-wood/osmblog-wp-theme.git"

 end
 
 end
 

-wordpress_plugin "google-analytics-for-wordpress" do
+wordpress_plugin "blog.openstreetmap.org-google-analytics-for-wordpress" do
+  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
+  plugin "google-sitemap-generator"

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

-wordpress_plugin "shareadraft" do
+wordpress_plugin "blog.openstreetmap.org-shareadraft" do
+  plugin "shareadraft"

   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"
+  not_if { ENV["TEST_KITCHEN"] }

 end
 
 end
 

-wordpress_plugin "wordpress-importer" do
+wordpress_plugin "blog.openstreetmap.org-wordpress-importer" do
+  plugin "wordpress-importer"

   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"

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


@@ -77,7 +84,7 @@ 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"

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


@@ -85,7 +92,7 @@ end
 
 git "/srv/blog.openstreetmap.org/static" do
   action :sync
 
 git "/srv/blog.openstreetmap.org/static" do
   action :sync

-  repository "git://github.com/openstreetmap/opengeodata-static.git"
+  repository "https://github.com/openstreetmap/opengeodata-static.git"

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


@@ -95,6 +102,7 @@ ssl_certificate "opengeodata.org" do
   domains ["opengeodata.org", "www.opengeodata.org", "old.opengeodata.org"]
   notifies :reload, "service[apache2]"
 end
   domains ["opengeodata.org", "www.opengeodata.org", "old.opengeodata.org"]
   notifies :reload, "service[apache2]"
 end

+

 apache_site "opengeodata.org" do
   template "opengeodata.erb"
   directory "/srv/opengeodata.org"
 apache_site "opengeodata.org" do
   template "opengeodata.erb"
   directory "/srv/opengeodata.org"


@@ -104,6 +112,6 @@ template "/etc/cron.daily/blog-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0o750
+  mode "750"

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