Only force the prefork mpm when mod_php is used

[chef.git] / roles / lysator.rb

diff --git a/roles/lysator.rb b/roles/lysator.rb
index ad1f0087f909145c48d0c3657a18a5e6112e41bd..7bf25dc165725959f59a1db4ef315da9f4661904 100644 (file)
--- a/roles/lysator.rb
+++ b/roles/lysator.rb
@@ -2,15 +2,16 @@ name "lysator"
 description "Role applied to all servers at Lysator"
 
 default_attributes(
 description "Role applied to all servers at Lysator"
 
 default_attributes(

+  :accounts => {
+    :users => {
+      :aoh => { :status => :administrator },
+      :lysroot => { :status => :administrator }
+    }
+  },

   :hosted_by => "Lysator",
   :location => "Linköping, Sweden",
   :networking => {
   :hosted_by => "Lysator",
   :location => "Linköping, Sweden",
   :networking => {

-    :nameservers => ["130.236.254.225", "2001:6b0:17:f0a0::e1"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
-    }
+    :nameservers => ["130.236.254.225", "2001:6b0:17:f0a0::e1", "130.236.254.4"]

   }
 )
 
   }
 )