updates

1 files changed, 29 insertions, 7 deletions

diff --git a/vpn/Vagrantfile b/vpn/Vagrantfile
index c3135c7..fd7e38a 100644
--- a/vpn/Vagrantfile
+++ b/vpn/Vagrantfile
@@ -4,8 +4,8 @@
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'libvirt'
 Vagrant.require_version '>= 2.2.6'
 Vagrant.configure('2') do |config|
-  config.vm.box = 'generic/alpine318'
-  config.vm.box_version = '4.3.2'
+  config.vm.box = 'generic/alpine319'
+  config.vm.box_version = '4.3.12'
   config.vm.box_check_update = false
   config.vm.hostname = 'virt-vpn'
 
@@ -20,13 +20,13 @@ Vagrant.configure('2') do |config|
   config.ssh.connect_timeout = 15
 
   # shares
-  config.vm.synced_folder './share', '/home/vagrant/nfs', type: 'nfs', nfs_version: 4, nfs_udp: false
+  # 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 = 'vpn-'
     libvirt.driver = 'kvm'
-    libvirt.memory = '128'
-    libvirt.cpus = 1
+    libvirt.memory = '256'
+    libvirt.cpus = 2
     libvirt.sound_type = nil
     libvirt.qemuargs value: '-nographic'
     libvirt.qemuargs value: '-nodefaults'
@@ -37,7 +37,29 @@ Vagrant.configure('2') do |config|
   end
 
   config.vm.provision 'update', type: 'shell', name: 'update', inline: <<-SHELL
-    sudo apk add openvpn tmux
-    sudo modprobe tun
+    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_fi_hel.zip /tmp/mullvad/ && \
+      cd /tmp/mullvad && \
+      unzip mullvad_openvpn_linux_fi_hel.zip && \
+      mv mullvad_config_linux_fi_hel/mullvad_fi_hel.conf /etc/openvpn/openvpn.conf && \
+      mv mullvad_config_linux_fi_hel/mullvad_userpass.txt /etc/openvpn/ && \
+      mv mullvad_config_linux_fi_hel/mullvad_ca.crt /etc/openvpn/ && \
+      mv mullvad_config_linux_fi_hel/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