switch2osm: use override config to fix site name

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

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 8aba12af0cb80559177e4f1c69643a7d894799cb..8ddaf5101c7f1cac0a45bcd1956b4da4fcf730b1 100644 (file)
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: switch2osm
+# Cookbook:: switch2osm
 # 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
 #
-#     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,
@@ -16,34 +16,65 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+include_recipe "apache"
+include_recipe "git"
 
-include_recipe "wordpress"
+package %w[
+  ruby
+  ruby-dev
+  zlib1g-dev
+]
 
-passwords = data_bag_item("switch2osm", "passwords")
+gem_package "bundler" do
+  version "1.17.3"
+end
 
-wordpress_site "switch2osm.org" do
-  aliases "www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"
-  directory "/srv/switch2osm.org"
-  database_name "switch2osm-blog"
-  database_user "switch2osm-user"
-  database_password passwords["switch2osm-user"]
+git "/srv/switch2osm.org" do
+  action :sync
+  repository "https://github.com/switch2osm/switch2osm.github.io.git"
+  user "root"
+  group "root"
+  notifies :run, "execute[/srv/switch2osm.org/Gemfile]"
 end
 
-wordpress_theme "picolight" do
-  site "switch2osm.org"
-  repository "git://github.com/Firefishy/picolight-s2o.git"
-  revision "master"
+directory "/srv/switch2osm.org/_site" do
+  mode 0o755
+  owner "nobody"
+  group "nogroup"
 end
 
-wordpress_plugin "sitepress-multilingual-cms" do
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+# Workaround https://github.com/jekyll/jekyll/issues/7804
+# by creating a .jekyll-cache folder
+directory "/srv/switch2osm.org/.jekyll-cache" do
+  mode 0o755
+  owner "nobody"
+  group "nogroup"
 end
 
-template "/etc/cron.daily/switch2osm-backup" do
-  source "backup.cron.erb"
-  owner "root"
+execute "/srv/switch2osm.org/Gemfile" do
+  action :nothing
+  command "bundle install --deployment"
+  cwd "/srv/switch2osm.org"
+  user "root"
   group "root"
-  mode 0750
-  variables :passwords => passwords
+  notifies :run, "execute[/srv/switch2osm.org]"
+end
+
+execute "/srv/switch2osm.org" do
+  action :nothing
+  command "bundle exec jekyll build --trace --config _config.yml,_config_osm.yml"
+  cwd "/srv/switch2osm.org"
+  user "nobody"
+  group "nogroup"
+end
+
+ssl_certificate "switch2osm.org" do
+  domains ["switch2osm.org",
+           "www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"]
+  notifies :reload, "service[apache2]"
+end
+
+apache_site "switch2osm.org" do
+  template "apache.erb"
+  directory "/srv/switch2osm.org/_site"
 end