Use Vagrant catalog in Freyja VMs, other minor improvements

jowjDev
Micah R Ledbetter 8 years ago
parent d019c436a6
commit 01bb8d568c

@ -1,21 +1,16 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
Vagrant.require_version ">= 1.6.2" Vagrant.require_version ">= 1.6.2"
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.define "vagrant-windows-10" config.vm.define "vagrant_wintriallab-win10-32_template"
config.vm.box = "windows_10_x86_virtualbox.box" config.vm.box = "wintriallab-win10-32"
config.vm.box_url = "file:///E:/Micah/caryatid/wintriallab-win10-32.json"
config.vm.communicator = "winrm" config.vm.communicator = "winrm"
# Admin user name and password
config.winrm.username = "vagrant" config.winrm.username = "vagrant"
config.winrm.password = "V@grant123" config.winrm.password = "V@grant123"
config.vm.guest = :windows config.vm.guest = :windows
config.windows.halt_timeout = 15 config.windows.halt_timeout = 15
config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct: true config.vm.network :forwarded_port, guest: 3389, host: 3390, id: "rdp", auto_correct: true
config.vm.provider :virtualbox do |v, override| config.vm.provider :virtualbox do |v, override|
#v.gui = true #v.gui = true

@ -1,6 +1,3 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
require "date" require "date"
Vagrant.require_version ">= 1.6.2" Vagrant.require_version ">= 1.6.2"
@ -12,14 +9,12 @@ thisVagrantfileDir = File.dirname(__FILE__)
commonScriptsDir = "#{thisVagrantfileDir}/../../scripts" commonScriptsDir = "#{thisVagrantfileDir}/../../scripts"
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.define "FreyjaA-2016-11-02" config.vm.define "FreyjaA-2016-11-22"
config.vm.box = "wintriallab-windows_10_x86" config.vm.box = "wintriallab-win10-32"
config.vm.box_url = "file:///E:/Micah/caryatid/wintriallab-win10-32.json"
config.vm.communicator = "winrm" config.vm.communicator = "winrm"
# Admin user name and password
config.winrm.username = "vagrant" config.winrm.username = "vagrant"
config.winrm.password = "V@grant123" config.winrm.password = "V@grant123"
config.vm.guest = :windows config.vm.guest = :windows
config.windows.halt_timeout = 15 config.windows.halt_timeout = 15
@ -30,6 +25,8 @@ Vagrant.configure("2") do |config|
#config.vm.network :public_network #config.vm.network :public_network
#config.vm.network :public_network, :adapter=>1, type:"dhcp", :bridge=>'Ethernet' #config.vm.network :public_network, :adapter=>1, type:"dhcp", :bridge=>'Ethernet'
config.vm.network :forwarded_port, guest: 3389, host: 3301, id: "rdp", auto_correct: true
config.vm.provider :virtualbox do |v, override| config.vm.provider :virtualbox do |v, override|
#v.gui = true #v.gui = true
v.customize ["modifyvm", :id, "--memory", 3072] v.customize ["modifyvm", :id, "--memory", 3072]
@ -41,16 +38,10 @@ Vagrant.configure("2") do |config|
v.customize ["modifyvm", :id, "--draganddrop", "bidirectional"] v.customize ["modifyvm", :id, "--draganddrop", "bidirectional"]
end end
begin
Dir.mkdir('./synced')
rescue
puts "./synced is already created I guess idk"
end
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.synced_folder "./synced", "/vagrant", create: true
config.vm.synced_folder "#{ENV['USERPROFILE']}\\Documents\\VMShare", "/VMShare", create: true config.vm.synced_folder "#{ENV['USERPROFILE']}\\Documents\\VMShare", "/VMShare", create: true
FileUtils.cp "#{commonScriptsDir}/wintriallab-postinstall.psm1", "./synced/wintriallab-postinstall.psm1"
FileUtils.cp "#{commonScriptsDir}/freyja-provisioner.ps1", "./synced/freyja-provisioner.ps1" FileUtils.cp "#{commonScriptsDir}/wintriallab-postinstall.psm1", "./wintriallab-postinstall.psm1"
FileUtils.cp "#{commonScriptsDir}/freyja-provisioner.ps1", "./freyja-provisioner.ps1"
config.vm.provision "shell", inline: "C:/vagrant/freyja-provisioner.ps1" config.vm.provision "shell", inline: "C:/vagrant/freyja-provisioner.ps1"
end end

@ -1,6 +1,3 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
require "date" require "date"
Vagrant.require_version ">= 1.6.2" Vagrant.require_version ">= 1.6.2"
@ -12,14 +9,12 @@ thisVagrantfileDir = File.dirname(__FILE__)
commonScriptsDir = "#{thisVagrantfileDir}/../../scripts" commonScriptsDir = "#{thisVagrantfileDir}/../../scripts"
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.define "FreyjaB-2016-11-02" config.vm.define "FreyjaB-2016-11-22"
config.vm.box = "wintriallab-windows_10_x86" config.vm.box = "wintriallab-win10-32"
config.vm.box_url = "file:///E:/Micah/caryatid/wintriallab-win10-32.json"
config.vm.communicator = "winrm" config.vm.communicator = "winrm"
# Admin user name and password
config.winrm.username = "vagrant" config.winrm.username = "vagrant"
config.winrm.password = "V@grant123" config.winrm.password = "V@grant123"
config.vm.guest = :windows config.vm.guest = :windows
config.windows.halt_timeout = 15 config.windows.halt_timeout = 15
@ -30,6 +25,8 @@ Vagrant.configure("2") do |config|
#config.vm.network :public_network #config.vm.network :public_network
#config.vm.network :public_network, :adapter=>1, type:"dhcp", :bridge=>'Ethernet' #config.vm.network :public_network, :adapter=>1, type:"dhcp", :bridge=>'Ethernet'
config.vm.network :forwarded_port, guest: 3389, host: 3302, id: "rdp", auto_correct: true
config.vm.provider :virtualbox do |v, override| config.vm.provider :virtualbox do |v, override|
#v.gui = true #v.gui = true
v.customize ["modifyvm", :id, "--memory", 3072] v.customize ["modifyvm", :id, "--memory", 3072]
@ -41,16 +38,10 @@ Vagrant.configure("2") do |config|
v.customize ["modifyvm", :id, "--draganddrop", "bidirectional"] v.customize ["modifyvm", :id, "--draganddrop", "bidirectional"]
end end
begin
Dir.mkdir('./synced')
rescue
puts "./synced is already created I guess idk"
end
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.synced_folder "./synced", "/vagrant", create: true
config.vm.synced_folder "#{ENV['USERPROFILE']}\\Documents\\VMShare", "/VMShare", create: true config.vm.synced_folder "#{ENV['USERPROFILE']}\\Documents\\VMShare", "/VMShare", create: true
FileUtils.cp "#{commonScriptsDir}/wintriallab-postinstall.psm1", "./synced/wintriallab-postinstall.psm1"
FileUtils.cp "#{commonScriptsDir}/freyja-provisioner.ps1", "./synced/freyja-provisioner.ps1" FileUtils.cp "#{commonScriptsDir}/wintriallab-postinstall.psm1", "./wintriallab-postinstall.psm1"
FileUtils.cp "#{commonScriptsDir}/freyja-provisioner.ps1", "./freyja-provisioner.ps1"
config.vm.provision "shell", inline: "C:/vagrant/freyja-provisioner.ps1" config.vm.provision "shell", inline: "C:/vagrant/freyja-provisioner.ps1"
end end

@ -1,6 +1,3 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
require "date" require "date"
Vagrant.require_version ">= 1.6.2" Vagrant.require_version ">= 1.6.2"
@ -12,14 +9,12 @@ thisVagrantfileDir = File.dirname(__FILE__)
commonScriptsDir = "#{thisVagrantfileDir}/../../scripts" commonScriptsDir = "#{thisVagrantfileDir}/../../scripts"
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.define "FreyjaC-2016-11-02" config.vm.define "FreyjaC-2016-11-22"
config.vm.box = "wintriallab-windows_10_x86" config.vm.box = "wintriallab-win10-32"
config.vm.box_url = "file:///E:/Micah/caryatid/wintriallab-win10-32.json"
config.vm.communicator = "winrm" config.vm.communicator = "winrm"
# Admin user name and password
config.winrm.username = "vagrant" config.winrm.username = "vagrant"
config.winrm.password = "V@grant123" config.winrm.password = "V@grant123"
config.vm.guest = :windows config.vm.guest = :windows
config.windows.halt_timeout = 15 config.windows.halt_timeout = 15
@ -30,6 +25,8 @@ Vagrant.configure("2") do |config|
#config.vm.network :public_network #config.vm.network :public_network
#config.vm.network :public_network, :adapter=>1, type:"dhcp", :bridge=>'Ethernet' #config.vm.network :public_network, :adapter=>1, type:"dhcp", :bridge=>'Ethernet'
config.vm.network :forwarded_port, guest: 3389, host: 3303, id: "rdp", auto_correct: true
config.vm.provider :virtualbox do |v, override| config.vm.provider :virtualbox do |v, override|
#v.gui = true #v.gui = true
v.customize ["modifyvm", :id, "--memory", 3072] v.customize ["modifyvm", :id, "--memory", 3072]
@ -41,16 +38,10 @@ Vagrant.configure("2") do |config|
v.customize ["modifyvm", :id, "--draganddrop", "bidirectional"] v.customize ["modifyvm", :id, "--draganddrop", "bidirectional"]
end end
begin
Dir.mkdir('./synced')
rescue
puts "./synced is already created I guess idk"
end
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.synced_folder "./synced", "/vagrant", create: true
config.vm.synced_folder "#{ENV['USERPROFILE']}\\Documents\\VMShare", "/VMShare", create: true config.vm.synced_folder "#{ENV['USERPROFILE']}\\Documents\\VMShare", "/VMShare", create: true
FileUtils.cp "#{commonScriptsDir}/wintriallab-postinstall.psm1", "./synced/wintriallab-postinstall.psm1"
FileUtils.cp "#{commonScriptsDir}/freyja-provisioner.ps1", "./synced/freyja-provisioner.ps1" FileUtils.cp "#{commonScriptsDir}/wintriallab-postinstall.psm1", "./wintriallab-postinstall.psm1"
FileUtils.cp "#{commonScriptsDir}/freyja-provisioner.ps1", "./freyja-provisioner.ps1"
config.vm.provision "shell", inline: "C:/vagrant/freyja-provisioner.ps1" config.vm.provision "shell", inline: "C:/vagrant/freyja-provisioner.ps1"
end end

Loading…
Cancel
Save