nominatim: remove all code related to former Ubuntu install

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index d3ddde39d96ff9b6680ff11d6539ff07f4be38ea..7500247f33aa861339c1bfebc420a9b9bd70581a 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,36 +2,40 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
 description "Master role applied to ridley"
 
 default_attributes(

+  :accounts => {
+    :users => {
+      :otrs => { :status => :role }
+    }
+  },

   :apache => {
     :mpm => "event",
     :event => {
   :apache => {
     :mpm => "event",
     :event => {

-      :min_spare_threads => 50,
-      :max_spare_threads => 150,
-      :max_connections_per_child => 10000,
-      :async_request_worker_factor => 4,
-      :listen_cores_buckets_ratio => 4
+      :start_servers => 12,
+      :server_limit => 48,
+      :min_spare_threads => 25,
+      :max_spare_threads => 75,
+      :max_connections_per_child => 10000

     }
   },
     }
   },

-  :bind => {
-    :clients => "ucl"
-  },

   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   },
   :networking => {
     :interfaces => {
   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   },
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
+      :external => {

         :interface => "eth0.2800",
         :role => :external,
         :interface => "eth0.2800",
         :role => :external,

-        :family => :inet,
-        :address => "193.60.236.19"
+        :inet => {
+          :address => "193.60.236.19"
+        }

       },
       },

-      :internal_ipv4 => {
+      :internal => {

         :interface => "eth0.2801",
         :role => :internal,
         :interface => "eth0.2801",
         :role => :internal,

-        :family => :inet,
-        :address => "10.0.0.3"
+        :inet => {
+          :address => "10.0.0.3"
+        }

       }
     }
   }
       }
     }
   }


@@ -43,11 +47,6 @@ run_list(
   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",
   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",

-  "role[switch2osm]",

   "role[blog]",
   "role[blog]",

-  "role[otrs]",
-  "role[donate]",
-  "recipe[hot]",
-  "recipe[dmca]",

   "recipe[dhcpd]"
 )
   "recipe[dhcpd]"
 )