X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7a3a01f710421e67b96dfebd5a51c4374be73035..ffdc1400431395dfad46e36c05f79466109d36b6:/cookbooks/switch2osm/recipes/default.rb diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb index 96593bfeb..5dad4d1fe 100644 --- a/cookbooks/switch2osm/recipes/default.rb +++ b/cookbooks/switch2osm/recipes/default.rb @@ -16,15 +16,21 @@ # See the License for the specific language governing permissions and # limitations under the License. # + include_recipe "apache" include_recipe "git" package %w[ ruby ruby-dev + libssl-dev zlib1g-dev + pkg-config ] +apache_module "expires" +apache_module "rewrite" + gem_package "bundler" do version "1.17.3" end @@ -32,6 +38,7 @@ end 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]" @@ -60,14 +67,6 @@ execute "/srv/switch2osm.org/Gemfile" do 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 - user "root" - group "root" - content "url: https://switch2osm.org" -end - execute "/srv/switch2osm.org" do action :nothing command "bundle exec jekyll build --trace --config _config.yml,_config_osm.yml"