Use node name instead of hostname for cache statistics

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

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 96593bfeb754d4e79ab14c38176c7313db8708e6..5dad4d1fefb911a216bc75f971e28268281e6e79 100644 (file)
--- 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.
 #
 # 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
 include_recipe "apache"
 include_recipe "git"
 
 package %w[
   ruby
   ruby-dev

+  libssl-dev

   zlib1g-dev
   zlib1g-dev

+  pkg-config

 ]
 
 ]
 

+apache_module "expires"
+apache_module "rewrite"
+

 gem_package "bundler" do
   version "1.17.3"
 end
 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"
 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]"
   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
 
   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"
 execute "/srv/switch2osm.org" do
   action :nothing
   command "bundle exec jekyll build --trace --config _config.yml,_config_osm.yml"