Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

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

diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb
index f38283fc97dd4786b865d64a115b1c1a1fead925..8d154c66a08ca687d0a875a9e989e79a8fcc0d28 100644 (file)
--- a/cookbooks/serverinfo/recipes/default.rb
+++ b/cookbooks/serverinfo/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: serverinfo
+# Cookbook:: serverinfo

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

-# Copyright 2015, OpenStreetMap Foundation
+# Copyright:: 2015, 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,20 +17,31 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 include_recipe "git"
 
 include_recipe "git"
 

-package "ruby"
-package "ruby-dev"
+package %w[
+  gcc
+  g++
+  make
+  ruby
+  ruby-dev
+  libssl-dev
+  zlib1g-dev
+  pkg-config
+]

 
 

-gem_package "jekyll"
+gem_package "bundler" do
+  version "1.17.3"
+end

 
 git "/srv/hardware.openstreetmap.org" do
   action :sync
 
 git "/srv/hardware.openstreetmap.org" do
   action :sync

-  repository "git://github.com/gravitystorm/osmf-server-info.git"
+  repository "https://github.com/gravitystorm/osmf-server-info.git"
+  depth 1

   user "root"
   group "root"
   user "root"
   group "root"

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

 end
 
 nodes = { :rows => search(:node, "*:*") }
 end
 
 nodes = { :rows => search(:node, "*:*") }


@@ -38,7 +49,7 @@ roles = { :rows => search(:role, "*:*") }
 
 file "/srv/hardware.openstreetmap.org/_data/nodes.json" do
   content nodes.to_json
 
 file "/srv/hardware.openstreetmap.org/_data/nodes.json" do
   content nodes.to_json

-  mode 0o644
+  mode "644"

   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"
   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"


@@ -46,33 +57,50 @@ end
 
 file "/srv/hardware.openstreetmap.org/_data/roles.json" do
   content roles.to_json
 
 file "/srv/hardware.openstreetmap.org/_data/roles.json" do
   content roles.to_json

-  mode 0o644
+  mode "644"

   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"
 end
 
 directory "/srv/hardware.openstreetmap.org/_site" do
   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"
 end
 
 directory "/srv/hardware.openstreetmap.org/_site" do

-  mode 0o755
+  mode "755"

   owner "nobody"
   group "nogroup"
 end
 
   owner "nobody"
   group "nogroup"
 end
 

+# Workaround https://github.com/jekyll/jekyll/issues/7804
+# by creating a .jekyll-cache folder
+directory "/srv/hardware.openstreetmap.org/.jekyll-cache" do
+  mode "755"
+  owner "nobody"
+  group "nogroup"
+end
+
+execute "/srv/hardware.openstreetmap.org/Gemfile" do
+  action :nothing
+  command "bundle install --deployment"
+  cwd "/srv/hardware.openstreetmap.org"
+  user "root"
+  group "root"
+  notifies :run, "execute[/srv/hardware.openstreetmap.org]"
+end
+

 execute "/srv/hardware.openstreetmap.org" do
   action :nothing
 execute "/srv/hardware.openstreetmap.org" do
   action :nothing

-  command "jekyll build --trace"
+  command "bundle exec jekyll build --trace --baseurl=https://hardware.openstreetmap.org"

   cwd "/srv/hardware.openstreetmap.org"
   user "nobody"
   group "nogroup"
 end
 
 ssl_certificate "hardware.openstreetmap.org" do
   cwd "/srv/hardware.openstreetmap.org"
   user "nobody"
   group "nogroup"
 end
 
 ssl_certificate "hardware.openstreetmap.org" do

-  domains "hardware.openstreetmap.org"
-  fallback_certificate "openstreetmap"
+  domains ["hardware.openstreetmap.org", "hardware.osm.org"]

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

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

 end
 end