X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7a3a01f710421e67b96dfebd5a51c4374be73035..6ceead753013521ceffc22bea1cd1bcf5b5ec8d6:/cookbooks/switch2osm/recipes/default.rb

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 96593bfeb..a2345be08 100644
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -16,29 +16,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 include_recipe "apache"
 include_recipe "git"
+include_recipe "ruby"
 
 package %w[
-  ruby
-  ruby-dev
+  gcc
+  g++
+  make
+  libssl-dev
   zlib1g-dev
+  pkg-config
 ]
 
-gem_package "bundler" do
-  version "1.17.3"
-end
+apache_module "expires"
+apache_module "rewrite"
 
 git "/srv/switch2osm.org" do
   action :sync
   repository "https://github.com/switch2osm/switch2osm.github.io.git"
+  depth 1
   user "root"
   group "root"
-  notifies :run, "execute[/srv/switch2osm.org/Gemfile]"
+  notifies :run, "bundle_install[/srv/switch2osm.org]"
 end
 
 directory "/srv/switch2osm.org/_site" do
-  mode 0o755
+  mode "755"
   owner "nobody"
   group "nogroup"
 end
@@ -46,32 +51,22 @@ end
 # Workaround https://github.com/jekyll/jekyll/issues/7804
 # by creating a .jekyll-cache folder
 directory "/srv/switch2osm.org/.jekyll-cache" do
-  mode 0o755
+  mode "755"
   owner "nobody"
   group "nogroup"
 end
 
-execute "/srv/switch2osm.org/Gemfile" do
+bundle_install "/srv/switch2osm.org" do
   action :nothing
-  command "bundle install --deployment"
-  cwd "/srv/switch2osm.org"
-  user "root"
-  group "root"
-  notifies :run, "execute[/srv/switch2osm.org]"
-end
-
-# Temporary workaround until merged: https://github.com/switch2osm/switch2osm.github.io/pull/68
-file "/srv/switch2osm.org/_config_osm.yml" do
-  mode 0o644
+  options "--deployment"
   user "root"
   group "root"
-  content "url: https://switch2osm.org"
+  notifies :run, "bundle_exec[/srv/switch2osm.org]"
 end
 
-execute "/srv/switch2osm.org" do
+bundle_exec "/srv/switch2osm.org" do
   action :nothing
-  command "bundle exec jekyll build --trace --config _config.yml,_config_osm.yml"
-  cwd "/srv/switch2osm.org"
+  command "jekyll build --trace --config _config.yml,_config_osm.yml"
   user "nobody"
   group "nogroup"
 end