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 f3494a4cb1c96e7482e0d4d50cf01e246a206213..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(
 description "Master role applied to ironbelly"
 
 default_attributes(

-  :dhcpd => {
-    :first_address => "10.0.63.1",
-    :last_address => "10.0.63.254"
-  },

   :elasticsearch => {
     :cluster => {
       :routing => {
   :elasticsearch => {
     :cluster => {
       :routing => {


@@ -36,85 +32,28 @@ default_attributes(
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",

-          :slaves => %w[eth0 eth1]
-        }
-      },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.10",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:a",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
+          :slaves => %w[enp2s0f0 enp2s0f1]

         }
       },
       :external => {
         :interface => "bond0.3",
         :role => :external,
         }
       },
       :external => {
         :interface => "bond0.3",
         :role => :external,

-        :source_route_table => 150,

         :inet => {
         :inet => {

-          :address => "184.104.179.138",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.138"

         },
         :inet6 => {
         },
         :inet6 => {

-          :address => "2001:470:1:fa1::a",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::a"

         }
       }
     }
   },
         }
       }
     }
   },

-  :prometheus => {
-    :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" } },
-      "switch1" => { :address => "184.104.179.129", :modules => %w[if_mib juniper_ex4300], :labels => { "site" => "amsterdam" } }
-    },
-    :metrics => {
-      :uplink_interface => {
-        :help => "Site uplink interface name",
-        :labels => { :site => "amsterdam", :name => "ge-[01]/2/0|ae60" }
-      }
-    }
-  },
-  :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
-          "130.117.76.0/27",          # amsterdam external (cogent)
-          "2001:978:2:2c::172:0/112", # amsterdam external (cogent)
-          "184.104.179.128/27",       # amsterdam external (he)
-          "2001:470:1:fa1::/64",      # amsterdam external (he)
-          "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
-        ]
+  :nginx => {
+    :cache => {
+      :proxy => {
+          :enable => true,
+          :keys_zone => "proxy_cache_zone:256M",
+          :inactive => "180d",
+          :max_size => "51200M"

       }
     }
   }
       }
     }
   }


@@ -122,7 +61,5 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
 
 run_list(
   "role[equinix-ams]",

-  "role[gateway]",
-  "recipe[rsyncd]",
-  "recipe[dhcpd]"
+  "recipe[rsyncd]"

 )
 )