fox in a box

4 files changed, 78 insertions, 26 deletions

diff --git a/debian11/Vagrantfile b/debian11/Vagrantfile
index 895a264..8ddee49 100644
--- a/debian11/Vagrantfile
+++ b/debian11/Vagrantfile
@@ -22,20 +22,17 @@ Vagrant.configure('2') do |config|
   config.vm.network 'forwarded_port', guest: 7070, host: 7070, protocol: 'tcp', atuo_correct: true
   config.vm.network 'forwarded_port', guest: 4444, host: 4444, protocol: 'tcp', atuo_correct: true
   config.vm.network 'forwarded_port', guest: 4447, host: 4447, protocol: 'tcp', atuo_correct: true
-  # config.vm.network 'forwarded_port', guest: 7070, host: 7070, protocol: 'tcp', host_ip: '192.168.1.103'
-  # config.vm.network 'forwarded_port', guest: 4444, host: 4444, protocol: 'tcp', host_ip: '192.168.1.103'
-  # config.vm.network 'forwarded_port', guest: 4447, host: 4447, protocol: 'tcp', host_ip: '192.168.1.103'
 
   # shares
-  config.vm.synced_folder '.', '/vagrant', type: 'nfs', nfs_version: 4, nfs_udp: false
+  # config.vm.synced_folder '.', '/vagrant', type: 'nfs', nfs_version: 4, nfs_udp: false
 
   config.vagrant.plugins = ['vagrant-reload', { 'vagrant-libvirt' => { 'version' => '^0.6.2' } }]
 
   config.vm.provider 'libvirt' do |libvirt|
     libvirt.default_prefix = 'deb11-'
     libvirt.driver = 'kvm'
-    libvirt.memory = '2048'
-    libvirt.cpus = 2
+    libvirt.memory = '512'
+    libvirt.cpus = 1
     libvirt.sound_type = nil
     libvirt.qemuargs value: '-nographic'
     libvirt.qemuargs value: '-nodefaults'
@@ -49,11 +46,11 @@ Vagrant.configure('2') do |config|
     libvirt.random model: 'random'
   end
 
-  # config.vm.provision 'i2p-install', type: 'shell', name: 'i2p-install', inline: <<-SHELL
-  #   export DEBIAN_FRONTEND=noninteractive && \
-  #     sudo apt update && sudo apt upgrade -y && \
-  #     sudo apt install -y firefox-esr
-  #   # sudo apt install -y i2p i2p-router
-  #   # i2prouter start
-  # SHELL
+  config.vm.provision 'i2p-install', type: 'shell', name: 'i2p-install', inline: <<-SHELL
+    export DEBIAN_FRONTEND=noninteractive && \
+      sudo apt update && sudo apt upgrade -y && \
+      sudo apt install -y i2pd
+    sudo systemctl enable i2pd
+    sudo systemctl start i2pd
+  SHELL
 end
diff --git a/dispffox/Vagrantfile b/dispffox/Vagrantfile
new file mode 100644
index 0000000..1ce5af8
--- /dev/null
+++ b/dispffox/Vagrantfile
@@ -0,0 +1,50 @@
+# vi: set ft=ruby :
+# frozen_string_literal: true
+
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'libvirt'
+Vagrant.require_version '>= 2.2.6'
+Vagrant.configure('2') do |config|
+  config.vm.box = 'generic/ubuntu2204'
+  config.vm.box_version = '4.0.0'
+  config.vm.box_check_update = false
+  config.vm.hostname = 'virt-dispffox'
+
+  # ssh
+  config.ssh.insert_key = true
+  config.ssh.keep_alive = true
+  config.ssh.keys_only = true
+
+  # timeouts
+  config.vm.boot_timeout = 300
+  config.vm.graceful_halt_timeout = 60
+  config.ssh.connect_timeout = 15
+
+  # shares
+  # config.vm.synced_folder '.', '/vagrant', type: 'nfs', nfs_version: 4, nfs_udp: false
+
+  # config.vagrant.plugins = ['vagrant-reload', { 'vagrant-libvirt' => { 'version' => '^0.6.2' } }]
+
+  config.vm.provider 'libvirt' do |libvirt|
+    libvirt.default_prefix = 'dispffox-'
+    libvirt.driver = 'kvm'
+    libvirt.memory = '4096'
+    libvirt.cpus = 2
+    libvirt.sound_type = nil
+    # libvirt.qemuargs value: '-nographic'
+    libvirt.qemuargs value: '-nodefaults'
+    libvirt.qemuargs value: '-no-user-config'
+    # libvirt.qemuargs value: '-chardev'
+    # libvirt.qemuargs value: 'serial,path=/dev/ttyS0,id=hostusbserial'
+    # libvirt.qemuargs value: '-chardev'
+    # libvirt.qemuargs value: 'pci-serial,chardev=hostusbserial'
+    libvirt.qemuargs value: '-serial'
+    libvirt.qemuargs value: 'telnet::6621,server,nowait'
+    libvirt.random model: 'random'
+  end
+
+  config.vm.provision 'ffox-install', type: 'shell', name: 'ffox-install', inline: <<-SHELL
+    sudo apt update && sudo apt upgrade -y
+    sudo snap install firefox
+    sudo apt install -y xorg xauth
+  SHELL
+end
diff --git a/i2p/Vagrantfile b/i2p/Vagrantfile
index 268ff7b..d163925 100644
--- a/i2p/Vagrantfile
+++ b/i2p/Vagrantfile
@@ -5,7 +5,7 @@ ENV['VAGRANT_DEFAULT_PROVIDER'] = 'libvirt'
 Vagrant.require_version '>= 2.2.6'
 Vagrant.configure('2') do |config|
   config.vm.box = 'generic/debian10'
-  config.vm.box_version = '3.6.6'
+  config.vm.box_version = '4.0.4'
   config.vm.box_check_update = false
   config.vm.hostname = 'i2ptun'
 
@@ -23,23 +23,23 @@ Vagrant.configure('2') do |config|
   config.vm.synced_folder '.', '/vagrant', type: 'nfs', nfs_version: 4, nfs_udp: false
 
   # network
-  config.vm.network 'forwarded_port', guest: 4444, host: 4444, id: 'i2ptunudp', protocol: 'udp'
-  config.vm.network 'forwarded_port', guest: 4444, host: 4444, id: 'i2ptuntcp', protocol: 'tcp'
-  config.vm.network 'forwarded_port', guest: 4445, host: 4445, id: 'i2ptunhttpsudp', protocol: 'udp'
-  config.vm.network 'forwarded_port', guest: 4445, host: 4445, id: 'i2ptunhttpstcp', protocol: 'tcp'
-  config.vm.network 'forwarded_port', guest: 6668, host: 6668, id: 'i2ptunircudp', protocol: 'udp'
-  config.vm.network 'forwarded_port', guest: 6668, host: 6668, id: 'i2ptunirctcp', protocol: 'tcp'
-  config.vm.network 'forwarded_port', guest: 7654, host: 7654, id: 'i2ptuni2pudp', protocol: 'udp'
-  config.vm.network 'forwarded_port', guest: 7654, host: 7654, id: 'i2ptuni2ptcp', protocol: 'tcp'
-  config.vm.network 'forwarded_port', guest: 7657, host: 7657, id: 'i2ptunadminudp', protocol: 'udp'
-  config.vm.network 'forwarded_port', guest: 7657, host: 7657, id: 'i2ptunadmintcp', protocol: 'tcp'
+  # config.vm.network 'forwarded_port', guest: 4444, host: 4444, id: 'i2ptunudp', protocol: 'udp'
+  # config.vm.network 'forwarded_port', guest: 4444, host: 4444, id: 'i2ptuntcp', protocol: 'tcp'
+  # config.vm.network 'forwarded_port', guest: 4445, host: 4445, id: 'i2ptunhttpsudp', protocol: 'udp'
+  # config.vm.network 'forwarded_port', guest: 4445, host: 4445, id: 'i2ptunhttpstcp', protocol: 'tcp'
+  # config.vm.network 'forwarded_port', guest: 6668, host: 6668, id: 'i2ptunircudp', protocol: 'udp'
+  # config.vm.network 'forwarded_port', guest: 6668, host: 6668, id: 'i2ptunirctcp', protocol: 'tcp'
+  # config.vm.network 'forwarded_port', guest: 7654, host: 7654, id: 'i2ptuni2pudp', protocol: 'udp'
+  # config.vm.network 'forwarded_port', guest: 7654, host: 7654, id: 'i2ptuni2ptcp', protocol: 'tcp'
+  # config.vm.network 'forwarded_port', guest: 7657, host: 7657, id: 'i2ptunadminudp', protocol: 'udp'
+  # config.vm.network 'forwarded_port', guest: 7657, host: 7657, id: 'i2ptunadmintcp', protocol: 'tcp'
 
   config.vagrant.plugins = [{ 'vagrant-libvirt' => { 'version' => '^0.6.2' } }]
 
   config.vm.provider 'libvirt' do |libvirt|
     libvirt.default_prefix = 'i2ptun-'
     libvirt.driver = 'kvm'
-    libvirt.memory = '768'
+    libvirt.memory = '1024'
     libvirt.cpus = 1
     libvirt.sound_type = nil
     libvirt.qemuargs value: '-nographic'
@@ -70,4 +70,9 @@ Vagrant.configure('2') do |config|
     sudo systemctl start i2p
     i2prouter restart
                                          SHELL
+
+  config.vm.provision 'firefox', after: 'i2p-config-copy', type: 'shell', privileged: false, name: 'firefox',
+                                 reboot: false, inline: <<-SHELL
+    sudo apt-get install -y firefox-esr
+                                 SHELL
 end
diff --git a/openbsd/Vagrantfile b/openbsd/Vagrantfile
index 908c552..970bff9 100644
--- a/openbsd/Vagrantfile
+++ b/openbsd/Vagrantfile
@@ -4,7 +4,7 @@
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'libvirt'
 MOUNT_POINT = '/home/vagrant/ff'
 CPU_COUNT = 1
-MEMORY = 1024
+MEMORY = 512
 
 Vagrant.require_version '>= 2.2.6'
 Vagrant.configure('2') do |config|