tnargav 1.2.3 → 1.3.3

data/plugins/hosts/fedora/host.rb

@@ -11,8 +11,11 @@ module VagrantPlugins
         release_file = Pathname.new("/etc/redhat-release")
 
         if release_file.exist?
-          release_file.open("r") do |f|
-            return true if f.gets =~ /^Fedora/
+          release_file.open("r:ISO-8859-1:UTF-8") do |f|
+            contents = f.gets
+            return true if contents =~ /^Fedora/
+            return true if contents =~ /^CentOS/
+            return true if contents =~ /^Red Hat Enterprise Linux Server/
           end
         end
 
@@ -27,24 +30,27 @@ module VagrantPlugins
       def initialize(*args)
         super
 
-        @nfs_server_binary = "/etc/init.d/nfs"
+        nfs_server_binary = "/etc/init.d/nfs"
 
         # On Fedora 16+, systemd replaced init.d, so we have to use the
         # proper NFS binary. This checks to see if we need to do that.
         release_file = Pathname.new("/etc/redhat-release")
         begin
-          release_file.open("r") do |f|
-            version_number = /Fedora.*release ([0-9]+)/.match(f.gets)[1].to_i
+          release_file.open("r:ISO-8859-1:UTF-8") do |f|
+            version_number = /(CentOS|Fedora|Red Hat Enterprise Linux Server).*release ([0-9]+)/.match(f.gets)[2].to_i
             if version_number >= 16
               # "service nfs-server" will redirect properly to systemctl
               # when "service nfs-server restart" is called.
-              @nfs_server_binary = "/usr/sbin/service nfs-server"
+              nfs_server_binary = "/usr/sbin/service nfs-server"
             end
           end
         rescue Errno::ENOENT
           # File doesn't exist, not a big deal, assume we're on a
           # lower version.
         end
+        @nfs_apply_command = "/usr/sbin/exportfs -r"
+        @nfs_check_command = "#{nfs_server_binary} status"
+        @nfs_start_command = "#{nfs_server_binary} start"
       end
     end
   end

data/plugins/hosts/gentoo/host.rb

@@ -17,7 +17,9 @@ module VagrantPlugins
       def initialize(*args)
         super
 
-        @nfs_server_binary = "/etc/init.d/nfs"
+        @nfs_apply_command = "/usr/sbin/exportfs -r"
+        @nfs_check_command = "service nfs status"
+        @nfs_start_command = "service nfs start"
       end
     end
   end

data/plugins/hosts/linux/host.rb

@@ -24,7 +24,9 @@ module VagrantPlugins
         super
 
         @logger = Log4r::Logger.new("vagrant::hosts::linux")
-        @nfs_server_binary = "/etc/init.d/nfs-kernel-server"
+        @nfs_apply_command = "/usr/sbin/exportfs -r"
+        @nfs_check_command = "/etc/init.d/nfs-kernel-server status"
+        @nfs_start_command = "/etc/init.d/nfs-kernel-server start"
       end
 
       def nfs?
@@ -34,11 +36,34 @@ module VagrantPlugins
         end
       end
 
-      def nfs_export(id, ip, folders)
+      def nfs_opts_setup(folders)
+        folders.each do |k, opts|
+          if !opts[:linux__nfs_options]
+            opts[:linux__nfs_options] ||= ["rw", "no_subtree_check", "all_squash"]
+          end
+
+          # Only automatically set anonuid/anongid if they weren't
+          # explicitly set by the user.
+          hasgid = false
+          hasuid = false
+          opts[:linux__nfs_options].each do |opt|
+            hasgid = !!(opt =~ /^anongid=/) if !hasgid
+            hasuid = !!(opt =~ /^anonuid=/) if !hasuid
+          end
+
+          opts[:linux__nfs_options] << "anonuid=#{opts[:map_uid]}" if !hasuid
+          opts[:linux__nfs_options] << "anongid=#{opts[:map_gid]}" if !hasgid
+          opts[:linux__nfs_options] << "fsid=#{opts[:uuid]}"
+        end
+      end
+
+      def nfs_export(id, ips, folders)
+        nfs_opts_setup(folders)
         output = TemplateRenderer.render('nfs/exports_linux',
                                          :uuid => id,
-                                         :ip => ip,
-                                         :folders => folders)
+                                         :ips => ips,
+                                         :folders => folders,
+                                         :user => Process.uid)
 
         @ui.info I18n.t("vagrant.hosts.linux.nfs_export")
         sleep 0.5
@@ -51,9 +76,11 @@ module VagrantPlugins
           system(%Q[sudo su root -c "echo '#{line}' >> /etc/exports"])
         end
 
-        # We run restart here instead of "update" just in case nfsd
-        # is not starting
-        system("sudo #{@nfs_server_binary} restart")
+        if nfs_running?
+          system("sudo #{@nfs_apply_command}")
+        else
+          system("sudo #{@nfs_start_command}")
+        end
       end
 
       def nfs_prune(valid_ids)
@@ -62,9 +89,10 @@ module VagrantPlugins
         @logger.info("Pruning invalid NFS entries...")
 
         output = false
+        user = Process.uid
 
         File.read("/etc/exports").lines.each do |line|
-          if id = line[/^# VAGRANT-BEGIN: (.+?)$/, 1]
+          if id = line[/^# VAGRANT-BEGIN:( #{user})? ([A-Za-z0-9-]+?)$/, 2]
             if valid_ids.include?(id)
               @logger.debug("Valid ID: #{id}")
             else
@@ -83,12 +111,17 @@ module VagrantPlugins
 
       protected
 
+      def nfs_running?
+        system("#{@nfs_check_command}")
+      end
+
       def nfs_cleanup(id)
         return if !File.exist?("/etc/exports")
 
+        user = Process.uid
         # Use sed to just strip out the block of code which was inserted
         # by Vagrant
-        system("sudo sed -e '/^# VAGRANT-BEGIN: #{id}/,/^# VAGRANT-END: #{id}/ d' -ibak /etc/exports")
+        system("sudo sed -r -e '/^# VAGRANT-BEGIN:( #{user})? #{id}/,/^# VAGRANT-END:( #{user})? #{id}/ d' -ibak /etc/exports")
       end
     end
   end

data/plugins/hosts/opensuse/host.rb

@@ -27,7 +27,9 @@ module VagrantPlugins
       def initialize(*args)
         super
 
-        @nfs_server_binary = "/etc/init.d/nfsserver"
+        @nfs_apply_command = "/usr/sbin/exportfs -r"
+        @nfs_check_command = "service nfsserver status"
+	@nfs_start_command = "service nfsserver start"
       end
     end
   end

data/plugins/hosts/slackware/host.rb

@@ -0,0 +1,26 @@
+require "vagrant"
+
+require Vagrant.source_root.join("plugins/hosts/linux/host")
+
+module VagrantPlugins
+  module HostSlackware
+    class Host < VagrantPlugins::HostLinux::Host
+      def self.match?
+        return File.exists?("/etc/slackware-release") || Dir.glob("/usr/lib/setup/Plamo-*").length > 0
+      end
+
+      # Normal, mid-range precedence.
+      def self.precedence
+        5
+      end
+
+      def initialize(*args)
+        super
+
+        @nfs_apply_command = "/usr/sbin/exportfs -r"
+        @nfs_check_command = "pidof nfsd > /dev/null"
+        @nfs_start_command = "/etc/rc.d/rc.nfsd start"
+      end
+    end
+  end
+end

data/plugins/hosts/slackware/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module HostSlackware
+    class Plugin < Vagrant.plugin("2")
+      name "Slackware host"
+      description "Slackware and derivertives host support."
+
+      host("slackware") do
+        require File.expand_path("../host", __FILE__)
+        Host
+      end
+    end
+  end
+end

data/plugins/kernel_v1/config/ssh.rb

@@ -34,12 +34,12 @@ module VagrantPlugins
         new.ssh.host             = @host if @host != UNSET_VALUE
         new.ssh.port             = @port if @port != UNSET_VALUE
         new.ssh.guest_port       = @guest_port if @guest_port != UNSET_VALUE
-        new.ssh.max_tries        = @max_tries if @max_tries != UNSET_VALUE
-        new.ssh.timeout          = @timeout if @timeout != UNSET_VALUE
         new.ssh.private_key_path = @private_key_path if @private_key_path != UNSET_VALUE
         new.ssh.forward_agent    = @forward_agent if @forward_agent != UNSET_VALUE
         new.ssh.forward_x11      = @forward_x11 if @forward_x11 != UNSET_VALUE
         new.ssh.shell            = @shell if @shell != UNSET_VALUE
+
+        # TODO: Warn that max_tries and timeout are gone
       end
     end
   end

data/plugins/kernel_v2/config/ssh.rb

@@ -9,22 +9,20 @@ module VagrantPlugins
       attr_accessor :forward_x11
       attr_accessor :guest_port
       attr_accessor :keep_alive
-      attr_accessor :max_tries
       attr_accessor :shell
-      attr_accessor :timeout
+      attr_accessor :proxy_command
 
       attr_reader :default
 
       def initialize
         super
 
-        @forward_agent    = UNSET_VALUE
-        @forward_x11      = UNSET_VALUE
-        @guest_port = UNSET_VALUE
-        @keep_alive = UNSET_VALUE
-        @max_tries  = UNSET_VALUE
-        @shell      = UNSET_VALUE
-        @timeout    = UNSET_VALUE
+        @forward_agent = UNSET_VALUE
+        @forward_x11   = UNSET_VALUE
+        @guest_port    = UNSET_VALUE
+        @keep_alive    = UNSET_VALUE
+        @proxy_command = UNSET_VALUE
+        @shell         = UNSET_VALUE
 
         @default    = SSHConnectConfig.new
       end
@@ -43,9 +41,8 @@ module VagrantPlugins
         @forward_x11   = false if @forward_x11 == UNSET_VALUE
         @guest_port = nil if @guest_port == UNSET_VALUE
         @keep_alive = false if @keep_alive == UNSET_VALUE
-        @max_tries  = nil if @max_tries == UNSET_VALUE
+        @proxy_command = nil if @proxy_command == UNSET_VALUE
         @shell      = nil if @shell == UNSET_VALUE
-        @timeout    = nil if @timeout == UNSET_VALUE
 
         @default.finalize!
       end
@@ -57,11 +54,6 @@ module VagrantPlugins
       def validate(machine)
         errors = super
 
-        [:max_tries, :timeout].each do |field|
-          value = instance_variable_get("@#{field}".to_sym)
-          errors << I18n.t("vagrant.config.common.error_empty", :field => field) if !value
-        end
-
         # Return the errors
         result = { to_s => errors }
 

data/plugins/kernel_v2/config/vm.rb

@@ -4,6 +4,7 @@ require "set"
 
 require "vagrant"
 require "vagrant/config/v2/util"
+require "vagrant/util/platform"
 
 require File.expand_path("../vm_provisioner", __FILE__)
 require File.expand_path("../vm_subvm", __FILE__)
@@ -14,18 +15,20 @@ module VagrantPlugins
       DEFAULT_VM_NAME = :default
 
       attr_accessor :base_mac
+      attr_accessor :boot_timeout
       attr_accessor :box
       attr_accessor :box_url
-      attr_accessor :graceful_halt_retry_count
-      attr_accessor :graceful_halt_retry_interval
+      attr_accessor :box_download_insecure
+      attr_accessor :graceful_halt_timeout
       attr_accessor :guest
       attr_accessor :hostname
       attr_accessor :usable_port_range
       attr_reader :provisioners
 
       def initialize
-        @graceful_halt_retry_count    = UNSET_VALUE
-        @graceful_halt_retry_interval = UNSET_VALUE
+        @boot_timeout                 = UNSET_VALUE
+        @box_download_insecure        = UNSET_VALUE
+        @graceful_halt_timeout        = UNSET_VALUE
         @guest                        = UNSET_VALUE
         @hostname                     = UNSET_VALUE
         @provisioners                 = []
@@ -41,6 +44,12 @@ module VagrantPlugins
         @__synced_folders              = {}
       end
 
+      # This was from V1, but we just kept it here as an alias for hostname
+      # because too many people mess this up.
+      def host_name=(value)
+        @hostname = value
+      end
+
       # Custom merge method since some keys here are merged differently.
       def merge(other)
         super.tap do |result|
@@ -91,7 +100,11 @@ module VagrantPlugins
 
           # Merge synced folders.
           other_folders = other.instance_variable_get(:@__synced_folders)
-          new_folders = @__synced_folders.dup
+          new_folders = {}
+          @__synced_folders.each do |key, value|
+            new_folders[key] = value.dup
+          end
+
           other_folders.each do |id, options|
             new_folders[id] ||= {}
             new_folders[id].merge!(options)
@@ -118,7 +131,14 @@ module VagrantPlugins
       #   folder.
       # @param [Hash] options Additional options.
       def synced_folder(hostpath, guestpath, options=nil)
+        if Vagrant::Util::Platform.windows?
+          # On Windows, Ruby just uses normal '/' for path seps, so
+          # just replace normal Windows style seps with Unix ones.
+          hostpath = hostpath.to_s.gsub("\\", "/")
+        end
+
         options ||= {}
+        options = options.dup
         options[:guestpath] = guestpath.to_s.gsub(/\/$/, '')
         options[:hostpath]  = hostpath
 
@@ -143,6 +163,8 @@ module VagrantPlugins
       # @param [Hash] options Options for the network.
       def network(type, options=nil)
         options ||= {}
+        options = options.dup
+        options[:protocol] ||= "tcp"
 
         if !options[:id]
           default_id = nil
@@ -150,7 +172,7 @@ module VagrantPlugins
           if type == :forwarded_port
             # For forwarded ports, set the default ID to the
             # host port so that host ports overwrite each other.
-            default_id = options[:host]
+            default_id = "#{options[:protocol]}#{options[:host]}"
           end
 
           options[:id] = default_id || SecureRandom.uuid
@@ -205,6 +227,7 @@ module VagrantPlugins
       def define(name, options=nil, &block)
         name = name.to_sym
         options ||= {}
+        options = options.dup
         options[:config_version] ||= "2"
 
         # Add the name to the array of VM keys. This array is used to
@@ -226,8 +249,12 @@ module VagrantPlugins
 
       def finalize!
         # Defaults
+        @boot_timeout = 300 if @boot_timeout == UNSET_VALUE
+        @box_download_insecure = false if @box_download_insecure == UNSET_VALUE
+        @graceful_halt_timeout = 300 if @graceful_halt_timeout == UNSET_VALUE
         @guest = nil if @guest == UNSET_VALUE
         @hostname = nil if @hostname == UNSET_VALUE
+        @hostname = @hostname.to_s if @hostname
 
         # Set the guest properly
         @guest = @guest.to_sym if @guest
@@ -236,6 +263,14 @@ module VagrantPlugins
         # default VM which just inherits the rest of the configuration.
         define(DEFAULT_VM_NAME) if defined_vm_keys.empty?
 
+        # Clean up some network configurations
+        @__networks.each do |type, opts|
+          if type == :forwarded_port
+            opts[:guest] = opts[:guest].to_i if opts[:guest]
+            opts[:host] = opts[:host].to_i if opts[:host]
+          end
+        end
+
         # Compile all the provider configurations
         @__providers.each do |name, blocks|
           # If we don't have any configuration blocks, then ignore it
@@ -258,6 +293,13 @@ module VagrantPlugins
           @__compiled_provider_configs[name]   = config
         end
 
+        @__synced_folders.each do |id, options|
+          # Ignore NFS on Windows
+          if options[:nfs] && Vagrant::Util::Platform.windows?
+            options[:nfs] = false
+          end
+        end
+
         # Flag that we finalized
         @__finalized = true
       end
@@ -322,7 +364,7 @@ module VagrantPlugins
           guestpath = Pathname.new(options[:guestpath])
           hostpath  = Pathname.new(options[:hostpath]).expand_path(machine.env.root_path)
 
-          if guestpath.relative?
+          if guestpath.relative? && guestpath.to_s !~ /^\w+:/
             errors << I18n.t("vagrant.config.vm.shared_folder_guestpath_relative",
                              :path => options[:guestpath])
           else
@@ -348,6 +390,15 @@ module VagrantPlugins
                                :path => options[:hostpath])
             end
           end
+
+          if options[:mount_options] && !options[:mount_options].is_a?(Array)
+            errors << I18n.t("vagrant.config.vm.shared_folder_mount_options_array")
+          end
+
+          # One day remove this probably.
+          if options[:extra]
+            errors << "The 'extra' flag on synced folders is now 'mount_options'"
+          end
         end
 
         if has_nfs
@@ -361,7 +412,7 @@ module VagrantPlugins
 
         # Validate networks
         has_fp_port_error = false
-        fp_host_ports     = Set.new
+        fp_used = Set.new
         valid_network_types = [:forwarded_port, :private_network, :public_network]
 
         networks.each do |type, options|
@@ -377,12 +428,14 @@ module VagrantPlugins
             end
 
             if options[:host]
-              if fp_host_ports.include?(options[:host])
+              key = "#{options[:protocol]}#{options[:host]}"
+              if fp_used.include?(key)
                 errors << I18n.t("vagrant.config.vm.network_fp_host_not_unique",
-                                :host => options[:host].to_s)
+                                :host => options[:host].to_s,
+                                :protocol => options[:protocol].to_s)
               end
 
-              fp_host_ports.add(options[:host])
+              fp_used.add(key)
             end
           end
 
@@ -392,6 +445,10 @@ module VagrantPlugins
                 errors << I18n.t("vagrant.config.vm.network_ip_required")
               end
             end
+
+            if options[:ip] && options[:ip].end_with?(".1")
+              errors << I18n.t("vagrant.config.vm.network_ip_ends_in_one")
+            end
           end
         end