vagrant-nfs_guest 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28f6ca8678072ec9a07eb4916c3fc3c54468a2a0
-  data.tar.gz: b0584ef2f9b892fa2fdcef05bd3ebba48e91ee3b
+  metadata.gz: 0b022bd81cf93ac95afc707b0c94044647789904
+  data.tar.gz: 87b23dea2b7e0ca61a6caf4e1bd2a67738757c87
 SHA512:
-  metadata.gz: e2506b4dfd29a2096b0edce82cb176d1079daa84c2458d42510736f66acba1ca214e94e0fc0d03d4f36c94cdb100e93d7186c69a2e5626a9ebaba350cce678d3
-  data.tar.gz: da96e2efe228f047a55d036da7fc8d452760c69c4d7ef4d031738ce8c7e3793468dc6aab210e1745e37f3684cb82b5eebf9aa7913096d2c4293dc15cf0031cf0
+  metadata.gz: 6d37621eb12be33298fb653e73574dc660b5905a13110811cae4b30ce26f3f955f98c87a81de684874e8522dd865834fbef87aa32c0f903bb01e330536524415
+  data.tar.gz: 0a981af776678422a36a22ec892581b5e9b6874c62439733ec9a67b2c8602275eb8fbfc4a3a3fa5c6cc32c438318681ceeeb97646ee3cb15ab4f189c7549cc15

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.2.3

data/README.md

@@ -17,8 +17,18 @@ Allows a guest VM to export synced folders via NFS and the host to mount them.
 
 Basically it's just the usual NFS synced folders in Vagrant but the roles are reversed.
 
-**WARNING** this has only been tested fully using an OSX host and a Ubuntu guest by us.
-We're happy to receive pull-request to support alternatives hosts and guests. To implement this support is relatively trivial if you look in ./lib/hosts and ./lib/guests, and then just modify the "plugin.py" to include the new capabilities.
+Guest VMs we've tested include:
+- Ubuntu (precise, trusty)
+- CentOS (6.5, 6.6, 7)
+- Debian (wheezy)
+- other Linux based guests may work fine with the generic Linux support. But no guarantee
+
+Hosts we've tested include:
+- OSX (Mavericks, Yosemite, El Capitan)
+- Ubuntu (precise, trusty)
+- other Linux based OSs should work fine, but will need testing, again no guarantee
+
+We're happy to receive pull-request to support alternatives hosts and guests. To implement this support it's relatively trivial if you look in ./lib/hosts and ./lib/guests.
 
 ## Installation
 
@@ -46,6 +56,17 @@ We use 'chruby' to allow a virtual ruby environment for developement. The 'bundl
     cd vagrant-nfs_guest
     bundle install
     bundle exec vagrant
+
+You can test your handy work using the ```example_box``` by doing the following:
+    cd ./example_box/
+    bundle exec vagrant up
+
+You can ssh into the test VM using:
+    bundle exec vagrant ssh
+
+... and you can clean up with:
+    bundle exec vagrant destroy
+
     
 ## Contributing
 

data/example_box/Vagrantfile

@@ -11,6 +11,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "ubuntu/trusty64"
+  #config.vm.box = "centos/7"
+  #config.vm.box = "puphpet/centos65-x64"
 
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system.

data/lib/vagrant-nfs_guest/guests/debian/cap/nfs_server.rb

@@ -3,10 +3,6 @@ module VagrantPlugins
     module GuestDebian
       module Cap
         class NFSServer
-          def self.nfs_test_command(env)
-            "test -x /usr/sbin/exportfs"
-          end
-
           def self.nfs_server_install(machine)
             machine.communicate.sudo("apt-get update")
             machine.communicate.sudo("apt-get -y install nfs-kernel-server")
@@ -15,6 +11,12 @@ module VagrantPlugins
           def self.nfs_server_installed(machine)
             machine.communicate.test("test -e /etc/init.d/nfs-kernel-server")
           end
+
+          def self.nfs_test_command(machine)
+            machine.communicate.test(
+              "test -x /usr/sbin/exportfs"
+            )
+          end
         end
       end
     end

data/lib/vagrant-nfs_guest/guests/debian/plugin.rb

@@ -0,0 +1,25 @@
+require "vagrant"
+
+module VagrantPlugins
+  module SyncedFolderNFSGuest
+    class Plugin < Vagrant.plugin("2")
+      name "Debian guest"
+      description "Debian guest support."
+
+      guest_capability(:debian, :nfs_test_command) do
+        require_relative "cap/nfs_server"
+        GuestDebian::Cap::NFSServer
+      end
+
+      guest_capability(:debian, :nfs_server_installed) do
+        require_relative "cap/nfs_server"
+        GuestDebian::Cap::NFSServer
+      end
+
+      guest_capability(:debian, :nfs_server_install) do
+        require_relative "cap/nfs_server"
+        GuestDebian::Cap::NFSServer
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/guests/linux/cap/{nfs_export.rb → nfs_server.rb}

@@ -4,27 +4,35 @@ module VagrantPlugins
   module SyncedFolderNFSGuest
     module GuestLinux
       module Cap
-        class NFSExport
+        class NFSServer
           extend Vagrant::Util::Retryable
 
-          def self.nfs_apply_command(env)
-            "exportfs -r"
-          end
-
-          def self.nfs_check_command(env)
-            "/etc/init.d/nfs-kernel-server status"
+          def self.nfs_apply_command(machine)
+            machine.communicate.sudo(
+              "exportfs -r",
+              error_class: Errors::GuestNFSError,
+              error_key: :nfs_apply_failed
+            )
           end
 
-          def self.nfs_start_command(env)
-            "/etc/init.d/nfs-kernel-server start"
+          def self.nfs_start_command(machine)
+            machine.communicate.sudo(
+              "/etc/init.d/nfs-kernel-server start",
+              error_class: Errors::GuestNFSError,
+              error_key: :nfs_start_failed
+            )
           end
 
-          def self.nfs_check_command(env)
-            "/etc/init.d/nfs-kernel-server status"
+          def self.nfs_check_command(machine)
+            machine.communicate.test(
+              "/etc/init.d/nfs-kernel-server status"
+            )
           end
 
-          def self.nfs_test_command(env)
-            "which exportfs"
+          def self.nfs_test_command(machine)
+            machine.communicate.test(
+              "which exportfs"
+            )
           end
 
           def self.nfs_exports_template(machine)
@@ -33,29 +41,19 @@ module VagrantPlugins
           end
 
           def self.nfs_capable?(machine)
-            nfs_test_command = machine.guest.capability(:nfs_test_command)
-            machine.communicate.test(nfs_test_command)
+            machine.guest.capability(:nfs_test_command)
           end
 
           def self.nfs_apply_changes!(machine)
-            nfs_apply_command = machine.guest.capability(:nfs_apply_command)
-            machine.communicate.sudo(nfs_apply_command,
-                                     error_class: Errors::GuestNFSError,
-                                     error_key: :nfs_apply_failed
-                                    )
+            machine.guest.capability(:nfs_apply_command)
           end
 
           def self.nfs_start!(machine)
-            nfs_start_command = machine.guest.capability(:nfs_start_command)
-            machine.communicate.sudo(nfs_start_command,
-                                     error_class: Errors::GuestNFSError,
-                                     error_key: :nfs_start_failed
-                                    )
+            machine.guest.capability(:nfs_start_command)
           end
 
           def self.nfs_running?(machine)
-            nfs_test_command = machine.guest.capability(:nfs_check_command)
-            machine.communicate.test(nfs_test_command)
+            machine.guest.capability(:nfs_check_command)
           end
 
           def self.nfs_export(machine, ip, folders)
@@ -63,6 +61,11 @@ module VagrantPlugins
                 raise Errors::NFSServerMissing
             end
 
+            if machine.guest.capability?(:nfs_setup_firewall)
+              machine.ui.info I18n.t("vagrant_nfs_guest.guests.linux.nfs_setup_firewall")
+              machine.guest.capability(:nfs_setup_firewall, ip)
+            end
+
             nfs_exports_template = machine.guest.capability(:nfs_exports_template)
 
             nfs_opts_setup(machine, folders)

data/lib/vagrant-nfs_guest/guests/linux/plugin.rb

@@ -0,0 +1,50 @@
+require "vagrant"
+
+module VagrantPlugins
+  module SyncedFolderNFSGuest
+    class Plugin < Vagrant.plugin("2")
+      name "Linux guest."
+      description "Linux guest support."
+
+      guest_capability(:linux, :nfs_export) do
+        require_relative "cap/nfs_server"
+        GuestLinux::Cap::NFSServer
+      end
+
+      guest_capability(:linux, :nfs_apply_command) do
+        require_relative "cap/nfs_server"
+        GuestLinux::Cap::NFSServer
+      end
+
+      guest_capability(:linux, :nfs_check_command) do
+        require_relative "cap/nfs_server"
+        GuestLinux::Cap::NFSServer
+      end
+
+      guest_capability(:linux, :nfs_start_command) do
+        require_relative "cap/nfs_server"
+        GuestLinux::Cap::NFSServer
+      end
+
+      guest_capability(:linux, :nfs_test_command) do
+        require_relative "cap/nfs_server"
+        GuestLinux::Cap::NFSServer
+      end
+
+      guest_capability(:linux, :nfs_exports_template) do
+        require_relative "cap/nfs_server"
+        GuestLinux::Cap::NFSServer
+      end
+
+      guest_capability(:linux, :read_uid) do
+        require_relative "cap/read_user_ids"
+        GuestLinux::Cap::ReadUserIDs
+      end
+
+      guest_capability(:linux, :read_gid) do
+        require_relative "cap/read_user_ids"
+        GuestLinux::Cap::ReadUserIDs
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/guests/redhat/cap/nfs_server.rb

@@ -0,0 +1,85 @@
+module VagrantPlugins
+  module SyncedFolderNFSGuest
+    module GuestRedHat
+      module Cap
+        class NFSServer
+
+          def self.systemd?(machine)
+            machine.communicate.test("test $(ps -o comm= 1) == 'systemd'")
+          end
+
+          def self.nfs_server_install(machine)
+            machine.communicate.sudo("yum -y install nfs-utils nfs-utils-lib")
+
+            if systemd?(machine)
+              machine.communicate.sudo("systemctl enable rpcbind nfs-server")
+            else
+              machine.communicate.sudo("chkconfig nfs on")
+
+            end
+          end
+
+          def self.nfs_setup_firewall(machine, ip)
+            if not systemd?(machine)
+              # centos 6.5 has iptables on by default is would seem
+              machine.communicate.sudo(
+                "sed -i \"s/#LOCKD_/LOCKD_/\" /etc/sysconfig/nfs"
+              )
+              machine.communicate.sudo(
+                "sed -i \"s/#MOUNTD_PORT/MOUNTD_PORT/\" /etc/sysconfig/nfs"
+              )
+              machine.communicate.sudo(
+                "iptables -I INPUT -m state --state NEW -p udp -m multiport " +
+                "--dport 111,892,2049,32803 -s #{ip}/32 -j ACCEPT"
+              )
+              machine.communicate.sudo(
+                "iptables -I INPUT -m state --state NEW -p tcp -m multiport " +
+                "--dport 111,892,2049,32803 -s #{ip}/32 -j ACCEPT"
+              )
+
+              nfs_start_command(machine)
+            end
+          end
+
+          def self.nfs_server_installed(machine)
+            if systemd?(machine)
+              machine.communicate.test("systemctl status nfs-server.service")
+            else
+              machine.communicate.test("service nfs status")
+            end
+          end
+
+          def self.nfs_check_command(machine)
+            if systemd?(machine)
+              machine.communicate.test(
+                "systemctl status rpcbind nfs-server"
+              )
+            else
+              machine.communicate.test(
+                "service nfs status"
+              )
+            end
+          end
+
+          def self.nfs_start_command(machine)
+            if systemd?(machine)
+              machine.communicate.sudo(
+                "systemctl start rpcbind nfs-server",
+                error_class: Errors::GuestNFSError,
+                error_key: :nfs_start_failed
+              )
+            else
+              ['rpcbind', 'nfs'].each do |i|
+                machine.communicate.sudo(
+                  "service #{i} restart",
+                  error_class: Errors::GuestNFSError,
+                  error_key: :nfs_start_failed
+                )
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/guests/redhat/plugin.rb

@@ -0,0 +1,35 @@
+require "vagrant"
+
+module VagrantPlugins
+  module SyncedFolderNFSGuest
+    class Plugin < Vagrant.plugin("2")
+      name "Red Hat Enterprise Linux guest"
+      description "Red Hat Enterprise Linux guest support."
+
+      guest_capability(:redhat, :nfs_server_installed) do
+        require_relative "cap/nfs_server"
+        GuestRedHat::Cap::NFSServer
+      end
+
+      guest_capability(:redhat, :nfs_server_install) do
+        require_relative "cap/nfs_server"
+        GuestRedHat::Cap::NFSServer
+      end
+
+      guest_capability(:redhat, :nfs_check_command) do
+        require_relative "cap/nfs_server"
+        GuestRedHat::Cap::NFSServer
+      end
+
+      guest_capability(:redhat, :nfs_start_command) do
+        require_relative "cap/nfs_server"
+        GuestRedHat::Cap::NFSServer
+      end
+
+      guest_capability(:redhat, :nfs_setup_firewall) do
+        require_relative "cap/nfs_server"
+        GuestRedHat::Cap::NFSServer
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/guests/ubuntu/plugin.rb

@@ -0,0 +1,20 @@
+require "vagrant"
+
+module VagrantPlugins
+  module SyncedFolderNFSGuest
+    class Plugin < Vagrant.plugin("2")
+      name "Ubuntu guest"
+      description "Ubuntu guest support."
+
+      guest_capability(:ubuntu, :nfs_server_installed) do
+        require_relative "cap/nfs_server"
+        GuestUbuntu::Cap::NFSServer
+      end
+
+      guest_capability(:ubuntu, :nfs_server_install) do
+        require_relative "cap/nfs_server"
+        GuestUbuntu::Cap::NFSServer
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/hosts/bsd/plugin.rb

@@ -0,0 +1,20 @@
+require "vagrant"
+
+module VagrantPlugins
+  module SyncedFolderNFSGuest
+    class Plugin < Vagrant.plugin("2")
+      name "BSD host"
+      description "BSD host support."
+
+      host_capability("bsd", "nfs_mount") do
+        require_relative "cap/mount_nfs"
+        HostBSD::Cap::MountNFS
+      end
+
+      host_capability("bsd", "nfs_unmount") do
+        require_relative "cap/unmount_nfs"
+        HostBSD::Cap::UnmountNFS
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/hosts/linux/plugin.rb

@@ -0,0 +1,20 @@
+require "vagrant"
+
+module VagrantPlugins
+  module SyncedFolderNFSGuest
+    class Plugin < Vagrant.plugin("2")
+      name "Linux host"
+      description "Linux host support."
+
+      host_capability(:linux, "nfs_mount") do
+        require_relative "cap/mount_nfs"
+        HostLinux::Cap::MountNFS
+      end
+
+      host_capability(:linux, "nfs_unmount") do
+        require_relative "cap/unmount_nfs"
+        HostLinux::Cap::UnmountNFS
+      end
+    end
+  end
+end

data/lib/vagrant-nfs_guest/plugin.rb

@@ -10,6 +10,13 @@ if Vagrant::VERSION < "1.2.0"
   raise "The Vagrant NFS Guest plugin is only compatible with Vagrant 1.2+"
 end
 
+require_relative "guests/debian/plugin"
+require_relative "guests/linux/plugin"
+require_relative "guests/redhat/plugin"
+require_relative "guests/ubuntu/plugin"
+require_relative "hosts/bsd/plugin"
+require_relative "hosts/linux/plugin"
+
 module VagrantPlugins
   module SyncedFolderNFSGuest
     # This plugin implements Guest Exported NFS folders.
@@ -33,91 +40,6 @@ module VagrantPlugins
         SyncedFolder
       end
 
-      guest_capability(:linux, :nfs_export) do
-        require_relative "guests/linux/cap/nfs_export"
-        GuestLinux::Cap::NFSExport
-      end
-
-      guest_capability(:linux, :nfs_apply_command) do
-        require_relative "guests/linux/cap/nfs_export"
-        GuestLinux::Cap::NFSExport
-      end
-
-      guest_capability(:linux, :nfs_check_command) do
-        require_relative "guests/linux/cap/nfs_export"
-        GuestLinux::Cap::NFSExport
-      end
-
-      guest_capability(:linux, :nfs_start_command) do
-        require_relative "guests/linux/cap/nfs_export"
-        GuestLinux::Cap::NFSExport
-      end
-
-      guest_capability(:linux, :nfs_test_command) do
-        require_relative "guests/linux/cap/nfs_export"
-        GuestLinux::Cap::NFSExport
-      end
-
-      guest_capability(:linux, :nfs_exports_template) do
-        require_relative "guests/linux/cap/nfs_export"
-        GuestLinux::Cap::NFSExport
-      end
-
-      guest_capability(:debian, :nfs_test_command) do
-        require_relative "guests/debian/cap/nfs_server"
-        GuestDebian::Cap::NFSServer
-      end
-
-      guest_capability(:debian, "nfs_server_installed") do
-        require_relative "guests/debian/cap/nfs_server"
-        GuestDebian::Cap::NFSServer
-      end
-
-      guest_capability(:debian, :nfs_server_install) do
-        require_relative "guests/debian/cap/nfs_server"
-        GuestDebian::Cap::NFSServer
-      end
-
-      guest_capability(:ubuntu, "nfs_server_installed") do
-        require_relative "guests/ubuntu/cap/nfs_server"
-        GuestUbuntu::Cap::NFSServer
-      end
-
-      guest_capability(:ubuntu, :nfs_server_install) do
-        require_relative "guests/ubuntu/cap/nfs_server"
-        GuestUbuntu::Cap::NFSServer
-      end
-
-      guest_capability(:linux, :read_uid) do
-        require_relative "guests/linux/cap/read_user_ids"
-        GuestLinux::Cap::ReadUserIDs
-      end
-
-      guest_capability(:linux, :read_gid) do
-        require_relative "guests/linux/cap/read_user_ids"
-        GuestLinux::Cap::ReadUserIDs
-      end
-
-      host_capability("bsd", "nfs_mount") do
-        require_relative "hosts/bsd/cap/mount_nfs"
-        HostBSD::Cap::MountNFS
-      end
-
-      host_capability("bsd", "nfs_unmount") do
-        require_relative "hosts/bsd/cap/unmount_nfs"
-        HostBSD::Cap::UnmountNFS
-      end
-
-      host_capability(:linux, "nfs_mount") do
-        require_relative "hosts/linux/cap/mount_nfs"
-        HostLinux::Cap::MountNFS
-      end
-
-      host_capability(:linux, "nfs_unmount") do
-        require_relative "hosts/linux/cap/unmount_nfs"
-        HostLinux::Cap::UnmountNFS
-      end
-
       action_hook(:nfs_guest, :machine_action_up) do |hook|
         require_relative "action/prepare_nfs_guest_settings"
         hook.after(

data/lib/vagrant-nfs_guest/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SyncedFolderNFSGuest
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/templates/locales/en.yml

@@ -10,6 +10,7 @@ en:
       linux:
         nfs_export: "Preparing to edit /etc/exports on the guest..."
         nfs_server_installing: "Installing nfs server on the guest..."
+        nfs_setup_firewall: "Setup firewall on the guest to allow NFS exports..."
 
     errors:
       nfs_update_exports_failed: |-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nfs_guest
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Alan Garfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -59,13 +60,20 @@ files:
 - lib/vagrant-nfs_guest/config.rb
 - lib/vagrant-nfs_guest/errors.rb
 - lib/vagrant-nfs_guest/guests/debian/cap/nfs_server.rb
-- lib/vagrant-nfs_guest/guests/linux/cap/nfs_export.rb
+- lib/vagrant-nfs_guest/guests/debian/plugin.rb
+- lib/vagrant-nfs_guest/guests/linux/cap/nfs_server.rb
 - lib/vagrant-nfs_guest/guests/linux/cap/read_user_ids.rb
+- lib/vagrant-nfs_guest/guests/linux/plugin.rb
+- lib/vagrant-nfs_guest/guests/redhat/cap/nfs_server.rb
+- lib/vagrant-nfs_guest/guests/redhat/plugin.rb
 - lib/vagrant-nfs_guest/guests/ubuntu/cap/nfs_server.rb
+- lib/vagrant-nfs_guest/guests/ubuntu/plugin.rb
 - lib/vagrant-nfs_guest/hosts/bsd/cap/mount_nfs.rb
 - lib/vagrant-nfs_guest/hosts/bsd/cap/unmount_nfs.rb
+- lib/vagrant-nfs_guest/hosts/bsd/plugin.rb
 - lib/vagrant-nfs_guest/hosts/linux/cap/mount_nfs.rb
 - lib/vagrant-nfs_guest/hosts/linux/cap/unmount_nfs.rb
+- lib/vagrant-nfs_guest/hosts/linux/plugin.rb
 - lib/vagrant-nfs_guest/plugin.rb
 - lib/vagrant-nfs_guest/synced_folder.rb
 - lib/vagrant-nfs_guest/version.rb
@@ -92,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Adds support for guest nfs exporting of synced folders