civicrm version bump

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 9b4b1f93c8c32385de12e29971bf3f69f91ceeef..08a97417dc6e79fdf6b7844b178988aed6472a76 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -12,26 +12,25 @@ default_attributes(
       :max_connections_per_child => 10000
     }
   },
       :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"
+        }

       }
     }
   }
       }
     }
   }


@@ -45,9 +44,5 @@ run_list(
   "role[stateofthemap]",
   "role[blog]",
   "role[otrs]",
   "role[stateofthemap]",
   "role[blog]",
   "role[otrs]",

-  "role[donate]",
-  "recipe[hot]",
-  "recipe[dmca]",
-  "recipe[dhcpd]",
-  "recipe[ideditor]"
+  "recipe[dhcpd]"

 )
 )