Don't configure resolv.conf if no nameservers are defined

[chef.git] / cookbooks / networking / recipes / default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 39611a9dfdb0e2aa5bde681cb40bbd2aa8921a9d..2f2812aa9cb4e01d20f84d659a701e86ea755aab 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -22,7 +22,12 @@
 
 require "ipaddr"
 
 
 require "ipaddr"
 

+network_packages = []
+

 node[:networking][:interfaces].each do |name, interface|
 node[:networking][:interfaces].each do |name, interface|

+  network_packages |= ["vlan"] if interface[:interface] =~ /\.\d+$/
+  network_packages |= ["ifenslave"] if interface[:bond]
+

   if interface[:role] && (role = node[:networking][:roles][interface[:role]])
     if role[interface[:family]]
       node.set[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
   if interface[:role] && (role = node[:networking][:roles][interface[:role]])
     if role[interface[:family]]
       node.set[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]


@@ -35,17 +40,17 @@ node[:networking][:interfaces].each do |name, interface|
 
   prefix = node[:networking][:interfaces][name][:prefix]
 
 
   prefix = node[:networking][:interfaces][name][:prefix]
 

-  # rubocop:disable Style/RedundantParentheses

   node.set[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)
   node.set[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)
   node.set[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)
   node.set[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)

-  # rubocop:enable Style/RedundantParentheses

 end
 
 end
 

+package network_packages
+

 template "/etc/network/interfaces" do
   source "interfaces.erb"
   owner "root"
   group "root"
 template "/etc/network/interfaces" do
   source "interfaces.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 execute "hostname" do
 end
 
 execute "hostname" do


@@ -57,7 +62,7 @@ template "/etc/hostname" do
   source "hostname.erb"
   owner "root"
   group "root"
   source "hostname.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :run, "execute[hostname]"
 end
 
   notifies :run, "execute[hostname]"
 end
 


@@ -65,21 +70,23 @@ template "/etc/hosts" do
   source "hosts.erb"
   owner "root"
   group "root"
   source "hosts.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 end
 

-link "/etc/resolv.conf" do
-  action :delete
-  link_type :symbolic
-  to "/run/resolvconf/resolv.conf"
-  only_if { File.symlink?("/etc/resolv.conf") }
-end
+unless node[:networking][:nameservers].empty?
+  link "/etc/resolv.conf" do
+    action :delete
+    link_type :symbolic
+    to "/run/resolvconf/resolv.conf"
+    only_if { File.symlink?("/etc/resolv.conf") }
+  end

 
 

-template "/etc/resolv.conf" do
-  source "resolv.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
+  template "/etc/resolv.conf" do
+    source "resolv.conf.erb"
+    owner "root"
+    group "root"
+    mode 0o644
+  end

 end
 
 node.interfaces(:role => :internal) do |interface|
 end
 
 node.interfaces(:role => :internal) do |interface|


@@ -126,17 +133,11 @@ end
 
 package "shorewall"
 
 
 package "shorewall"
 

-service "shorewall" do
-  action [:enable, :start]
-  supports :restart => true
-  status_command "shorewall status"
-end
-

 template "/etc/default/shorewall" do
   source "shorewall-default.erb"
   owner "root"
   group "root"
 template "/etc/default/shorewall" do
   source "shorewall-default.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :restart, "service[shorewall]"
 end
 
   notifies :restart, "service[shorewall]"
 end
 


@@ -144,7 +145,7 @@ template "/etc/shorewall/shorewall.conf" do
   source "shorewall.conf.erb"
   owner "root"
   group "root"
   source "shorewall.conf.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :restart, "service[shorewall]"
 end
 
   notifies :restart, "service[shorewall]"
 end
 


@@ -152,7 +153,7 @@ template "/etc/shorewall/zones" do
   source "shorewall-zones.erb"
   owner "root"
   group "root"
   source "shorewall-zones.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   variables :type => "ipv4"
   notifies :restart, "service[shorewall]"
 end
   variables :type => "ipv4"
   notifies :restart, "service[shorewall]"
 end


@@ -161,7 +162,7 @@ template "/etc/shorewall/interfaces" do
   source "shorewall-interfaces.erb"
   owner "root"
   group "root"
   source "shorewall-interfaces.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :restart, "service[shorewall]"
 end
 
   notifies :restart, "service[shorewall]"
 end
 


@@ -169,7 +170,7 @@ template "/etc/shorewall/hosts" do
   source "shorewall-hosts.erb"
   owner "root"
   group "root"
   source "shorewall-hosts.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   variables :zones => zones
   notifies :restart, "service[shorewall]"
 end
   variables :zones => zones
   notifies :restart, "service[shorewall]"
 end


@@ -178,7 +179,7 @@ template "/etc/shorewall/policy" do
   source "shorewall-policy.erb"
   owner "root"
   group "root"
   source "shorewall-policy.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :restart, "service[shorewall]"
 end
 
   notifies :restart, "service[shorewall]"
 end
 


@@ -186,16 +187,22 @@ template "/etc/shorewall/rules" do
   source "shorewall-rules.erb"
   owner "root"
   group "root"
   source "shorewall-rules.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   variables :rules => []
   notifies :restart, "service[shorewall]"
 end
 
   variables :rules => []
   notifies :restart, "service[shorewall]"
 end
 

+service "shorewall" do
+  action [:enable, :start]
+  supports :restart => true
+  status_command "shorewall status"
+end
+

 template "/etc/logrotate.d/shorewall" do
   source "logrotate.shorewall.erb"
   owner "root"
   group "root"
 template "/etc/logrotate.d/shorewall" do
   source "logrotate.shorewall.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   variables :name => "shorewall"
 end
 
   variables :name => "shorewall"
 end
 


@@ -209,15 +216,15 @@ firewall_rule "limit-icmp-echo" do
   rate_limit "s:1/sec:5"
 end
 
   rate_limit "s:1/sec:5"
 end
 

-%w(ucl ic bm).each do |zone|
+%w(ucl ic bm aws).each do |zone|

   firewall_rule "accept-openvpn-#{zone}" do
     action :accept
     family :inet
     source zone
     dest "fw"
     proto "udp"
   firewall_rule "accept-openvpn-#{zone}" do
     action :accept
     family :inet
     source zone
     dest "fw"
     proto "udp"

-    dest_ports "1194:1196"
-    source_ports "1194:1196"
+    dest_ports "1194:1197"
+    source_ports "1194:1197"

   end
 end
 
   end
 end
 


@@ -226,7 +233,7 @@ if node[:roles].include?("gateway")
     source "shorewall-masq.erb"
     owner "root"
     group "root"
     source "shorewall-masq.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     notifies :restart, "service[shorewall]"
   end
 else
     notifies :restart, "service[shorewall]"
   end
 else


@@ -239,17 +246,11 @@ end
 unless node.interfaces(:family => :inet6).empty?
   package "shorewall6"
 
 unless node.interfaces(:family => :inet6).empty?
   package "shorewall6"
 

-  service "shorewall6" do
-    action [:enable, :start]
-    supports :restart => true
-    status_command "shorewall6 status"
-  end
-

   template "/etc/default/shorewall6" do
     source "shorewall-default.erb"
     owner "root"
     group "root"
   template "/etc/default/shorewall6" do
     source "shorewall-default.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     notifies :restart, "service[shorewall6]"
   end
 
     notifies :restart, "service[shorewall6]"
   end
 


@@ -257,7 +258,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6.conf.erb"
     owner "root"
     group "root"
     source "shorewall6.conf.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     notifies :restart, "service[shorewall6]"
   end
 
     notifies :restart, "service[shorewall6]"
   end
 


@@ -265,7 +266,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-zones.erb"
     owner "root"
     group "root"
     source "shorewall-zones.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :type => "ipv6"
     notifies :restart, "service[shorewall6]"
   end
     variables :type => "ipv6"
     notifies :restart, "service[shorewall6]"
   end


@@ -274,7 +275,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6-interfaces.erb"
     owner "root"
     group "root"
     source "shorewall6-interfaces.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     notifies :restart, "service[shorewall6]"
   end
 
     notifies :restart, "service[shorewall6]"
   end
 


@@ -282,7 +283,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6-hosts.erb"
     owner "root"
     group "root"
     source "shorewall6-hosts.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :zones => zones
     notifies :restart, "service[shorewall6]"
   end
     variables :zones => zones
     notifies :restart, "service[shorewall6]"
   end


@@ -291,7 +292,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-policy.erb"
     owner "root"
     group "root"
     source "shorewall-policy.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     notifies :restart, "service[shorewall6]"
   end
 
     notifies :restart, "service[shorewall6]"
   end
 


@@ -299,16 +300,22 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-rules.erb"
     owner "root"
     group "root"
     source "shorewall-rules.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :rules => []
     notifies :restart, "service[shorewall6]"
   end
 
     variables :rules => []
     notifies :restart, "service[shorewall6]"
   end
 

+  service "shorewall6" do
+    action [:enable, :start]
+    supports :restart => true
+    status_command "shorewall6 status"
+  end
+

   template "/etc/logrotate.d/shorewall6" do
     source "logrotate.shorewall.erb"
     owner "root"
     group "root"
   template "/etc/logrotate.d/shorewall6" do
     source "logrotate.shorewall.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :name => "shorewall6"
   end
 
     variables :name => "shorewall6"
   end