Add role for gorwen

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index f089d08b2574121287bb8327b924e0cbac325d05..03ed0e9b0d55cad0de77fbf4d54d57bbeaec2f4c 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -5,13 +5,12 @@ default_attributes(
   :accounts => {
     :users => {
       :tile => {
   :accounts => {
     :users => {
       :tile => {

-        :status => :role,

         :members => [:jburgess, :tomh]
       }
     }
   },
   :apache => {
         :members => [:jburgess, :tomh]
       }
     }
   },
   :apache => {

-    :mpms => ["event"],
+    :mpm => "event",

     :timeout => 60,
     :event => {
       :server_limit => 60,
     :timeout => 60,
     :event => {
       :server_limit => 60,


@@ -51,6 +50,9 @@ default_attributes(
       }
     }
   },
       }
     }
   },

+  :ssl => {
+    :ct_report_uri => false
+  },

   :sysctl => {
     :sockets => {
       :comment => "Increase size of connection queue",
   :sysctl => {
     :sockets => {
       :comment => "Increase size of connection queue",


@@ -67,6 +69,10 @@ default_attributes(
     }
   },
   :tile => {
     }
   },
   :tile => {

+    :database => {
+      :style_file => "/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.style",
+      :tag_transform_script => "/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.lua"
+    },

     :data => {
       :simplified_land_polygons => {
         :url => "https://osmdata.openstreetmap.de/download/simplified-land-polygons-complete-3857.zip",
     :data => {
       :simplified_land_polygons => {
         :url => "https://osmdata.openstreetmap.de/download/simplified-land-polygons-complete-3857.zip",


@@ -99,7 +105,7 @@ default_attributes(
     },
     :styles => {
       :default => {
     },
     :styles => {
       :default => {

-        :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
+        :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",

         :revision => "v4.25.0",
         :max_zoom => 19
       }
         :revision => "v4.25.0",
         :max_zoom => 19
       }