.gitignore

@@ -1,3 +0,0 @@
-.vagrant
-*.log
-*~

ahoskingit/config.yaml

@@ -1,13 +1,17 @@
 ---
 vagrants:
   "ubuntu/trusty64": "ubuntu/trusty64"
+<<<<<<< HEAD
   "ubuntu/xenial64": "ubuntu/xenial64"
   "boxcutter/ubuntu1604": "boxcutter/ubuntu1604"
+
+=======
+  "boxcutter/ubuntu1604": "boxcutter/ubuntu1604"
+ 
+>>>>>>> dfcfe37cf523476c0bd27c2a0d6e75ab9189654d
 hosts:
     docker: 10.200.200.20
     nextcloud: 10.200.200.2
     grafana: 10.200.200.3
     proxy-home: 10.200.200.4
     dns: 10.200.200.5
-    goals: 10.200.200.7
-    jpscontracting: 10.200.200.8

ahoskingit/goals/Vagrantfile

@@ -1,21 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-
-  config.vm.box = "geerlingguy/ubuntu1604"
-  config.vm.hostname = "goals"
-  playbook = 'django_goals'
-  client = 'ahoskingit'
-  iplookup = 'goals'
-
-  config.vm.provider :virtualbox do |vb|
-    vb.customize ['modifyvm', :id, '--memory', '1024']
-  end
-
-  eval(IO.read("../../vagrant.mixin.rb"), binding)
-
-end

ahoskingit/jps_test/Vagrantfile

@@ -1,20 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-
-  config.vm.box = "geerlingguy/ubuntu1604"
-  config.vm.hostname = "jpscontracting"
-  playbook = 'jpscontracting'
-  client = 'ahoskingit'
-
-  config.vm.provider :virtualbox do |vb|
-    vb.customize ['modifyvm', :id, '--memory', '1024']
-  end
-
-  eval(IO.read("../../vagrant.mixin.rb"), binding)
-
-end

anydesk/config.yaml

@@ -1,8 +0,0 @@
----
-
-vagrants:
-  "debian/jessie64": "debian/jessie64"
-  "debian/stretch64": "debian/stretch64"
-
-hosts:
-  relay: 10.17.17.2

anydesk/relay/Vagrantfile

@@ -1,24 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2" 
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  if Vagrant.has_plugin?("vagrant-cachier")
-      config.cache.scope = :box
-  end 
-
-  config.vm.box = "debian/stretch64"
-  config.vm.hostname = "relay"
-  playbook = 'relay'
-  client = 'anydesk'
-  iplookup = 'relay'
-
-  config.vm.provider :virtualbox do |vb|
-    vb.customize ['modifyvm', :id, '--memory', '1024']
-  end 
-
-  eval(IO.read("../../vagrant.mixin.rb"), binding)
-
-end