From 72b51ac59416540157c66b45996790d308553a78 Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Sun, 1 Apr 2018 12:59:58 -0700 Subject: [PATCH 01/16] spacing --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 074c983..c5f6559 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ brew cask install virtualbox vagrant sudo apt -y install virtualbox vagrant ``` +--- ### [`imperialspeculate`](https://github.com/stationgroup/vagrant-labs/tree/master/imperialspeculate) @@ -27,6 +28,8 @@ 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 | From ad6047ec76b287a466c68436948428af80e129be Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Sun, 1 Apr 2018 13:06:01 -0700 Subject: [PATCH 02/16] Install instructions --- imperialspeculate/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/imperialspeculate/README.md b/imperialspeculate/README.md index 284debc..c9d517e 100644 --- a/imperialspeculate/README.md +++ b/imperialspeculate/README.md @@ -2,6 +2,8 @@ ## Requirements +#### [How do I install Vagrant?](../README.md) + Name | Box | CPU | RAM | Disk | ---------|------------------------------|-----|-------|--------| ubuntu1 | ubuntu/xenial64 | 1 | 1GB | 10GB* | From 527f9b9a8cbc4e44164077a9a7231d6e94588f6f Mon Sep 17 00:00:00 2001 From: Serge van Ginderachter Date: Thu, 19 Apr 2018 14:22:43 +0200 Subject: [PATCH 03/16] workaround for not working redirect downloading Vagrant image See hashicorp/vagrant#9442 --- imperialspeculate/Vagrantfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/imperialspeculate/Vagrantfile b/imperialspeculate/Vagrantfile index ab03cc9..7646142 100644 --- a/imperialspeculate/Vagrantfile +++ b/imperialspeculate/Vagrantfile @@ -1,6 +1,9 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +# https://github.com/hashicorp/vagrant/issues/9442#issuecomment-363080565 +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 From d6beed1fcff04b7064f5b85bbeb72913848dfdcc Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Thu, 19 Apr 2018 11:53:57 -0700 Subject: [PATCH 04/16] update to Ubuntu 18.04 (Bionic) --- imperialspeculate/Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imperialspeculate/Vagrantfile b/imperialspeculate/Vagrantfile index ab03cc9..f7c2999 100644 --- a/imperialspeculate/Vagrantfile +++ b/imperialspeculate/Vagrantfile @@ -20,13 +20,13 @@ Vagrant.configure("2") do |config| end config.vm.define "ubuntu3" do |ubuntu3| - ubuntu3.vm.box = "ubuntu/xenial64" + ubuntu3.vm.box = "ubuntu/bionic64" 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/xenial64" + ubuntu4.vm.box = "ubuntu/bionic64" ubuntu4.vm.hostname = "ubuntu4" ubuntu4.vm.network "private_network", ip: "192.168.33.140" end From ff8eea9e8c83cb2eb6bea17f8beeeefa8220ddc8 Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Thu, 19 Apr 2018 11:54:27 -0700 Subject: [PATCH 05/16] update to Ubuntu 18.04 (Bionic) --- imperialspeculate/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imperialspeculate/README.md b/imperialspeculate/README.md index c9d517e..aeeaa1b 100644 --- a/imperialspeculate/README.md +++ b/imperialspeculate/README.md @@ -8,8 +8,8 @@ Name | Box | CPU | RAM | Disk | ---------|------------------------------|-----|-------|--------| ubuntu1 | ubuntu/xenial64 | 1 | 1GB | 10GB* | ubuntu2 | ubuntu/xenial64 | 1 | 1GB | 10GB* | -ubuntu3 | ubuntu/xenial64             | 1   | 1GB | 10GB* | -ubuntu4 | ubuntu/xenial64 | 1 | 1GB | 10GB* | +ubuntu3 | ubuntu/bionic64             | 1   | 1GB | 10GB* | +ubuntu4 | ubuntu/bionic64 | 1 | 1GB | 10GB* | freebsd5 | freebsd/FreeBSD-11.1-RELEASE | 1 | 512MB | 21GB* | freebsd6 | freebsd/FreeBSD-11.1-RELEASE | 1 | 512MB | 21GB* | From dc574b57160a97b783f4204646f72947157534c9 Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Thu, 19 Apr 2018 11:57:53 -0700 Subject: [PATCH 06/16] Upgrade to Ubuntu 18.04 (Bionic) --- offspringidea/Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offspringidea/Vagrantfile b/offspringidea/Vagrantfile index 0b64108..fb1d313 100644 --- a/offspringidea/Vagrantfile +++ b/offspringidea/Vagrantfile @@ -26,7 +26,7 @@ Vagrant.configure("2") do |config| end config.vm.define "ubuntu3" do |ubuntu3| - ubuntu3.vm.box = "ubuntu/xenial64" + ubuntu3.vm.box = "ubuntu/bionic64" ubuntu3.vm.hostname = "ubuntu3" ubuntu3.vm.network "private_network", ip: "192.168.33.130" end From f971a2e717234fa85dac3898bc7d0eebf8ac3fb9 Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Thu, 19 Apr 2018 11:58:24 -0700 Subject: [PATCH 07/16] Upgrade to Ubuntu 18.04 (Bionic) --- offspringidea/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offspringidea/README.md b/offspringidea/README.md index 229b6fa..acd2db7 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/xenial64 | 1 | 1GB | 10GB* | +ubuntu3 | ubuntu/bionic64 | 1 | 1GB | 10GB* | ###### _*Disk size shown is the maximum capacity. Disk grows with usage. ~1GB of disk space required per OS install._ From 9e59e2893ef9fc47d34165f7b83ec55f921ca609 Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Thu, 19 Apr 2018 12:00:49 -0700 Subject: [PATCH 08/16] Upgrade to Ubuntu 18.04 (Bionic) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c5f6559..3a7b02c 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ Name | Box | CPU | RAM | Disk | ---------|------------------------------|-----|-------|--------| ubuntu1 | ubuntu/xenial64             | 1   | 1GB | 10GB* | ubuntu2 | ubuntu/xenial64             | 1   | 1GB | 10GB* | -ubuntu3 | ubuntu/xenial64 | 1 | 1GB | 10GB* | -ubuntu4 | ubuntu/xenial64 | 1 | 1GB | 10GB* | +ubuntu3 | ubuntu/bionic64 | 1 | 1GB | 10GB* | +ubuntu4 | ubuntu/bionic64 | 1 | 1GB | 10GB* | freebsd5 | freebsd/FreeBSD-11.1-RELEASE | 1 | 512MB | 21GB* | freebsd6 | freebsd/FreeBSD-11.1-RELEASE | 1 | 512MB | 21GB* | @@ -36,7 +36,7 @@ Name | Box | CPU | RAM | Disk | --------|-----------------|-----|-----|--------| ubuntu1 | ubuntu/xenial64 | 1 | 1GB | 10GB* | ubuntu2 | ubuntu/xenial64 | 1 | 4GB | 120GB* | -ubuntu3 | ubuntu/xenial64 | 1 | 1GB | 10GB* | +ubuntu3 | ubuntu/bionic64 | 1 | 1GB | 10GB* | --- ###### _*Disk size shown is the maximum capacity. Disk grows with usage. ~1GB of disk space required per OS install._ From 4f6c832f6cb812535ddaa2e8aa2e977b5b0941b6 Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Sun, 22 Apr 2018 14:02:47 -0700 Subject: [PATCH 09/16] Create README.md --- candlemajor/README.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 candlemajor/README.md diff --git a/candlemajor/README.md b/candlemajor/README.md new file mode 100644 index 0000000..bf499bc --- /dev/null +++ b/candlemajor/README.md @@ -0,0 +1,31 @@ +# 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 | 1GB | 60GB* | +freebsd2 | punktde/freebsd-111-zfs | 1 | 1GB | 60GB* | +freebsd3 | punktde/freebsd-111-zfs | 1 | 1GB | 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 +``` From 617f353a23c476b28e56601b40a9215a65717662 Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Sun, 22 Apr 2018 14:07:02 -0700 Subject: [PATCH 10/16] Create Vagrantfile --- candlemajor/Vagrantfile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 candlemajor/Vagrantfile diff --git a/candlemajor/Vagrantfile b/candlemajor/Vagrantfile new file mode 100644 index 0000000..ee82854 --- /dev/null +++ b/candlemajor/Vagrantfile @@ -0,0 +1,27 @@ +# -*- 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 |ubuntu1| + 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 |ubuntu2| + 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 From 0d26147120787413796d187974829993ba0fa5df Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Sun, 22 Apr 2018 14:24:50 -0700 Subject: [PATCH 11/16] fix copy and paste error --- candlemajor/Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/candlemajor/Vagrantfile b/candlemajor/Vagrantfile index ee82854..812ced8 100644 --- a/candlemajor/Vagrantfile +++ b/candlemajor/Vagrantfile @@ -7,13 +7,13 @@ # you're doing. Vagrant.configure("2") do |config| - config.vm.define "freebsd1" do |ubuntu1| + 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 |ubuntu2| + 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" From e6fd2688cdbd4e6dbde8f89f777096ec5b9d1fa1 Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Sun, 22 Apr 2018 15:08:54 -0700 Subject: [PATCH 12/16] up RAM usage --- candlemajor/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/candlemajor/README.md b/candlemajor/README.md index bf499bc..25cab03 100644 --- a/candlemajor/README.md +++ b/candlemajor/README.md @@ -14,11 +14,11 @@ FreeBSD box we use for our internal development. Apart from FreeBSD 11 and the V ## Requirements -Name | Box | CPU | RAM | Disk | ----------|-------------------------|-----|-----|--------| -freebsd1 | punktde/freebsd-111-zfs | 1 | 1GB | 60GB* | -freebsd2 | punktde/freebsd-111-zfs | 1 | 1GB | 60GB* | -freebsd3 | punktde/freebsd-111-zfs | 1 | 1GB | 60GB* | +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._ From f61f04ba14f86d1a32ab02bc4f05baae58de7a24 Mon Sep 17 00:00:00 2001 From: Serge van Ginderachter Date: Fri, 11 May 2018 16:36:09 +0200 Subject: [PATCH 13/16] Increment IP address for freebsd6 node Had the same address as freebsd5 --- imperialspeculate/Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imperialspeculate/Vagrantfile b/imperialspeculate/Vagrantfile index 3a85c00..b0f5262 100644 --- a/imperialspeculate/Vagrantfile +++ b/imperialspeculate/Vagrantfile @@ -47,7 +47,7 @@ Vagrant.configure("2") do |config| 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.150" + freebsd6.vm.network "private_network", ip: "192.168.33.160" freebsd6.ssh.shell = "sh" freebsd6.vm.base_mac = "080027D14C66" end From 01baf3d0ec25ffe27990bf9e97cfeae3a323a9f1 Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Fri, 11 May 2018 13:10:09 -0700 Subject: [PATCH 14/16] comment out vagrantcloud workaround Making PR https://github.com/stationgroup/vagrant-labs/pull/2 an optional comment for @srgvg. --- imperialspeculate/Vagrantfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/imperialspeculate/Vagrantfile b/imperialspeculate/Vagrantfile index b0f5262..51fed36 100644 --- a/imperialspeculate/Vagrantfile +++ b/imperialspeculate/Vagrantfile @@ -2,7 +2,8 @@ # vi: set ft=ruby : # https://github.com/hashicorp/vagrant/issues/9442#issuecomment-363080565 -Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com') +# 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 From 2f535abcde8a2e6e813ff29054f7972007937d35 Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Fri, 11 May 2018 17:53:22 -0700 Subject: [PATCH 15/16] fix for error from srgvg https://github.com/stationgroup/ansible-experiments/pull/3 --- imperialspeculate/Vagrantfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/imperialspeculate/Vagrantfile b/imperialspeculate/Vagrantfile index 51fed36..42b1757 100644 --- a/imperialspeculate/Vagrantfile +++ b/imperialspeculate/Vagrantfile @@ -42,6 +42,7 @@ 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| @@ -51,5 +52,6 @@ Vagrant.configure("2") do |config| freebsd6.vm.network "private_network", ip: "192.168.33.160" freebsd6.ssh.shell = "sh" freebsd6.vm.base_mac = "080027D14C66" + freebsd6.vm.synced_folder ".", "/vagrant", type: "rsync" end end From 8b4df060021a982bc275b03f1202041c54f42fa4 Mon Sep 17 00:00:00 2001 From: Bryan Black Date: Mon, 20 Aug 2018 15:47:42 -0700 Subject: [PATCH 16/16] fix 'undefined variable' --- offspringidea/Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offspringidea/Vagrantfile b/offspringidea/Vagrantfile index fb1d313..8eceeb5 100644 --- a/offspringidea/Vagrantfile +++ b/offspringidea/Vagrantfile @@ -19,7 +19,7 @@ Vagrant.configure("2") do |config| config.disksize.size = "120GB" ubuntu2.vm.network "private_network", ip: "192.168.33.120" - sap.vm.provider "virtualbox" do |vb| + ubuntu2.vm.provider "virtualbox" do |vb| vb.gui = false vb.memory = "4096" end