diff --git a/README.md b/README.md index 3a7b02c..074c983 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ brew cask install virtualbox vagrant sudo apt -y install virtualbox vagrant ``` ---- ### [`imperialspeculate`](https://github.com/stationgroup/vagrant-labs/tree/master/imperialspeculate) @@ -23,20 +22,18 @@ Name | Box | CPU | RAM | Disk | ---------|------------------------------|-----|-------|--------| ubuntu1 | ubuntu/xenial64             | 1   | 1GB | 10GB* | ubuntu2 | ubuntu/xenial64             | 1   | 1GB | 10GB* | -ubuntu3 | ubuntu/bionic64 | 1 | 1GB | 10GB* | -ubuntu4 | ubuntu/bionic64 | 1 | 1GB | 10GB* | +ubuntu3 | ubuntu/xenial64 | 1 | 1GB | 10GB* | +ubuntu4 | ubuntu/xenial64 | 1 | 1GB | 10GB* | freebsd5 | freebsd/FreeBSD-11.1-RELEASE | 1 | 512MB | 21GB* | freebsd6 | freebsd/FreeBSD-11.1-RELEASE | 1 | 512MB | 21GB* | ---- - ### [`offspringidea`](https://github.com/stationgroup/vagrant-labs/tree/master/offspringidea) Name | Box | CPU | RAM | Disk | --------|-----------------|-----|-----|--------| ubuntu1 | ubuntu/xenial64 | 1 | 1GB | 10GB* | ubuntu2 | ubuntu/xenial64 | 1 | 4GB | 120GB* | -ubuntu3 | ubuntu/bionic64 | 1 | 1GB | 10GB* | +ubuntu3 | ubuntu/xenial64 | 1 | 1GB | 10GB* | --- ###### _*Disk size shown is the maximum capacity. Disk grows with usage. ~1GB of disk space required per OS install._ diff --git a/candlemajor/README.md b/candlemajor/README.md deleted file mode 100644 index 25cab03..0000000 --- a/candlemajor/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# Punkt.de FreeBSD Virtual Machine - -## Dependencies & Plugins - -This _Vagrantfile_ is from the German FreeBSD VPS [Punkt.de](https://punkt.de/en). - -[vagrantup.com/punktde](https://app.vagrantup.com/punktde) - -FreeBSD box we use for our internal development. Apart from FreeBSD 11 and the Vagrant environment it contains all the necessary packages to start with Ansible right away, but nothing more. - -* Custom kernel with VIMAGE option (virtual network stack to use with jails). -* Packages: `sudo` `bash` `virtualbox-ose-additions` `python27` `python36` -* 60GB SCSI hdd with ZFS root - -## Requirements - -Name | Box | CPU | RAM | Disk | ----------|-------------------------|-----|-------|--------| -freebsd1 | punktde/freebsd-111-zfs | 1 | 4.2GB | 60GB* | -freebsd2 | punktde/freebsd-111-zfs | 1 | 4.2GB | 60GB* | -freebsd3 | punktde/freebsd-111-zfs | 1 | 4.2GB | 60GB* | - -###### _*Disk size shown is the maximum capacity. Disk grows with usage. ~1GB of disk space required per OS install._ - -## :floppy_disk: Setup and Start - -One-liner: - -``` -mkdir ~/vm-candlemajor ; cd ~/vm-candlemajor && curl -q https://raw.githubusercontent.com/stationgroup/vagrant-labs/master/candlemajor/Vagrantfile -O && vagrant up -``` diff --git a/candlemajor/Vagrantfile b/candlemajor/Vagrantfile deleted file mode 100644 index 812ced8..0000000 --- a/candlemajor/Vagrantfile +++ /dev/null @@ -1,27 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# All Vagrant configuration is done below. The "2" in Vagrant.configure -# configures the configuration version (we support older styles for -# backwards compatibility). Please don't change it unless you know what -# you're doing. -Vagrant.configure("2") do |config| - - config.vm.define "freebsd1" do |freebsd1| - freebsd1.vm.box = "punktde/freebsd-111-zfs" - freebsd1.vm.hostname = "freebsd1" - freebsd1.vm.network "private_network", ip: "192.168.33.110" - end - - config.vm.define "freebsd2" do |freebsd2| - freebsd2.vm.box = "punktde/freebsd-111-zfs" - freebsd2.vm.hostname = "freebsd2" - freebsd2.vm.network "private_network", ip: "192.168.33.120" - end - - config.vm.define "freebsd3" do |freebsd3| - freebsd3.vm.box = "punktde/freebsd-111-zfs" - freebsd3.vm.hostname = "freebsd3" - freebsd3.vm.network "private_network", ip: "192.168.33.130" - end -end diff --git a/imperialspeculate/README.md b/imperialspeculate/README.md index aeeaa1b..284debc 100644 --- a/imperialspeculate/README.md +++ b/imperialspeculate/README.md @@ -2,14 +2,12 @@ ## Requirements -#### [How do I install Vagrant?](../README.md) - Name | Box | CPU | RAM | Disk | ---------|------------------------------|-----|-------|--------| ubuntu1 | ubuntu/xenial64 | 1 | 1GB | 10GB* | ubuntu2 | ubuntu/xenial64 | 1 | 1GB | 10GB* | -ubuntu3 | ubuntu/bionic64             | 1   | 1GB | 10GB* | -ubuntu4 | ubuntu/bionic64 | 1 | 1GB | 10GB* | +ubuntu3 | ubuntu/xenial64             | 1   | 1GB | 10GB* | +ubuntu4 | ubuntu/xenial64 | 1 | 1GB | 10GB* | freebsd5 | freebsd/FreeBSD-11.1-RELEASE | 1 | 512MB | 21GB* | freebsd6 | freebsd/FreeBSD-11.1-RELEASE | 1 | 512MB | 21GB* | diff --git a/imperialspeculate/Vagrantfile b/imperialspeculate/Vagrantfile index 42b1757..ab03cc9 100644 --- a/imperialspeculate/Vagrantfile +++ b/imperialspeculate/Vagrantfile @@ -1,10 +1,6 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -# https://github.com/hashicorp/vagrant/issues/9442#issuecomment-363080565 -# Uncomment below if you need the work around. -# Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com') - # All Vagrant configuration is done below. The "2" in Vagrant.configure # configures the configuration version (we support older styles for # backwards compatibility). Please don't change it unless you know what @@ -24,13 +20,13 @@ Vagrant.configure("2") do |config| end config.vm.define "ubuntu3" do |ubuntu3| - ubuntu3.vm.box = "ubuntu/bionic64" + ubuntu3.vm.box = "ubuntu/xenial64" ubuntu3.vm.hostname = "ubuntu3" ubuntu3.vm.network "private_network", ip: "192.168.33.130" end config.vm.define "ubuntu4" do |ubuntu4| - ubuntu4.vm.box = "ubuntu/bionic64" + ubuntu4.vm.box = "ubuntu/xenial64" ubuntu4.vm.hostname = "ubuntu4" ubuntu4.vm.network "private_network", ip: "192.168.33.140" end @@ -42,16 +38,14 @@ Vagrant.configure("2") do |config| freebsd5.vm.network "private_network", ip: "192.168.33.150" freebsd5.ssh.shell = "sh" freebsd5.vm.base_mac = "080027D14C55" - freebsd5.vm.synced_folder ".", "/vagrant", type: "rsync" end config.vm.define "freebsd6" do |freebsd6| freebsd6.vm.box = "freebsd/FreeBSD-11.1-RELEASE" freebsd6.vm.box_version = "2017.07.21" freebsd6.vm.hostname = "freebsd6" - freebsd6.vm.network "private_network", ip: "192.168.33.160" + freebsd6.vm.network "private_network", ip: "192.168.33.150" freebsd6.ssh.shell = "sh" freebsd6.vm.base_mac = "080027D14C66" - freebsd6.vm.synced_folder ".", "/vagrant", type: "rsync" end end diff --git a/offspringidea/README.md b/offspringidea/README.md index acd2db7..229b6fa 100644 --- a/offspringidea/README.md +++ b/offspringidea/README.md @@ -14,7 +14,7 @@ Name | Box | CPU | RAM | Disk | --------|-----------------|-----|-----|--------| ubuntu1 | ubuntu/xenial64 | 1 | 1GB | 10GB* | ubuntu2 | ubuntu/xenial64 | 1 | 4GB | 120GB* | -ubuntu3 | ubuntu/bionic64 | 1 | 1GB | 10GB* | +ubuntu3 | ubuntu/xenial64 | 1 | 1GB | 10GB* | ###### _*Disk size shown is the maximum capacity. Disk grows with usage. ~1GB of disk space required per OS install._ diff --git a/offspringidea/Vagrantfile b/offspringidea/Vagrantfile index 8eceeb5..0b64108 100644 --- a/offspringidea/Vagrantfile +++ b/offspringidea/Vagrantfile @@ -19,14 +19,14 @@ Vagrant.configure("2") do |config| config.disksize.size = "120GB" ubuntu2.vm.network "private_network", ip: "192.168.33.120" - ubuntu2.vm.provider "virtualbox" do |vb| + sap.vm.provider "virtualbox" do |vb| vb.gui = false vb.memory = "4096" end end config.vm.define "ubuntu3" do |ubuntu3| - ubuntu3.vm.box = "ubuntu/bionic64" + ubuntu3.vm.box = "ubuntu/xenial64" ubuntu3.vm.hostname = "ubuntu3" ubuntu3.vm.network "private_network", ip: "192.168.33.130" end