vagrant-qubes 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c705377c5a04ced31e884fb0e70dd403b28ec8533808eef7c554b4455768d4a2
-  data.tar.gz: 62c911e38e6c2d74b895dcae2587b0a87d7038f821b24a50354a5cf9c89f36a0
+  metadata.gz: 656c24f67a8c660d43e6218f87dd1c31f87a692f3b2222845b6c1186bdf8a130
+  data.tar.gz: 0bb08f4ca45933ca78c18d08c67366aeb02250be2b1ed75d316c6acc0bf6e91d
 SHA512:
-  metadata.gz: '09261b413e0971e92dd441e96579a50dbe124f3743c637a434d213a7a854e67664ad2efb5afc6ceb47cfb380f48a0563749ea10bdce39be3b66892e59bb2a749'
-  data.tar.gz: 6e4accb9bf2e3aec656f9e1c9b976b227417b08b69841085c3535aa0e00e8582341067c4963e7d42e0eb01081a7b9301fec8f5763882908707ce2919766a0f07
+  metadata.gz: d69a6263b363e7adcd635430014f51a1ee132c99ebcfc5ff3985b6cdf3cfe5bf07a7154e8e5daa646f1d18ff8ec830b9d11433226fca687ff7b6d77fcdf61997
+  data.tar.gz: 42c920d14454329749ff4d099659340306d3def68bcfbacc2af920deb77a88b31d71f2ab7c1e4562c44161c043074b6fcf1d0b398710601b1148472b2396b1e8

data/.gitignore

@@ -7,4 +7,6 @@
 /spec/reports/
 /tmp/
 /Vagrantfile
-/.vagrant/
+/.vagrant/
+/sync/
+Gemfile.lock

data/README.md

@@ -37,7 +37,7 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-Provision etc. does not yet work due to networking configuration needed to enable that.
+Currently, the plugin will insert a firewall rule allowing the NetVM to communicate with the vagrant created machine... this enables provision and "vagrant ssh <name>" etc. to work.
 
 This is not fully thought through or fully secured, use it at your own risk!
 
@@ -49,11 +49,16 @@ Run this in your AppVM
 vagrant plugin install vagrant-qubes
 ```
 
+## Guest networking
+
+Check out https://github.com/gp397/salt-for-vagrant-qubes it has a script that will enable networking between guests.
+
+It requires an ssh server and puppet in the guest template, the salt formula takes care of all of that though.
+
 ## TODO
 
 There is a lot to do, in no particular order:
 - Extend to support Standalone VMs/HVMs
-- Sort out networking, and therefore provisioning
 
 ## Contributing
 

data/lib/vagrant-qubes/action/createvm.rb

@@ -51,6 +51,7 @@ module VagrantPlugins
                 raise Errors::QRExecError,
                       message: 'qrexec failed with status' + status.to_s
               end
+              env[:machine].id = 1
             else
               raise Errors::GeneralError,
                     message: 'guest type ' + config.guest_type + ' is not supported'

data/lib/vagrant-qubes/action.rb

@@ -68,8 +68,8 @@ module VagrantPlugins
             if env1[:result] == 'True'
               b1.use ReadState
               b1.use Provision
-              #b1.use SyncedFolderCleanup
-              #b1.use SyncedFolders
+              b1.use SyncedFolderCleanup
+              b1.use SyncedFolders
               #b1.use SetHostname
             end
           end

data/lib/vagrant-qubes/command.rb

@@ -0,0 +1,34 @@
+require 'optparse'
+
+module VagrantPlugins
+  module Qubes
+    class CapAddress < Vagrant.plugin(2, :command)
+      def self.synopsis
+          "outputs the IP address of a guest."
+      end
+      def execute
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant address [name]"
+        end
+
+        argv = parse_options(opts)
+
+        # Count total number of vms to print the IP
+        totalvms = 0
+        with_target_vms(argv) do
+          totalvms += 1
+        end
+
+        if argv.length == 1 or totalvms == 1
+          with_target_vms(argv, {:single_target=>true}) do |machine|
+            machine.action(:address)
+          end
+        else
+          with_target_vms(argv) do |machine|
+            machine.action(:address_multi)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-qubes/plugin.rb

@@ -20,6 +20,12 @@ module VagrantPlugins
         Provider
       end
 
+      #  Prints the IP address of the guest
+      command('address') do
+        require_relative 'command'
+        CapAddress
+      end
+
       # This initializes the internationalization strings.
       def self.setup_i18n
         require 'pathname'

data/lib/vagrant-qubes/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module Qubes
-    VERSION = "0.0.3"
+    VERSION = "0.0.5"
     $vagrant_qubes_version = VERSION
   end
 end

data/vagrant-qubes.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/vagrant-qubes/version', __FILE__)
 Gem::Specification.new do |spec|
   spec.name          = "vagrant-qubes"
   spec.version       = VagrantPlugins::Qubes::VERSION
-  spec.date          = '2021-06-30'
+  spec.date          = '2023-06-16'
   spec.authors       = ["Gary Pentland"]
   spec.email         = [""]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-qubes
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Gary Pentland
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -62,7 +62,6 @@ files:
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -79,6 +78,7 @@ files:
 - lib/vagrant-qubes/action/read_ssh_info.rb
 - lib/vagrant-qubes/action/read_state.rb
 - lib/vagrant-qubes/action/wait_for_state.rb
+- lib/vagrant-qubes/command.rb
 - lib/vagrant-qubes/config.rb
 - lib/vagrant-qubes/errors.rb
 - lib/vagrant-qubes/plugin.rb
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Vagrant Qubes provider plugin

data/Gemfile.lock

@@ -1,122 +0,0 @@
-GIT
-  remote: https://github.com/hashicorp/vagrant.git
-  revision: 22795b161bf67a4c0ebbe32c9ce8777cb888c4a7
-  specs:
-    vagrant (2.2.11.dev)
-      bcrypt_pbkdf (~> 1.0.0)
-      childprocess (~> 4.0.0)
-      ed25519 (~> 1.2.4)
-      erubi
-      hashicorp-checkpoint (~> 0.1.5)
-      i18n (~> 1.8)
-      listen (~> 3.1)
-      log4r (~> 1.1.9, < 1.1.11)
-      mime (~> 0.4.4)
-      net-scp (~> 1.2.0)
-      net-sftp (~> 3.0)
-      net-ssh (~> 6.0)
-      rb-kqueue (~> 0.2.0)
-      rest-client (>= 1.6.0, < 3.0)
-      ruby_dep (<= 1.3.1)
-      rubyzip (~> 2.0)
-      vagrant_cloud (~> 2.0.3)
-      wdm (~> 0.1.0)
-      winrm (>= 2.3.4, < 3.0)
-      winrm-elevated (>= 1.2.1, < 2.0)
-      winrm-fs (>= 1.3.4, < 2.0)
-
-PATH
-  remote: .
-  specs:
-    vagrant-qubes (0.0.3)
-      i18n (~> 1.0)
-      log4r (~> 1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    bcrypt_pbkdf (1.0.1)
-    builder (3.2.4)
-    childprocess (4.0.0)
-    concurrent-ruby (1.1.9)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    ed25519 (1.2.4)
-    erubi (1.10.0)
-    ffi (1.15.3)
-    gssapi (1.3.1)
-      ffi (>= 1.0.1)
-    gyoku (1.3.1)
-      builder (>= 2.1.2)
-    hashicorp-checkpoint (0.1.5)
-    http-cookie (1.0.4)
-      domain_name (~> 0.5)
-    httpclient (2.8.3)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    listen (3.5.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    little-plugger (1.1.4)
-    log4r (1.1.10)
-    logging (2.3.0)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.14)
-    mime (0.4.4)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    multi_json (1.15.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-sftp (3.0.0)
-      net-ssh (>= 5.0.0, < 7.0.0)
-    net-ssh (6.1.0)
-    netrc (0.11.0)
-    nori (2.6.0)
-    rb-fsevent (0.11.0)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    rb-kqueue (0.2.6)
-      ffi (>= 0.5.0)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    ruby_dep (1.3.1)
-    rubyntlm (0.6.3)
-    rubyzip (2.3.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
-    vagrant_cloud (2.0.3)
-      rest-client (~> 2.0.2)
-    wdm (0.1.1)
-    winrm (2.3.6)
-      builder (>= 2.1.2)
-      erubi (~> 1.8)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.3)
-    winrm-elevated (1.2.3)
-      erubi (~> 1.8)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-    winrm-fs (1.3.5)
-      erubi (~> 1.8)
-      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 2.0)
-      winrm (~> 2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  vagrant!
-  vagrant-qubes!
-
-BUNDLED WITH
-   2.1.4