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

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

diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb
index d7a103fd3a5b0b52e058925593d17578d762fc55..6302e5a0dfd1c8c00f3f95f2fb6ca9ebb2ca3779 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,22 +17,33 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

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

 include_recipe "git"
 include_recipe "git"

+include_recipe "ruby"

 
 

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

 
 

-gem_package "jekyll" do
-  gem_binary "gem2.0"
+directory "/srv/hardware.openstreetmap.org" do
+  owner "serverinfo"
+  group "serverinfo"
+  mode "755"

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

-  repository "git://github.com/gravitystorm/osmf-server-info.git"
-  user "root"
-  group "root"
-  notifies :run, "execute[/srv/hardware.openstreetmap.org]"
+  repository "https://github.com/osmfoundation/osmf-server-info.git"
+  depth 1
+  user "serverinfo"
+  group "serverinfo"
+  notifies :run, "bundle_install[/srv/hardware.openstreetmap.org]"

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


@@ -40,35 +51,52 @@ 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 0644
-  owner "root"
-  group "root"
-  notifies :run, "execute[/srv/hardware.openstreetmap.org]"
+  mode "644"
+  owner "serverinfo"
+  group "serverinfo"
+  notifies :run, "bundle_exec[/srv/hardware.openstreetmap.org]"

 end
 
 file "/srv/hardware.openstreetmap.org/_data/roles.json" do
   content roles.to_json
 end
 
 file "/srv/hardware.openstreetmap.org/_data/roles.json" do
   content roles.to_json

-  mode 0644
-  owner "root"
-  group "root"
-  notifies :run, "execute[/srv/hardware.openstreetmap.org]"
+  mode "644"
+  owner "serverinfo"
+  group "serverinfo"
+  notifies :run, "bundle_exec[/srv/hardware.openstreetmap.org]"

 end
 
 end
 

-directory "/srv/hardware.openstreetmap.org/_site" do
-  mode 0755
-  owner "nobody"
-  group "nogroup"
+bundle_config "/srv/hardware.openstreetmap.org" do
+  action :create
+  user "serverinfo"
+  group "serverinfo"
+  settings "deployment" => "true",
+           "without" => "development:test",
+           "jobs" => node.cpu_cores.to_s
+  notifies :run, "bundle_exec[/srv/hardware.openstreetmap.org]"

 end
 
 end
 

-execute "/srv/hardware.openstreetmap.org" do
+bundle_install "/srv/hardware.openstreetmap.org" do

   action :nothing
   action :nothing

-  command "jekyll build --trace"
-  cwd "/srv/hardware.openstreetmap.org"
-  user "nobody"
-  group "nogroup"
+  user "serverinfo"
+  group "serverinfo"
+  notifies :run, "bundle_exec[/srv/hardware.openstreetmap.org]"
+end
+
+bundle_exec "/srv/hardware.openstreetmap.org" do
+  action :nothing
+  command "jekyll build --trace --disable-disk-cache --baseurl=https://hardware.openstreetmap.org"
+  user "serverinfo"
+  group "serverinfo"
+  environment "LANG" => "C.UTF-8"
+end
+
+ssl_certificate "hardware.openstreetmap.org" do
+  domains ["hardware.openstreetmap.org", "hardware.osm.org", "hardware.osmfoundation.org"]
+  notifies :reload, "service[apache2]"

 end
 
 apache_site "hardware.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/hardware.openstreetmap.org/_site"
 end
 
 apache_site "hardware.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/hardware.openstreetmap.org/_site"

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

 end
 end