wordpress: use ssl_config.set_default_paths instead of a hardcoded bundle location

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 70ae3b14e4c3ddfbed0630a27be1651851f9e1d9..e59b4683f75b300a3c95b256d4297f6087d692dd 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -2,10 +2,6 @@ name "ironbelly"
 description "Master role applied to ironbelly"
 
 default_attributes(
-  :dhcpd => {
-    :first_address => "10.0.63.1",
-    :last_address => "10.0.63.254"
-  },
   :elasticsearch => {
     :cluster => {
       :routing => {
@@ -51,21 +47,6 @@ default_attributes(
       }
     }
   },
-  :prometheus => {
-    :junos => {
-      "switch1" => { :address => "184.104.179.129", :labels => { "site" => "amsterdam" } }
-    },
-    :snmp => {
-      "pdu1" => { :address => "10.0.48.100", :modules => %w[apcups], :labels => { "site" => "amsterdam" } },
-      "pdu2" => { :address => "10.0.48.101", :modules => %w[apcups], :labels => { "site" => "amsterdam" } }
-    },
-    :metrics => {
-      :uplink_interface => {
-        :help => "Site uplink interface name",
-        :labels => { :site => "amsterdam", :name => "ge-[01]/2/[02]" }
-      }
-    }
-  },
   :nginx => {
     :cache => {
       :proxy => {
@@ -75,40 +56,10 @@ default_attributes(
           :max_size => "51200M"
       }
     }
-  },
-  :rsyncd => {
-    :modules => {
-      :logs => {
-        :comment => "Log files",
-        :path => "/store/logs",
-        :read_only => false,
-        :write_only => true,
-        :list => false,
-        :uid => "www-data",
-        :gid => "www-data",
-        :transfer_logging => false,
-        :hosts_allow => [
-          "193.60.236.0/24",          # ucl external
-          "10.0.48.0/20",             # amsterdam internal
-          "184.104.179.128/27",       # amsterdam external
-          "2001:470:1:fa1::/64",      # amsterdam external
-          "10.0.64.0/20",             # dublin internal
-          "184.104.226.96/27",        # dublin external
-          "2001:470:1:b3b::/64",      # dublin 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
-        ]
-      }
-    }
   }
 )
 
 run_list(
   "role[equinix-ams]",
-  "recipe[rsyncd]",
-  "recipe[dhcpd]",
-  "recipe[imagery::za_ngi_aerial]"
+  "recipe[rsyncd]"
 )