Merge remote-tracking branch 'github/pull/396'

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

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index faf12775c9bc848c1e63f823552b985784cbf1f3..165befb5e6f391d0f17b40c202bfa590c97b7f79 100644 (file)
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: blogs
+# Cookbook:: blogs

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

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


@@ -17,61 +17,86 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "git"
 
 include_recipe "apache"
 include_recipe "git"
 

-package "ruby"
-package "ruby-dev"
-package "make"
-package "gcc"
-package "libsqlite3-dev"
+ruby_version = if node[:lsb][:release].to_f < 20.04
+                 "2.5"
+               else
+                 "2.7"
+               end

 
 

-gem_package "bundler"
+package %W[
+  ruby#{ruby_version}
+  ruby#{ruby_version}-dev
+  make
+  gcc
+  g++
+  libsqlite3-dev
+]
+
+gem_package "bundler#{ruby_version}" do
+  package_name "bundler"
+  version "~> 2.1.4"
+  gem_binary "gem#{ruby_version}"
+  options "--format-executable"
+end

 
 directory "/srv/blogs.openstreetmap.org" do
   owner "blogs"
   group "blogs"
 
 directory "/srv/blogs.openstreetmap.org" do
   owner "blogs"
   group "blogs"

-  mode 0o755
+  mode "755"

 end
 
 git "/srv/blogs.openstreetmap.org" do
   action :sync
 end
 
 git "/srv/blogs.openstreetmap.org" do
   action :sync

-  repository "git://github.com/gravitystorm/blogs.osm.org.git"
+  repository "https://github.com/gravitystorm/blogs.osm.org.git"
+  depth 1

   user "blogs"
   group "blogs"
   user "blogs"
   group "blogs"

-  notifies :run, "execute[/srv/blogs.openstreetmap.org/Gemfile]", :immediate
+  notifies :run, "execute[/srv/blogs.openstreetmap.org/Gemfile]", :immediately

 end
 
 execute "/srv/blogs.openstreetmap.org/Gemfile" do
   action :nothing
 end
 
 execute "/srv/blogs.openstreetmap.org/Gemfile" do
   action :nothing

-  command "bundle install"
+  command "bundle#{ruby_version} install --deployment"

   cwd "/srv/blogs.openstreetmap.org"
   cwd "/srv/blogs.openstreetmap.org"

-  user "root"
-  group "root"
-  notifies :run, "execute[/srv/blogs.openstreetmap.org]", :immediate
+  user "blogs"
+  group "blogs"
+  notifies :run, "execute[/srv/blogs.openstreetmap.org]", :immediately

 end
 
 execute "/srv/blogs.openstreetmap.org" do
   action :nothing
 end
 
 execute "/srv/blogs.openstreetmap.org" do
   action :nothing

-  command "/usr/local/bin/pluto build -t osm -o build"
+  command "bundle#{ruby_version} exec pluto build -t osm -o build"

   cwd "/srv/blogs.openstreetmap.org"
   user "blogs"
   group "blogs"
 end
 
 ssl_certificate "blogs.openstreetmap.org" do
   cwd "/srv/blogs.openstreetmap.org"
   user "blogs"
   group "blogs"
 end
 
 ssl_certificate "blogs.openstreetmap.org" do

-  domains "blogs.openstreetmap.org"
+  domains ["blogs.openstreetmap.org", "blogs.osm.org"]

   notifies :reload, "service[apache2]"
 end
 
 apache_site "blogs.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/blogs.openstreetmap.org/build"
   notifies :reload, "service[apache2]"
 end
 
 apache_site "blogs.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/blogs.openstreetmap.org/build"

+  variables :aliases => ["blogs.osm.org"]

 end
 
 end
 

-template "/etc/cron.d/blogs" do
-  source "cron.erb"
+template "/usr/local/bin/blogs-update" do
+  source "blogs-update.erb"

   owner "root"
   group "root"
   owner "root"
   group "root"

-  mode "0644"
+  mode "0755"
+  variables :ruby_version => ruby_version
+end
+
+cron_d "blogs" do
+  minute "*/30"
+  user "blogs"
+  command "/usr/local/bin/blogs-update"
+  mailto "admins@openstreetmap.org"

 end
 end