Merge remote-tracking branch 'github/pull/697'

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index b1b1e1e13d1ee1af22cd3033eb74f2b88365f4e9..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 => {


@@ -43,7 +48,5 @@ run_list(
   "role[foundation]",
   "role[stateofthemap]",
   "role[blog]",
   "role[foundation]",
   "role[stateofthemap]",
   "role[blog]",

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

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