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

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index ffc8be609f4d9f2f360cd37dd9015a063db908ee..3558af884317b3907656de655d1b105ad2d9a2d4 100644 (file)
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -753,6 +753,9 @@ signed_smtp:
   multi_domain = false
   hosts_try_dane =
   tls_require_ciphers = <%= node[:ssl][:gnutls_ciphers] %>:%LATEST_RECORD_VERSION
+<% if node[:exim][:external_interface] -%>
+  interface = <%= node[:exim][:external_interface] %>
+<% end -%>
 
 
 # This transport is used for handling pipe deliveries generated by alias or

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index bb6b7b667e4a9928015d9e545e8b07a6fd1288f7..d3bfcc1157ea1f1c6eecb85411223958a2c97aec 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -7,6 +7,7 @@ default_attributes(
     :last_address => "10.0.79.254"
   },
   :exim => {
+    :external_interface => "<;${if <{${randint:100}}{90} {184.104.226.98;2001:470:1:b3b::2}{87.252.214.98;2001:4d78:fe03:1c::2}}",
     :routes => {
       :openstreetmap => {
         :comment => "openstreetmap.org",

diff --git a/roles/ovh.rb b/roles/ovh.rb
deleted file mode 100644 (file)
index f8391a2..0000000
--- a/roles/ovh.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-name "ovh"
-description "Role applied to all servers at OVH"
-
-default_attributes(
-  :hosted_by => "OVH",
-  :location => "Roubaix, France"
-)
-
-override_attributes(
-  :networking => {
-    :nameservers => ["213.186.33.99"]
-  },
-  :ntp => {
-    :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"]
-  }
-)
-
-run_list(
-  "role[fr]"
-)

diff --git a/roles/scorch.rb b/roles/scorch.rb
deleted file mode 100644 (file)
index 0649374..0000000
--- a/roles/scorch.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-name "scorch"
-description "Master role applied to scorch"
-
-default_attributes(
-  :devices => {
-    :ssd_system => {
-      :comment => "Tune scheduler for system disk",
-      :type => "block",
-      :bus => "scsi",
-      :serial => "3600605b009bbf5601fc3206407a43546",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256",
-        "queue/read_ahead_kb" => "2048"
-      }
-    }
-  },
-  :networking => {
-    :interfaces => {
-      :external => {
-        :interface => "eth0",
-        :role => :external,
-        :inet => {
-          :address => "176.31.235.79",
-          :prefix => "24",
-          :gateway => "176.31.235.254"
-        },
-        :inet6 => {
-          :address => "2001:41d0:2:fc4f::1",
-          :prefix => "64",
-          :gateway => "2001:41d0:2:fcff:ff:ff:ff:ff"
-        }
-      }
-    }
-  }
-)
-
-run_list(
-  "role[ovh]"
-)