vagrant-zones 0.1.79 → 0.1.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38f2d5ae097c37d575d73f74b8b3ef3a73aef43f652d22908c348ae00dd6459c
-  data.tar.gz: 25534a04b8d14f8777912cb6c1e5fbfb9a06ac96c23693bb5e20b02d8a48b744
+  metadata.gz: 3e4db8b30cfb01832a358892c8f5403ade6922752b9424ab0fe4fdcab1053cee
+  data.tar.gz: 316a466603bc8298535c2407e1f8fa267b754f33e6d6ee9ab20e5d70a9bd5fec
 SHA512:
-  metadata.gz: b2dbb2cb2549cf75269dd733f8ad19561bd8ec5a04c07d848f20cf60c001a67708cae9db8884f74f84a6ea3005aa3d80d3a3e6709499b6dfaea8d9782988727d
-  data.tar.gz: 252af7be03ece98458b54a7dcf1edd08d63c7d381efcf3a7c3310e7bc76bc94c2b9441bec9d4c60d819b686286124a8a5cf3144a3db75e0585df6d130f2e5eac
+  metadata.gz: 3ca88c15099e24fc67f0338a936eb9fbae7b02c7f958a0c973e305bd812415a6794826dbd42b4ab4a9413c59ad05f899c127d2593d4382ece609852c5734425e
+  data.tar.gz: d03f36142cc2bca14ccacfbcc29d7e4b2903e3ddeb3dddf7a6ab25eb8acf21b01cfbaa8dd736142e24320726fb9cadd75b8e20e24b82cb6c7db138a0db843633

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.1.80](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.79...v0.1.80) (2023-12-12)
+
+
+### Bug Fixes
+
+* nameservers, windows tbu ([ac71703](https://github.com/STARTcloud/vagrant-zones/commit/ac7170336596ee4ec3179a12eb6139db6f6bae33))
+* remove junk ([42b68d6](https://github.com/STARTcloud/vagrant-zones/commit/42b68d6e9e3e9a45eed0ffe65f6a0e5e04309a9d))
+* rubocop linting ([123799f](https://github.com/STARTcloud/vagrant-zones/commit/123799fbe03bbedf36191ec22bc2ce878e01c8de))
+* update each loops per rubocop ([646c8d3](https://github.com/STARTcloud/vagrant-zones/commit/646c8d394bdf2faf6a725e0293c7ae732dba2ef5))
+* update netplan ([14fcb6e](https://github.com/STARTcloud/vagrant-zones/commit/14fcb6e6a21aeaf0a43944dc13f1b66996cc00b6))
+
 ## [0.1.79](https://github.com/STARTcloud/vagrant-zones/compare/v0.1.78...v0.1.79) (2023-11-27)
 
 

data/lib/vagrant-zones/command/console.rb

@@ -49,7 +49,7 @@ module VagrantPlugins
             # Add the available subcommands as separators in order to print them
             # out as well.
             keys = []
-            @subcommands.each { |key, _value| keys << key.to_s }
+            @subcommands.each_key { |key| keys << key.to_s }
             keys.sort.each do |key|
               subopts.separator "     #{key}"
             end

data/lib/vagrant-zones/command/guest_power_controls.rb

@@ -43,7 +43,7 @@ module VagrantPlugins
             # Add the available subcommands as separators in order to print them
             # out as well.
             keys = []
-            @subcommands.each { |key, _value| keys << key.to_s }
+            @subcommands.each_key { |key| keys << key.to_s }
             keys.sort.each do |key|
               subopts.separator "     #{key}"
             end

data/lib/vagrant-zones/command/zfssnapshot.rb

@@ -52,7 +52,7 @@ module VagrantPlugins
             # Add the available subcommands as separators in order to print them
             # out as well.
             keys = []
-            @subcommands.each { |key, _value| keys << key.to_s }
+            @subcommands.each_key { |key| keys << key.to_s }
             keys.sort.each do |key|
               subopts.separator "     #{key}"
             end

data/lib/vagrant-zones/command/zone.rb

@@ -55,7 +55,7 @@ module VagrantPlugins
             # Add the available subcommands as separators in order to print them
             # out as well.
             keys = []
-            @subcommands.each { |key, _value| keys << key.to_s }
+            @subcommands.each_key { |key| keys << key.to_s }
 
             keys.sort.each do |key|
               subopts.separator "     #{key}"

data/lib/vagrant-zones/driver.rb

@@ -211,8 +211,7 @@ module VagrantPlugins
       # This Sanitizes the DNS Records
       def dnsservers(uii, opts)
         config = @machine.provider_config
-        servers = opts['dns']
-        servers = [{ 'nameserver' => '1.1.1.1' }, { 'nameserver' => '8.8.8.8' }] if opts['dns'].nil?
+        servers = opts[:dns]
         uii.info(I18n.t('vagrant_zones.nsservers') + servers.to_s) if config.debug
         servers
       end
@@ -267,7 +266,7 @@ module VagrantPlugins
         alcheck = 'login:' if config.alcheck.nil?
         pcheck = 'Password:'
 
-        @machine.config.vm.networks.each do |_adaptertype, opts|
+        @machine.config.vm.networks.each_value do |opts|
           ip = nil
           if opts[:dhcp4] && opts[:managed]
             vnic_name = "vnic#{nictype(opts)}#{vtype(config)}_#{config.partition_id}_#{opts[:nic_number]}"
@@ -521,16 +520,16 @@ module VagrantPlugins
         defrouter = opts[:gateway].to_s
         vnic_name = vname(uii, opts)
         shrtsubnet = IPAddr.new(opts[:netmask].to_s).to_i.to_s(2).count('1').to_s
-        servers = dnsservers(uii, opts)
+        servers = dnsservers(uii, opts).map { |server| server['nameserver'] }.join(', ') unless opts[:dns].nil?
         ## Begin of code block to move to Netplan function
         uii.info(I18n.t('vagrant_zones.configure_interface_using_vnic'))
         uii.info("  #{vnic_name}")
         netplan1 = %(network:\n  version: 2\n  ethernets:\n    #{vnic_name}:\n      match:\n        macaddress: #{mac}\n)
         netplan2 = %(      dhcp-identifier: mac\n      dhcp4: #{opts[:dhcp4]}\n      dhcp6: #{opts[:dhcp6]}\n)
-        netplan3 = %(      set-name: #{vnic_name}\n      addresses: [#{ip}/#{shrtsubnet}]\n      gateway4: #{defrouter}\n)
-        netplan4 = %(      nameservers:\n        addresses: [#{servers[0]['nameserver']} , #{servers[1]['nameserver']}] )
+        netplan3 = %(      set-name: #{vnic_name}\n      addresses: [#{ip}/#{shrtsubnet}]\n      routes:\n        - to: default\n          via: #{defrouter}\n)
+        netplan4 = %(      nameservers:\n        addresses: [#{servers}] ) unless opts[:dns].nil?
         netplan = netplan1 + netplan2 + netplan3 + netplan4
-        cmd = "echo -e '#{netplan}' | sudo tee /etc/netplan/#{vnic_name}.yaml"
+        cmd = "echo -e '#{netplan}' | sudo tee /etc/netplan/#{vnic_name}.yaml && chmod 400 /etc/netplan/#{vnic_name}.yaml"
         uii.info(I18n.t('vagrant_zones.netplan_applied_static') + "/etc/netplan/#{vnic_name}.yaml") if ssh_run_command(uii, cmd)
 
         ## Apply the Configuration
@@ -544,7 +543,7 @@ module VagrantPlugins
         defrouter = opts[:gateway].to_s
         vnic_name = vname(uii, opts)
         shrtsubnet = IPAddr.new(opts[:netmask].to_s).to_i.to_s(2).count('1').to_s
-        servers = dnsservers(uii, opts)
+        servers = dnsservers(uii, opts).map { |server| "nameserver #{server['nameserver']}" }.join("\n") unless opts[:dns].nil?
         uii.info(I18n.t('vagrant_zones.configure_interface_using_vnic_dladm'))
         uii.info("  #{vnic_name}")
 
@@ -572,8 +571,7 @@ module VagrantPlugins
         route_add = "pfexec route -p add default #{defrouter}" unless defrouter.nil?
         uii.info(I18n.t('vagrant_zones.dladm_route_applied')) if ssh_run_command(uii, route_add)
 
-        ns_string = "nameserver #{servers[0]['nameserver']}\nnameserver #{servers[1]['nameserver']}"
-        dns_set = "pfexec echo '#{ns_string}' | pfexec tee /etc/resolv.conf"
+        dns_set = "pfexec echo '#{servers}' | pfexec tee /etc/resolv.conf" unless opts[:dns].nil?
         uii.info(I18n.t('vagrant_zones.dladm_dns_applied')) if ssh_run_command(uii, dns_set.to_s)
       end
 
@@ -583,7 +581,7 @@ module VagrantPlugins
         defrouter = opts[:gateway].to_s
         vnic_name = vname(uii, opts)
         shrtsubnet = IPAddr.new(opts[:netmask].to_s).to_i.to_s(2).count('1').to_s
-        servers = dnsservers(uii, opts)
+        servers = dnsservers(uii, opts).map { |server| "nameserver #{server['nameserver']}" }.join("\n") unless opts[:dns].nil?
         uii.info(I18n.t('vagrant_zones.configure_interface_using_vnic_dladm'))
         uii.info("  #{vnic_name}")
 
@@ -614,8 +612,7 @@ module VagrantPlugins
         route_add = 'echo True' if opts[:gateway].nil?
         uii.info(I18n.t('vagrant_zones.dladm_route_applied')) if zlogin(uii, route_add)
 
-        ns_string = "nameserver #{servers[0]['nameserver']}\nnameserver #{servers[1]['nameserver']}"
-        dns_set = "pfexec echo '#{ns_string}' | pfexec tee /etc/resolv.conf"
+        dns_set = "pfexec echo '#{servers}' | pfexec tee /etc/resolv.conf" unless opts[:dns].nil?
         uii.info(I18n.t('vagrant_zones.dladm_dns_applied')) if zlogin(uii, dns_set.to_s)
       end
 
@@ -1136,7 +1133,7 @@ module VagrantPlugins
         zlogin(uii, 'rm -rf /etc/netplan/*.yaml') if (opts[:nic_number]).zero?
         ip = ipaddress(uii, opts)
         vnic_name = vname(uii, opts)
-        servers = dnsservers(uii, opts)
+        servers = dnsservers(uii, opts).map { |server| server['nameserver'] }.join(', ') unless opts[:dns].nil?
         shrtsubnet = IPAddr.new(opts[:netmask].to_s).to_i.to_s(2).count('1').to_s
         defrouter = opts[:gateway].to_s
         uii.info(I18n.t('vagrant_zones.configure_interface_using_vnic'))
@@ -1146,11 +1143,11 @@ module VagrantPlugins
         netplan2 = %(      dhcp-identifier: mac\n      dhcp4: #{opts[:dhcp4]}\n      dhcp6: #{opts[:dhcp6]}\n) if opts[:dhcp4]
         netplan3 = %(      set-name: #{vnic_name}\n      addresses: [#{ip}/#{shrtsubnet}]\n)
         netplan3 = %(      set-name: #{vnic_name}\n) if opts[:dhcp4]
-        netplan4 = %(      gateway4: #{defrouter}\n)
-        netplan5 = %(      nameservers:\n        addresses: [#{servers[0]['nameserver']} , #{servers[1]['nameserver']}] )
+        netplan4 = %(      routes:\n        - to: default\n          via: #{defrouter}\n)
+        netplan5 = %(      nameservers:\n        addresses: [#{servers}] ) unless opts[:dns].nil?
         netplan = netplan1 + netplan2 + netplan3 + netplan5 if opts[:gateway].nil?
         netplan = netplan1 + netplan2 + netplan3 + netplan4 + netplan5 unless opts[:gateway].nil?
-        cmd = "echo '#{netplan}' > /etc/netplan/#{vnic_name}.yaml"
+        cmd = "echo '#{netplan}' > /etc/netplan/#{vnic_name}.yaml && chmod 400 /etc/netplan/#{vnic_name}.yaml"
         infomessage = I18n.t('vagrant_zones.netplan_applied_static') + "/etc/netplan/#{vnic_name}.yaml"
         uii.info(infomessage) if zlogin(uii, cmd)
         uii.info(I18n.t('vagrant_zones.netplan_applied')) if zlogin(uii, 'netplan apply')
@@ -1330,7 +1327,7 @@ module VagrantPlugins
       def zoneniczloginsetup_windows(uii, opts, _mac)
         ip = ipaddress(uii, opts)
         vnic_name = vname(uii, opts)
-        servers = dnsservers(uii, opts)
+        servers = dnsservers(uii, opts) unless opts[:dns].nil?
         defrouter = opts[:gateway].to_s
         uii.info(I18n.t('vagrant_zones.configure_win_interface_using_vnic'))
         sleep(60)
@@ -1339,8 +1336,8 @@ module VagrantPlugins
         ## to set the proper VNIC name if using multiple adapters
         rename_adapter = %(netsh interface set interface name = "Ethernet" newname = "#{vnic_name}")
         cmd = %(netsh interface ipv4 set address name="#{vnic_name}" static #{ip} #{opts[:netmask]} #{defrouter})
-        dns1 = %(netsh int ipv4 set dns name="#{vnic_name}" static #{servers[0]['nameserver']} primary validate=no)
-        dns2 = %(netsh int ipv4 add dns name="#{vnic_name}" #{servers[1]['nameserver']} index=2 validate=no)
+        dns1 = %(netsh int ipv4 set dns name="#{vnic_name}" static #{servers[0]['nameserver']} primary validate=no) unless opts[:dns].nil?
+        dns2 = %(netsh int ipv4 add dns name="#{vnic_name}" #{servers[1]['nameserver']} index=2 validate=no) unless opts[:dns].nil?
 
         uii.info(I18n.t('vagrant_zones.win_applied_rename_adapter')) if zlogin(uii, rename_adapter)
         uii.info(I18n.t('vagrant_zones.win_applied_static')) if zlogin(uii, cmd)
@@ -1630,7 +1627,7 @@ module VagrantPlugins
         # name = @machine.name
         uii.info(I18n.t('vagrant_zones.cron_entries'))
         h = { h: 'hourly', d: 'daily', w: 'weekly', m: 'monthly' }
-        h.each do |_k, d|
+        h.each_value do |d|
           next unless opts[:list] == d || opts[:list] == 'all'
 
           uii.info(cronjobs[d.to_sym]) unless cronjobs[d.to_sym].nil?
@@ -1645,7 +1642,7 @@ module VagrantPlugins
         rmcr = "#{sc} -l | grep -v "
         h = { h: 'hourly', d: 'daily', w: 'weekly', m: 'monthly' }
         uii.info(I18n.t('vagrant_zones.cron_delete'))
-        h.each do |_k, d|
+        h.each_value do |d|
           next unless opts[:delete] == d || opts[:delete] == 'all'
 
           cj = cronjobs[d.to_sym].to_s.gsub('*', '\*')

data/lib/vagrant-zones/version.rb

@@ -2,7 +2,7 @@
 
 module VagrantPlugins
   module ProviderZone
-    VERSION = '0.1.79'
+    VERSION = '0.1.80'
     NAME = 'vagrant-zones'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-zones
 version: !ruby/object:Gem::Version
-  version: 0.1.79
+  version: 0.1.80
 platform: ruby
 authors:
 - Mark Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n