updates

2 files changed, 67 insertions, 2 deletions

diff --git a/vpn/Vagrantfile b/vpn/Vagrantfile
index fd7e38a..1c52fae 100644
--- a/vpn/Vagrantfile
+++ b/vpn/Vagrantfile
@@ -25,8 +25,8 @@ Vagrant.configure('2') do |config|
   config.vm.provider 'libvirt' do |libvirt|
     libvirt.default_prefix = 'vpn-'
     libvirt.driver = 'kvm'
-    libvirt.memory = '256'
-    libvirt.cpus = 2
+    libvirt.memory = '128'
+    libvirt.cpus = 1
     libvirt.sound_type = nil
     libvirt.qemuargs value: '-nographic'
     libvirt.qemuargs value: '-nodefaults'
diff --git a/vpn3/Vagrantfile b/vpn3/Vagrantfile
new file mode 100644
index 0000000..2bd91c7
--- /dev/null
+++ b/vpn3/Vagrantfile
@@ -0,0 +1,65 @@
+# 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/alpine319'
+  config.vm.box_version = '4.3.12'
+  config.vm.box_check_update = false
+  config.vm.hostname = 'virt-vpn3'
+
+  # 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 './share', '/home/vagrant/nfs', type: 'nfs', nfs_version: 4, nfs_udp: false
+
+  config.vm.provider 'libvirt' do |libvirt|
+    libvirt.default_prefix = 'vpn3-'
+    libvirt.driver = 'kvm'
+    libvirt.memory = '128'
+    libvirt.cpus = 1
+    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 'update', type: 'shell', name: 'update', inline: <<-SHELL
+  set -ex
+  sudo apk add openvpn nfs-utils
+  mkdir -p /vagrant && \
+    sudo mount -t nfs 192.168.121.1:/home/devi/share/nfs /vagrant
+  SHELL
+
+  config.vm.provision 'update-root', type: 'shell', name: 'update-root', privileged: true, inline: <<-SHELL2
+  set -ex
+  echo tun >> /etc/modules
+  #rc-update add openvpn default
+  mkdir -p /tmp/mullvad/ && \
+    cp /vagrant/mullvad_openvpn_linux_se_got.zip /tmp/mullvad/ && \
+    cd /tmp/mullvad && \
+    unzip mullvad_openvpn_linux_se_got.zip && \
+    mv mullvad_config_linux_se_got/mullvad_se_got.conf /etc/openvpn/openvpn.conf && \
+    mv mullvad_config_linux_se_got/mullvad_userpass.txt /etc/openvpn/ && \
+    mv mullvad_config_linux_se_got/mullvad_ca.crt /etc/openvpn/ && \
+    mv mullvad_config_linux_se_got/update-resolv-conf /etc/openvpn && \
+    chmod 755 /etc/openvpn/update-resolv-conf
+  modprobe tun
+  echo "net.ipv4.ip_forward = 1" >> /etc/sysctl.d/ipv4.conf
+  sysctl -p /etc/sysctl.d/ipv4.conf
+  rc-service openvpn start || true
+  sleep 1
+  SHELL2
+end