From b071c37f8c6157669c8ce024bb9b9d1b7e6387af Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Sat, 30 Dec 2023 00:29:13 -0500 Subject: updates --- dispffox/Vagrantfile | 1 + ephemeral/Vagrantfile | 19 ++++++------ kali/Vagrantfile | 12 +++++--- kicksecure/Vagrantfile | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ netbsd9/Vagrantfile | 6 ++-- openbsd/Vagrantfile | 5 +-- tiny/Vagrantfile | 12 +++----- 7 files changed, 112 insertions(+), 25 deletions(-) create mode 100644 kicksecure/Vagrantfile diff --git a/dispffox/Vagrantfile b/dispffox/Vagrantfile index e067396..0d8ebed 100644 --- a/dispffox/Vagrantfile +++ b/dispffox/Vagrantfile @@ -25,6 +25,7 @@ Vagrant.configure('2') do |config| # config.vagrant.plugins = ['vagrant-reload', { 'vagrant-libvirt' => { 'version' => '^0.6.2' } }] config.vm.provider 'libvirt' do |libvirt| + # libvirt.storage_pool_name = 'zpool' libvirt.default_prefix = 'dispffox-' libvirt.driver = 'kvm' libvirt.memory = '4096' diff --git a/ephemeral/Vagrantfile b/ephemeral/Vagrantfile index f7a5f84..cb46090 100644 --- a/ephemeral/Vagrantfile +++ b/ephemeral/Vagrantfile @@ -5,15 +5,16 @@ ENV['VAGRANT_DEFAULT_PROVIDER'] = 'libvirt' # Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com') Vagrant.require_version '>= 2.2.6' Vagrant.configure('2') do |config| - config.vm.box = 'generic/alpine316' - config.vm.box_version = '4.0.2' + config.vm.box = 'generic/alpine317' + # config.vm.box_version = '4.0.2' + config.vm.box_version = '4.2.14' config.vm.box_check_update = false config.vm.hostname = 'virt-ephemeral' - if Vagrant.has_plugin?('vagrant-proxyconf') - config.proxy.http = 'socks5://192.168.1.103:9995' - config.proxy.https = 'socks5://192.168.1.103:9995' - end + # if Vagrant.has_plugin?('vagrant-proxyconf') + # config.proxy.http = 'socks5://192.168.1.103:9995' + # config.proxy.https = 'socks5://192.168.1.103:9995' + # end # ssh config.ssh.insert_key = true @@ -23,12 +24,12 @@ Vagrant.configure('2') do |config| # timeouts config.vm.boot_timeout = 300 config.vm.graceful_halt_timeout = 60 - config.ssh.connect_timeout = 15 + config.ssh.connect_timeout = 30 # 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.vagrant.plugins = ['vagrant-reload', { 'vagrant-libvirt' => { 'version' => '^0.6.2' } }] config.vm.provider 'libvirt' do |libvirt| libvirt.storage_pool_name = 'ramdisk' diff --git a/kali/Vagrantfile b/kali/Vagrantfile index aed10af..fa028e6 100644 --- a/kali/Vagrantfile +++ b/kali/Vagrantfile @@ -5,10 +5,11 @@ ENV['VAGRANT_DEFAULT_PROVIDER'] = 'libvirt' Vagrant.require_version '>= 2.2.6' Vagrant.configure('2') do |config| config.vm.box = 'kalilinux/rolling' - config.vm.box_version = '2022.4.0' + config.vm.box_version = '2023.4.0' config.vm.box_check_update = false config.vm.hostname = 'virt-kali' + # ssh config.ssh.insert_key = true config.ssh.keep_alive = true @@ -22,19 +23,20 @@ Vagrant.configure('2') do |config| # 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.vagrant.plugins = ['vagrant-reload', { 'vagrant-libvirt' => { 'version' => '^0.6.2' } }] config.vm.provider 'libvirt' do |libvirt| libvirt.default_prefix = 'kali-' libvirt.driver = 'kvm' - libvirt.memory = '3072' - libvirt.cpus = 3 + libvirt.memory = '4096' + libvirt.cpus = 4 libvirt.sound_type = nil libvirt.qemuargs value: '-nographic' libvirt.qemuargs value: '-nodefaults' libvirt.qemuargs value: '-no-user-config' libvirt.qemuargs value: '-serial' libvirt.qemuargs value: 'pty' - # libvirt.usb :vendor => '0x2357', :product => '0x010c' + libvirt.usb_controller :model => "qemu-xhci" + # libvirt.usb :vendor => '0x0bda', :product => '0x2838' end end diff --git a/kicksecure/Vagrantfile b/kicksecure/Vagrantfile new file mode 100644 index 0000000..549a392 --- /dev/null +++ b/kicksecure/Vagrantfile @@ -0,0 +1,82 @@ +# 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/debian12' + config.vm.box_version = '4.3.8' + config.vm.box_check_update = false + config.vm.hostname = 'virt-kick' + + # 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 + + 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 + + # shares + # config.vm.synced_folder '.', '/vagrant', type: 'nfs', nfs_version: 4, nfs_udp: false + + config.vm.provider 'libvirt' do |libvirt| + libvirt.default_prefix = 'kick-' + libvirt.driver = 'kvm' + libvirt.memory = '512' + libvirt.cpus = 2 + libvirt.sound_type = nil + libvirt.qemuargs value: '-nographic' + libvirt.qemuargs value: '-nodefaults' + libvirt.qemuargs value: '-no-user-config' + libvirt.qemuargs value: '-serial' + libvirt.qemuargs value: 'pty' + libvirt.random model: 'random' + end + + config.vm.provision 'kicksecure-pre-install', type: 'shell', name: 'kicksecure-pre-install', inline: <<-SHELL + set -ex + export DEBIAN_FRONTEND=noninteractive + sudo apt update && sudo -E apt upgrade -y && \ + sudo -E apt full-upgrade -y && \ + sudo -E apt install --no-install-recommends -y sudo adduser extrepo apt-transport-tor tor + sudo adduser user + sudo addgroup --system console + sudo usermod -aG console user + sudo usermod -aG sudo user + sudo extrepo enable kicksecure + sudo apt update + SHELL + + config.vm.provision 'privileged', type: 'shell', name: 'privileged', privileged: true , inline: <<-SHELL + set -ex + echo tor+http://deb.w5j6stm77zs6652pgsij4awcjeel3eco7kvipheu6mtr623eyyehj4yd.onion >> /etc/apt/sources.list.d/extrepo_kicksecure.sources + SHELL + + config.vm.provision 'kicksecure-install', type: 'shell', name: 'kicksecure-install', inline: <<-SHELL + set -ex + sudo DEBIAN_FRONTEND=noninteractive apt install -y kicksecure-cli-vm + sudo extrepo disable kicksecure + SHELL + + + config.vm.provision 'privileged', type: 'shell', name: 'privileged', privileged: true , inline: <<-SHELL + set -ex + echo deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian bullseye main contrib non-free > /etc/apt/sources.list.d/debian.list + echo deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian bullseye-updates main contrib non-free >> /etc/apt/sources.list.d/debian.list + echo deb tor+http://5ajw6aqf3ep7sijnscdzw77t7xq4xjpsy335yb2wiwgouo7yfxtjlmid.onion/debian-security bullseye-security main contrib non-free >> /etc/apt/sources.list.d/debian.list + echo deb tor+http://2s4yqjx5ul6okpp3f2gaunr2syex5jgbfpfvhxxbbjwnrsvbk5v3qbid.onion/debian bullseye-backports main contrib non-free >> /etc/apt/sources.list.d/debian.list + apt update && apt full-upgrade -y + SHELL + + config.vm.provision 'kicksecure-install', type: 'shell', name: 'kicksecure-install', inline: <<-SHELL + set -ex + sudo apt install -y tmux vim w3m curl wget + SHELL +end diff --git a/netbsd9/Vagrantfile b/netbsd9/Vagrantfile index 274450f..f02c9fc 100644 --- a/netbsd9/Vagrantfile +++ b/netbsd9/Vagrantfile @@ -3,8 +3,8 @@ ENV['VAGRANT_DEFAULT_PROVIDER'] = 'libvirt' MOUNT_POINT = '/home/vagrant/ff' -CPU_COUNT = 1 -MEMORY = 1024 +CPU_COUNT = 2 +MEMORY = 128 Vagrant.require_version '>= 2.2.6' Vagrant.configure('2') do |config| @@ -31,6 +31,8 @@ Vagrant.configure('2') do |config| libvirt.qemuargs value: '-nographic' libvirt.qemuargs value: '-nodefaults' libvirt.qemuargs value: '-no-user-config' + libvirt.qemuargs value: '-serial' + libvirt.qemuargs value: 'pty' libvirt.sound_type = nil libvirt.cpus = CPU_COUNT libvirt.memory = MEMORY diff --git a/openbsd/Vagrantfile b/openbsd/Vagrantfile index 032575a..0493e28 100644 --- a/openbsd/Vagrantfile +++ b/openbsd/Vagrantfile @@ -9,7 +9,8 @@ MEMORY = 128 Vagrant.require_version '>= 2.2.6' Vagrant.configure('2') do |config| config.vm.box = 'generic/openbsd7' - config.vm.box_version = '3.6.10' + # config.vm.box_version = '3.6.10' + config.vm.box_version = '4.3.8' config.vm.box_check_update = false config.vm.synced_folder './', MOUNT_POINT, type: 'nfs', nfs_version: 3, nfs_udp: false, disabled: true config.vm.hostname = 'openbsd7' @@ -17,7 +18,7 @@ Vagrant.configure('2') do |config| config.vm.graceful_halt_timeout = 45 # CFLAGS="-I/opt/vagrant/embedded/include/ruby-3.0.0/ruby" vagrant plugin install vagrant-libvirt - config.vagrant.plugins = [{ 'vagrant-libvirt' => { 'version' => '^0.6.2' } }] + # config.vagrant.plugins = [{ 'vagrant-libvirt' => { 'version' => '^0.6.2' } }] config.vm.provider 'libvirt' do |libvirt| libvirt.default_prefix = 'openbsd7-' diff --git a/tiny/Vagrantfile b/tiny/Vagrantfile index cc39273..130f9dc 100644 --- a/tiny/Vagrantfile +++ b/tiny/Vagrantfile @@ -26,9 +26,7 @@ Vagrant.configure('2') do |config| 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.synced_folder '.', '/vagrant', type: 'nfs', nfs_version: 4, nfs_udp: false config.vm.provider 'libvirt' do |libvirt| libvirt.default_prefix = 'tiny-' @@ -44,8 +42,8 @@ Vagrant.configure('2') do |config| libvirt.random model: 'random' end - config.vm.provision 'update-upgrade', type: 'shell', name: 'update-upgrade', inline: <<-SHELL - sudo apk update && sudo apk upgrade - sudo apk add torsocks irssi tmux - SHELL + # config.vm.provision 'update-upgrade', type: 'shell', name: 'update-upgrade', inline: <<-SHELL + # sudo apk update && sudo apk upgrade + # sudo apk add torsocks irssi tmux + # SHELL end -- cgit v1.2.3