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

[chef.git] / roles / sarel.rb

diff --git a/roles/sarel.rb b/roles/sarel.rb
index d5a1b5faca231083860253dfbb7b5d58486e2f49..ab1bf393b259706a5a450e7336db8d71a1cb9cfb 100644 (file)
--- a/roles/sarel.rb
+++ b/roles/sarel.rb
@@ -2,16 +2,28 @@ name "sarel"
 description "Master role applied to sarel"
 
 default_attributes(
+  :apache => {
+    :mpm => "event",
+    :event => {
+      :min_spare_threads => 50,
+      :max_spare_threads => 150,
+      :listen_cores_buckets_ratio => 4
+    }
+  },
+  :git => {
+    :private_user => "chefrepo",
+    :private_group => "chefrepo"
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "enp3s0f0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.12"
       },
       :external_ipv4 => {
-        :interface => "eth1.2800",
+        :interface => "enp3s0f0.2800",
         :role => :external,
         :family => :inet,
         :address => "193.60.236.20"
@@ -21,7 +33,11 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-slough]",
-  "role[hp-g5]",
-  "role[yournavigation]"
+  "role[ucl]",
+  "role[chef-server]",
+  "role[chef-repository]",
+  "role[letsencrypt]",
+  "role[git]",
+  "role[dns]",
+  "recipe[serverinfo]"
 )