Make grnet user an administrator on GRNET machines

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index bcedb6b26aed6e39989c9d4382675c607f550874..ab306c6a2e5bb7d709dc076ece8b4fa983f176de 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -23,7 +23,7 @@ default_attributes(
     }
   },
   :git => {
-    :allowed_nodes => "*:*",
+    :allowed_nodes => "fqdn:*",
     :user => "chefrepo",
     :group => "chefrepo",
     :backup => "chef-git"
@@ -107,11 +107,13 @@ default_attributes(
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [
-          "128.40.168.0/24",      # ucl external (wates)
-          "128.40.45.192/27",     # ucl external (wolfson)
+          "193.60.236.0/24",      # ucl external
           "146.179.159.160/27",   # ic internal
           "193.63.75.96/27",      # ic external
           "2001:630:12:500::/64", # ic external
+          "10.0.32.0/20",         # bytemark internal
+          "89.16.162.16/28",      # bytemark external
+          "2001:41c9:2:d6::/64",  # bytemark external
           "127.0.0.0/8",          # localhost
           "::1"                   # localhost
         ],
@@ -133,6 +135,7 @@ run_list(
   "role[planet]",
   "role[planetdump]",
   "role[logstash]",
+  "role[letsencrypt]",
   "recipe[rsyncd]",
   "recipe[openvpn]",
   "recipe[git::server]",