Drop support for GeoIPv1 databases in rails installs

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

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 96593bfeb754d4e79ab14c38176c7313db8708e6..c0a3da3cbf87aa9165c268e93b7b0c876f9a6a84 100644 (file)
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -16,15 +16,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 include_recipe "apache"
 include_recipe "git"
 
 package %w[
+  gcc
+  g++
+  make
   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,13 +41,14 @@ 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]"
 end
 
 directory "/srv/switch2osm.org/_site" do
-  mode 0o755
+  mode "755"
   owner "nobody"
   group "nogroup"
 end
@@ -46,7 +56,7 @@ 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
@@ -60,14 +70,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"