Move letsencrypt role to sarel

[chef.git] / roles / sarel.rb

diff --git a/roles/sarel.rb b/roles/sarel.rb
index 8f58b0b4b3a5f5acc8ff1cba7af09a07596b0d10..ab7c52a4f51a0b499947829ec4dcdcee65f405c3 100644 (file)
--- a/roles/sarel.rb
+++ b/roles/sarel.rb
@@ -2,16 +2,22 @@ name "sarel"
 description "Master role applied to sarel"
 
 default_attributes(
 description "Master role applied to sarel"
 
 default_attributes(

+  :git => {
+    :allowed_nodes => "fqdn:*",
+    :user => "chefrepo",
+    :group => "chefrepo",
+    :backup => "chef-git"
+  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "eth1.2801",
+        :interface => "eth0.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.12"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.12"
       },
       :external_ipv4 => {

-        :interface => "eth1.2800",
+        :interface => "eth0.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.20"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.20"


@@ -21,7 +27,12 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-g5]",
   "role[hp-g5]",

-  "role[yournavigation]"
+  "role[yournavigation]",
+  "role[chef-server]",
+  "role[chef-repository]",
+  "role[letsencrypt]",
+  "recipe[git::server]",
+  "recipe[serverinfo]"

 )
 )