Add a link to GeoIP database in /etc/gdnsd/geoip

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 804aace16007a3b213a04de8f3714ed756b6e908..7500247f33aa861339c1bfebc420a9b9bd70581a 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,6 +2,11 @@ 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 => {


@@ -18,17 +23,19 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
   },
   :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"
+        }

       }
     }
   }
       }
     }
   }


@@ -41,10 +48,5 @@ run_list(
   "role[foundation]",
   "role[stateofthemap]",
   "role[blog]",
   "role[foundation]",
   "role[stateofthemap]",
   "role[blog]",

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

 )
 )