(*NOTE* run `leap local destroy` before pulling this commit) - removed underscore from node names, since hostname may not contain an underscore (but hyphen is ok).

31 files changed, 720 insertions, 722 deletions

diff --git a/provider/files/nodes/ca1/ca1.crt b/provider/files/nodes/ca1/ca1.crt
new file mode 100644
index 0000000..a75e6dc
--- /dev/null
+++ b/provider/files/nodes/ca1/ca1.crt
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFIDCCAwigAwIBAgIRANB+fZFtU8sHNToyXck+VfgwDQYJKoZIhvcNAQELBQAw
+SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
+GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTEyMTIxNzAwMDAwMFoXDTEz
+MTIxNzAwMDAwMFowGjEYMBYGA1UEAwwPY2ExLmJpdG1hc2submV0MIIBuDANBgkq
+hkiG9w0BAQEFAAOCAaUAMIIBoAKCAZcAyXW8tcRnuC/bxRM5PMmJ7gez8bvAGxhJ
+QEZ+ssO2ntmyekAIwXGiFN08Y/iKh66QZ2eNCN3IOKXiKu0Bvu2fzy29QmOH2Tsv
+tyxLY8/6fzFnLQCqccVsvat+uabPX43Byf1vAhRqH0KXUzTDbnUMJp8UyAhum+V4
+ms0cGYg+kC0vVb1Xh0PlAC8sg+FLIBNvRv6Ze0pWfV0kIXi+needtpHn4eZhhAMB
+8ZhCDXV0v9YWVHofHmNj8zmU1xaSyc+dUhA2nhqFZCqmxO8pqIYZoIa4XYiDewqj
+aYeAyqmZlTYrZahuzcdRphunCY4TLv1w7jRqiy20vYcEdq9kg6rPVyMXIUzCQT/R
+u7qgloRf1eVn9cC9dT/ZlpWvV5CEcTn5rlDeMvkmxEvSqSaSouo3uQSEJJAhWKl0
+GTYHPr+vkeHJaJNwxIiQCFOMNmDJBc9XaO6kuVUekHd6KWsQ0Mbs+0GroY9chopN
+hrayJJ6fl7TIPkOeNJ2/4IqQZjDoB25H5/i7tv8F2zEZIGsXg+aEOsLsTJZzoQID
+AQABo4GaMIGXMB0GA1UdDgQWBBTlcEZPdBBafSNgG1oKwzNZcRgmSjAeBgNVHREE
+FzAVgg1jYTEuYml0bWFzay5phwQKBQUwMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAU
+BggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAWgBS5gYMs
+vayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEAQFmjRoG6sf2OpTv2
+8f3Wq9qMWaAoAkhCjwersoYc7xxxSwsdTTSqfDXArYzRLFzYNyGDZBQ2vEUwG2cG
+Ytr9BW9qIi1m8jcVR/8rXTu8CcL1nANc3EBQd8TIQ0ETSXwCpOPRNN7XgJ4wWrG1
+PrR1kmT188n5rofwpkqj5A1d0lqDbDlb4PDF242Hvt19vro5YvFlqGT0nlru6MJm
+QHI0X11KyFhJ2Pt8LlWXG32uarTGs+XgCNLug5uXPqzfF1Gkwz7hZKQOV0KEbv3n
+J0wVlfIXYsPtiY+E7O/Ax9OMUPY90HlrSyOqCZWlURNTGfy4jnaDV7o0sE8Zu1qf
+k7aFm755ZYgIGa8Ek7lvESxoIo8b47tHuYgJGH1ISQqY1YjmHWCxG8E/03dcycVx
+6v4yO8xA5G970NHf+RUrbWzQpbj4dOfXSMFjcHFmC5OAnRPQcFSo+2G7TVUyxb/2
+65N5pP63bnxHONmCKN1VnRqADMYOsRFfgl7+pzcIz8I3Iirb4JJS14CJC9sjXegX
+7k15+Hm1e3wXVPuIPuPVevpfdebx3qawmH7RqSkMkmFP4wn8aYgjzPalHoS2vDM6
+8oGV+NCzMveH+PMkfaQaAYLwMwinT4VQXf+rjgLbEa8eDrOw/8+kDUwzR1ZaycMP
+CixDR2vdGkxwe9/XYuDB3vFoOZU=
+-----END CERTIFICATE-----
diff --git a/provider/files/nodes/ca1/ca1.key b/provider/files/nodes/ca1/ca1.key
new file mode 100644
index 0000000..f0bc4a2
--- /dev/null
+++ b/provider/files/nodes/ca1/ca1.key
@@ -0,0 +1,41 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/provider/files/nodes/ca1_vagrant/ca1_vagrant_ssh.pub b/provider/files/nodes/ca1/ca1_ssh.pub
index 1188e5e..1188e5e 100644
--- a/provider/files/nodes/ca1_vagrant/ca1_vagrant_ssh.pub
+++ b/provider/files/nodes/ca1/ca1_ssh.pub
diff --git a/provider/files/nodes/ca1_vagrant/ca1_vagrant.crt b/provider/files/nodes/ca1_vagrant/ca1_vagrant.crt
deleted file mode 100644
index f3e4f31..0000000
--- a/provider/files/nodes/ca1_vagrant/ca1_vagrant.crt
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFMDCCAxigAwIBAgIRAIWTs7uEyJH0NrsDFAk3c1QwDQYJKoZIhvcNAQELBQAw
-SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
-GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTEyMTIxMTAwMDAwMFoXDTEz
-MTIxMTAwMDAwMFowIjEgMB4GA1UEAwwXY2ExX3ZhZ3JhbnQuYml0bWFzay5uZXQw
-ggG4MA0GCSqGSIb3DQEBAQUAA4IBpQAwggGgAoIBlwDsTD0bpJZuI0Suqk1b3FZ+
-5SfpjvBJVD0WhyOZNuvHsVDynXou3JpWENnmcBeMdRxhFeQsHxVC9Q9PUyIxrEHU
-L2J0ne7WrzZ7TDs7375vo+uIiL3hBXAmsyHxDwc9Ywb7pPDZRL9Vxj5+xMg5KNwi
-ilJhfbV/uWyPsMKVVoZOxRseRBu+SkhbVKl5PyU9QBR7CJjDzNPXnJmsP9atke8K
-xmFLTRyUcB2AhVyXapaq294jbQrx4RFg3Kx5SH5jHb9p/ChsSjcC2O1J5KYWYvyS
-ZPuQfCzy5TYezFx4EVDxF4KLkBto2sI/qJey2aBzT7kfsvz0OOzMVCikmv89N4Qr
-wBXEbvzF2Sv68Q/Z02mxRo92C3aKTY+Zo8mqn7QY77wfcCcapcGNjt+VjxHPz9wC
-XUsDyvDciKlvBx3Gxl3LWG/spV4wngwsIXZLZnaPriVydLNFhEFMMi15hqJNK/kc
-x9fP37G3tRv0DZGEuoILacaigi8WczonjM+XOKO92kZpnLiia1t7olKsKdi/vVMB
-z0VDkjYJAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFKQb3TACKtXicTE4QgglP82DiWGx
-MCYGA1UdEQQfMB2CFWNhMV92YWdyYW50LmJpdG1hc2suaYcECgUFMDALBgNVHQ8E
-BAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAkGA1UdEwQCMAAw
-HwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48wDQYJKoZIhvcNAQELBQAD
-ggIBAHswntxe4tEA4D2moTU5u5HiNgrWvGyGz5Jfy5axKGLNZ6yi6aWXMn1cQYy6
-tBEfqI4hQIOB0UOA5oLdup7FOBXaU337ZHek5jkjRXgW2tsapBumkU4Row1yvwDG
-a2W0bEjb8D/XQ5WvDmYLETR6e63Z4zTKqUmq7T9Z7O1mg666Ar2h8vo5T5eWSN87
-6AbTRk8NNMm9JS6gxGDrLOJrJQsSTPuaDxd4jPt5KiuKOC1Ee0Gq5ZIT+IHlX/Zr
-fuNk1Npm+VnqH04NQlRaFh7q8ntWXattHHXd9In/Q2w4AFucZo2ZSzwgvYSPeUnO
-+7cubCLwqh06YLvgy1DQJDza3/0sCwctoS8QE6CoTA7veO4fCQLW+MDT4jLtpLSA
-mMlpyDBkCnWOowld/yacbOzqhGxor/Y/YbVHBE0lW6jGRNbQi4W1eTG6hdpAyEoY
-f4BzR7dgvs0JuEijPLxBHlIFVUjzTV7MDovwyaPQN6CQiQgzbl0jHNDWevYqJnxX
-FZPCRAxHDFATVdP8ufG7DdH+v/eHqJe0sdNhxaGkcDJ1ckgo5zbNjF4CuRetvzwO
-jX1PVfhNDDB4VwHDXkM+92hgvC0TvIwvt6DKUdA2tNTKkkKAwpclfM+NjhjS4sSe
-k89Wi/f/8wJc92HypTMfy/EasPkf/hSwsiERiQIk/no6XE6U
------END CERTIFICATE-----
diff --git a/provider/files/nodes/ca1_vagrant/ca1_vagrant.key b/provider/files/nodes/ca1_vagrant/ca1_vagrant.key
deleted file mode 100644
index b0209bf..0000000
--- a/provider/files/nodes/ca1_vagrant/ca1_vagrant.key
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/provider/files/nodes/couch1/couch1.crt b/provider/files/nodes/couch1/couch1.crt
new file mode 100644
index 0000000..40a2956
--- /dev/null
+++ b/provider/files/nodes/couch1/couch1.crt
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFJjCCAw6gAwIBAgIRAPWLCpZJmrD7NtpgwQRYfB0wDQYJKoZIhvcNAQELBQAw
+SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
+GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTEyMTIxNzAwMDAwMFoXDTEz
+MTIxNzAwMDAwMFowHTEbMBkGA1UEAwwSY291Y2gxLmJpdG1hc2submV0MIIBuDAN
+BgkqhkiG9w0BAQEFAAOCAaUAMIIBoAKCAZcAp+s0KN3cOcF+0wIA3SwgIU3KAJQy
+asE8O1/kTak6kUVrOJKKqCpiWeLcpjQmXipxkI+k0G96st6+4zRdgRTy6RptSTD2
+BeYlc+LhAxUpptsxo2aziNwmIjFbbs4ZBddKu1yf1tn2PwcXTfWNQXy/JSiKK+h6
+CaaynRMh8Xk2t/7XCM6LgN+GvUIIVVqIxW1Xuy09YRRb94Q7Br+87MgoLBFMg9t8
+KpxP2RdMeDDnUjd/yUGeqxgIYyIlYlAwpWhUt5aoO2c7pQXnSKOo108SdYANpcB1
+sZRej7MHe9VzwiW9TpY1T8edCjzYBlwxQ5++oFvp7ltQjO/MYDTHGpnzKuUw5SSf
+dlfsIaoVUAqgHYjUmy6nig8MgmBpvDqNAan4+6EQ74kHEndo6qCjfYVJ+UGqej4e
+OcXbxiOz89MRy8z/I6oGHb7Advf8UZeQX07aYBceVnGMvucWvw780pqFDWmTMMc8
+ZQ5TIpdW33dGu6YAtslVjKk22RJb/ITGgiCX9999VuUfVvOIyjR/nn5NSmWv6pNH
+/QIDAQABo4GdMIGaMB0GA1UdDgQWBBQNB1ox/tn/jrCfD5NaIYTnW5eWazAhBgNV
+HREEGjAYghBjb3VjaDEuYml0bWFzay5phwQKBQUsMAsGA1UdDwQEAwIFoDAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAW
+gBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEARV+Dl88u
+ueMv792ZodchkIc7w7yo82yzHbUJfxXj/TA8QN86PY3PzmZ8FBCyqboiXIqxuOsC
+5Tax2fEPifU4zsV52figElEKhg6dgexbDIFJ6Yr4mfS6gNbXO9j5g3IjZ8UMfAWT
+m/3yy4q0zmCpdNCC8FArsd/BS78TpTuu/ysB7yD1hjADV/BZLP8vP4F3V/4+D2rO
+4+a1+mB+blBV7x/92/NevBOYc9V2J1uwQ3f1V7MbdBWYhZePgtO3nAZFUvRWas9R
+Y7tLLAorUj/z7DdgN03c/noRgovhYjgcopSCRxFFVaVfhEBmWO5chfVhiSQes2H0
++akm300VMunoi7oMg2TZ+areGtFyd9i+9E5q/HUs5jLHCyXhNauycntWyMIfiiff
+4w3govwaT9L+TfknW5dcQq2QzOZJgWttlsw6gQFwi747dllHhEKRlvoeI1tbMpKp
+qOub+KctTSMjjYDYonJmUbZ0F2BtNwIlQdhqJ9TKUXOkjdy6D34sbtq7euYUmVej
+8uCypP9Spb5RmldBokGGAVBUOukq5IdyX5nUZTKtwU/9zx2fSaI5TaUsxYiHWtQs
+YzJYykIhn6fck3HKpPJx9nbwGkFbLuhP6km/HSoi3OTnlnRlmhyK53blqEZy7I59
+ZJduH1rtHsWJEjjDrTR4MjJZHjY1hxb0KJ8=
+-----END CERTIFICATE-----
diff --git a/provider/files/nodes/couch1/couch1.key b/provider/files/nodes/couch1/couch1.key
new file mode 100644
index 0000000..d091f6c
--- /dev/null
+++ b/provider/files/nodes/couch1/couch1.key
@@ -0,0 +1,41 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub b/provider/files/nodes/couch1/couch1_ssh.pub
index 1188e5e..1188e5e 100644
--- a/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub
+++ b/provider/files/nodes/couch1/couch1_ssh.pub
diff --git a/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant.crt b/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant.crt
deleted file mode 100644
index 88ad6fd..0000000
--- a/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant.crt
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFOTCCAyGgAwIBAgIQRU8rjxDnYNkKAOP/1WtQxTANBgkqhkiG9w0BAQsFADBK
-MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTIxMjExMDAwMDAwWhcNMTMx
-MjExMDAwMDAwWjAnMSUwIwYDVQQDDBxjb3VjaGRiMV92YWdyYW50LmJpdG1hc2su
-bmV0MIIBuDANBgkqhkiG9w0BAQEFAAOCAaUAMIIBoAKCAZcAnCM5hRb3UWSJgxF6
-cYWyhhrMczPJFDCavsstRlvwwcMB/GA0mgiaXTTQZUre3CuJLUYWuGY6qnkHvGUe
-+VfCd3gtQXyCPpzZRQEjifCL+CXy/XdLmk8/BcP6N/vgRpwxa/4bdZpdbTGo0llC
-XO0hSMbpWJQYzJB/PwXUw9VgPkI0TNIk5r8GFdtALUPh/hVCp6BULBzkUw/YkQtI
-uXMcvxpswt+s1NDFzG5jGl39vxTOuNRbleLhSPmE/Ah2b9BzBBGM8xgwc+WQ5h9d
-UYREksusZyP2gvAZ6VC2e6Z/eZtiy5yeph+XBJwC2/1tQ9LuxqPm6q65uYyjPbhO
-8V8kSrxFeHYl8OsDbdJkNtR12D1wzeqqgj/EV3QM75HE6LO7hHMr+o4SKWCrk052
-ipiTYV6VfGm4bHYajeHDfdFj6bfGQcLsG4LpRvW8x3FyUYjrUfr2L63g2AP1Rw/i
-ljCxhNC/oYzLj/KKCZi36J4Z9XDVMXplBbHuDy6s4IytS+Dq7C/eyv7o414Lkry/
-Wj4gbVtkQm53MwIDAQABo4GnMIGkMB0GA1UdDgQWBBRBAJZM+WMy/cX4UDf/8PSx
-lDGfGDArBgNVHREEJDAighpjb3VjaGRiMV92YWdyYW50LmJpdG1hc2suaYcECgUF
-LDALBgNVHQ8EBAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAkG
-A1UdEwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48wDQYJKoZI
-hvcNAQELBQADggIBAFYbFCxnSfhvin20yDmqzabnullS2I2oCfI85XgGTJMmhztU
-95gwU2tWnXgYEgQhz09qtztk8o0oRaOwZf9cW3WY94jexmzlFc+NgqzIDr4Ne17q
-mZ9MmFH387tYZakrqzW1cO/A/Ktudk70UJsIS58C6slFT5Fb/h1kTkgfT1UxnQlH
-seAE+6QY8iRe/0JZEPcxjI8fhKY8T4JKhTZqieRqQfrHPFDkb2hktJWsCBPIQUHG
-ojMNFcS9OrPuVZECUh5wOmJqjKSsmpejtKAh2DpbLEp2DPgc9DTmQSPGoI41aNhC
-4o0qrP+r1ns2Rj5aIuVvnJJMCN+Ckjvlhbp2iFxfJX6vR5rvDd506WodzIOPNyqc
-jwU3yZF0cNeSPqErolWimPjFFr6DlPX8H/iDopsW+mcksnMDvPhYHwgAZuVefhzL
-+Irk739d6c2WAtH/ypCjR/Zx6Bn8EapBQXm8LCYBYpfUZAKzeCVQvhiyihuzLkqy
-CIQKo4wh5AUOAbfT1F+4iG4uYveLzeUPZIx8OhIhMlXWqo9I4OQZdpbAvlwhPK8u
-CODoWf9jcB8cD9BTTRiMilXTjBXQuEaRPV2rrofQSEaTxWvVZkC2i7Hfc131QhDN
-YimMMgUM3IJaXw89KntnCB7BOvEeoXov58XQzZsfIvA9xL3JNM9nh+J7HuxI
------END CERTIFICATE-----
diff --git a/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant.key b/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant.key
deleted file mode 100644
index f4da63e..0000000
--- a/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant.key
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/provider/files/nodes/vpn1/vpn1.crt b/provider/files/nodes/vpn1/vpn1.crt
new file mode 100644
index 0000000..01923c7
--- /dev/null
+++ b/provider/files/nodes/vpn1/vpn1.crt
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFIjCCAwqgAwIBAgIRAMxitfc4CPM3rEnxno7j/cgwDQYJKoZIhvcNAQELBQAw
+SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
+GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTEyMTIxNzAwMDAwMFoXDTEz
+MTIxNzAwMDAwMFowGzEZMBcGA1UEAwwQdnBuMS5iaXRtYXNrLm5ldDCCAbgwDQYJ
+KoZIhvcNAQEBBQADggGlADCCAaACggGXAOeixAC1i0GBPHbiRuCumrtWbv7WD1Gf
+u7DAbam0NaRomFLqOzdW4IX2Tcw5VlM87RUi8amDoAg9y94drFxOnTj3MIQpScda
++PzYOM334Kcduv6X4jajPsovF5FwDcerMmb1lV4KOQH0jvB/lZyge95ZBKvKe9D4
+95SEyAEDkJoCIXnNg03Rm0zzBCsvK3YF4A7C5oNMnUfnudONQPTCceZcPbFhs7CK
+ZGx4U4iNKlvyQvnXH97/fl2f8xi2B0ObHiNtajTSJb8x3L/tbY3b5iiyHQQgx7a0
+8fyqPOkir/JRs4oxWM7+2xw+JZRw7xny/f2Q/SDkdbmYhvfelhLv34lvTW17eyyY
+v7oMJ8Z46u9Mtgw7SEbRiPi4jA7yDWJD/e+UCRJnvJJA1y9zUxmIt5IGFA0fAY8J
+HXFhY9CJ/B1oMJnzepfo9CjbLqTXryViVyk7Tt6EOl0N3Ks5YuoxQSaufU1hGe4y
+7/XXnZXrEC0nLb03y5S0CGgZqxa1jx8QNIf7p87O+PkZq6XfqK5WOPotKbY8twEC
+AwEAAaOBmzCBmDAdBgNVHQ4EFgQUDmsp8i2E0S93/MyeWDFIRc405SwwHwYDVR0R
+BBgwFoIOdnBuMS5iaXRtYXNrLmmHBAoFBS0wCwYDVR0PBAQDAgWgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmB
+gyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQBjzp3t/EIwmlhN
+QgSghErAoBoyeV2BQOKpURij2FBTdLjV+8Eji45LmdqT965OvMaKjBxFSQzZyaVo
+mhECFQLmCYwkir9Um2yuYDkI6UvnV8PzRm3vE5i5Y4c8gXJ7YyMMDgdByHouuRfH
+a7+t50XQTO6JEhThowqXqnY0vw0V11GNReLHHwFd2JFkDChQit+S2yCJZpMnX5cK
+k2UXJ9ApvgfYLrNEy27UwBhnUK1VgA9T11HUdVZaXEHbUu5fgI2CvH8zZ6ry1Xnj
+tkEXkS6W9W842vMjM3mQnlr52stRaUYjx+T06T3VM/drN04mPWMi079E5fm4UwVB
+E7h/CL98zHb4gWyh/F8JXk7ybI/8fqMditd7kni9oeYFvcCkPtyEt1SVkUES3fmE
+8Llg790wvroSQ6smFSAw9uN++NHOrrqiZdalKjGNUL79QLEvvyqgUwKULlab1zPk
+dE8GJHotMwfdVXEQXftcTmX0EDxgMSZKZsmR4TR7OzB7AvwMEnSj6UMVecpITWtH
+eI7talQiwblKetf8CRl4GNP8C71yL9HjggJ3KJ7A1KvtTbO0EuEbckb9DN6ntuyw
++p1mbp9jRUUS9ul73TNeiqD28hCAdp0LuFWSF90SSDokUwBvqAWAK8hSVicLBzE9
+GKb26e3kwgpBwVagSNl+BnXQ7eSLMQ==
+-----END CERTIFICATE-----
diff --git a/provider/files/nodes/vpn1/vpn1.key b/provider/files/nodes/vpn1/vpn1.key
new file mode 100644
index 0000000..8c1f79e
--- /dev/null
+++ b/provider/files/nodes/vpn1/vpn1.key
@@ -0,0 +1,41 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub b/provider/files/nodes/vpn1/vpn1_ssh.pub
index 1188e5e..1188e5e 100644
--- a/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub
+++ b/provider/files/nodes/vpn1/vpn1_ssh.pub
diff --git a/provider/files/nodes/vpn1_vagrant/vpn1_vagrant.crt b/provider/files/nodes/vpn1_vagrant/vpn1_vagrant.crt
deleted file mode 100644
index 50eeacb..0000000
--- a/provider/files/nodes/vpn1_vagrant/vpn1_vagrant.crt
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFMTCCAxmgAwIBAgIQDAhdNmv4ZNgQChyHxIsAbzANBgkqhkiG9w0BAQsFADBK
-MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTIxMjEyMDAwMDAwWhcNMTMx
-MjEyMDAwMDAwWjAjMSEwHwYDVQQDDBh2cG4xX3ZhZ3JhbnQuYml0bWFzay5uZXQw
-ggG4MA0GCSqGSIb3DQEBAQUAA4IBpQAwggGgAoIBlwDrvonzHc3ZxEJ/WDI0TOtp
-xaKyOE4jJBHF6qQh8WFx9mjFFWBbJAUzGSfW+bAsyiVKVZcib04zawEZohb/PCH9
-LPntPQ8VfwMsxVJwiwlqBMCVXwAaN+TjKXHIYeioNZekjHns3MXVvkGepjuVTtLh
-eYix5U/G1ZHGyYpIa+szHp44qq/zsg5N2XnDNsyTlKeSzpcJgLdFzZch1kwtlF9X
-swgUQNeEtnrAFk9u4RVzlgC1qNaEFE/hx1FhxgRDq49oEAYgYM9vnLJBUFE+xDv6
-2ItbzSWTjnZr86Hd4fbkyBlPHu/B2BlfEnKpeoGGVqKSrvlZXGUcWX3vRLSqArnb
-4pFkE/+tcoGKPe01zoFNSzg7Ub0UhkXz3kV6sx29MsTW6lEt97R5xTByVtEWiw+E
-oavcm9w5AY5sof3AtKnWWZuvrH+hKrh0TgIKhOJJoj0KF9Q0iV+P1k3BCTN15OEb
-J/ocwL5LJist6m4J8Ae1QRLjY/KTj4mdrh2n6sTflYEnCl4G5Q8Cfbp4cZi871ch
-z/MqBbVrAgMBAAGjgaMwgaAwHQYDVR0OBBYEFOOsDn2P9JRE/w7a0oSMXUFP2Sc2
-MCcGA1UdEQQgMB6CFnZwbjFfdmFncmFudC5iaXRtYXNrLmmHBAoFBS0wCwYDVR0P
-BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAA
-MB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUA
-A4ICAQBRV57tIRSn+y4cICltscFvZzqQnGn9YoWi8BgMy6CBkgg2dXESBRiKYn1C
-X6wORn5iplEt8I4NjnpCAC7+KW4YMkG88S2gTmhH6QBf56IRA7k5ZxE9BU3tzKzK
-4CtSbPH4bYzy8b/YmTiRaYasjTONjtBAfQDXhisjMHt0FbJHHDNm59TBh/BsRoYh
-Qb0uZUjbP/8rysAqY2GFjQDlW3DStyK5zp0lLXFC0cScAz+RUnaGI8Hb4srMCfn4
-TOhZGe6xJNrn0Ec2XFOAhjQ3IrXlceW24afXwgKinZeTBaLGdaZbxWhPr283Vqsa
-2Pwjre6Zl91FgXrEzqjFpTPeW/D4WTviHguQm60l/ipr4Auetvf5s1etooOE4qUz
-XPgEuvXQGd7/2tqPYjCfY7jIfV8nHk6/H9+ge9G+1YuPD1IY7D3XPkbBiV5D/Lzk
-z+79YGPClzl4FxalueCMyAuXTKc0vhZUKfrBTDr9Y2Ssm6hxSj4G6PK671cYb0eL
-0Lf5cy5VgAJruemRqXDSKRd7S+FX/5H1dCQjdN9FjtxwfsHISBP7oUpV2jdkqk48
-O1PQCrd5scF7d241kRD+Pq5xEYOYfi2zO1kFPRqWmapaUy5iy7B9v2bA46z3eBhL
-GfiJD6OJZvnfNneDuZW4K08YxR80LDagl7geapHGY42avvLVoA==
------END CERTIFICATE-----
diff --git a/provider/files/nodes/vpn1_vagrant/vpn1_vagrant.key b/provider/files/nodes/vpn1_vagrant/vpn1_vagrant.key
deleted file mode 100644
index dbda081..0000000
--- a/provider/files/nodes/vpn1_vagrant/vpn1_vagrant.key
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/provider/files/nodes/web1/web1.crt b/provider/files/nodes/web1/web1.crt
new file mode 100644
index 0000000..83d52e0
--- /dev/null
+++ b/provider/files/nodes/web1/web1.crt
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFMjCCAxqgAwIBAgIQGJkppW19drBJwQdr4YDD3DANBgkqhkiG9w0BAQsFADBK
+MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
+BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTIxMjE3MDAwMDAwWhcNMTMx
+MjE3MDAwMDAwWjAbMRkwFwYDVQQDDBB3ZWIxLmJpdG1hc2submV0MIIBuDANBgkq
+hkiG9w0BAQEFAAOCAaUAMIIBoAKCAZcAvy7oEccrJcWh9OY6DPOU44s/cf5Gzrfd
+PjVHxRB60jDwmsAQmLFGwAipstBeq9cIJgDyjf6FfWmihZkTM9kDgngtrNJ0lqrk
+Gj9y1VRgAtx1uvQMyKTIzcCayhxVbxC0TWONLsP6QKmvhLOynWt+ZqXJfJerlCM4
+4m6Lzd8v4RiCp4u8P2mPPSH+XvvYoco9BsS9xBc35uVrA6815cX7ZVNb/G+0plOH
+hga3yTLctZNKjlX1eAr7d/xrik5T943jlhCQRWVKmbztXffBCr6p9v7lWrV9fhZG
+c1OODA42O4VSJNCZRUkQOvdBonKOD8uV3oxsxUw+sZM1aXsHStF6Oy8JflT+5o/y
+I3rJ+43fgRqu28oDpH1xaGzdunm4eUDfTyzcrDmJXx2vV5+4wZwZaJl1rhMI/PXI
+W0luDPfMX2G17TfjgOtdM+L1IjEMB+Y+I2czkMeMyiSpIEf/2I3vQWPdRWXKEji3
+2zA2VWyh1d4xoURioR1xxjDuflY3oOFJawYBf1fOZZd0w99vgTK5olHfM53/rQID
+AQABo4GsMIGpMB0GA1UdDgQWBBQBRXT6o1p21xUyEzwUW2dWhFmJZTAwBgNVHREE
+KTAngg53ZWIxLmJpdG1hc2suaYIPYXBpLmJpdG1hc2submV0hwQKBQUvMAsGA1Ud
+DwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIw
+ADAfBgNVHSMEGDAWgBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsF
+AAOCAgEAQLhHtWj/fYF747Jq33orNKF6VlZ+JowGR15ByS5bBLkwN6IZOgS64dKY
+axLbR3XSDHflfzqA7wDCo06I32XUNdtxiiOvgw16JlvgWu20gBU5NCjQI7mvnrcX
+ox9RJ4vfmXG1t/PemLodBm77LPLJ8tUTZNQRV5MF3+dPdSmNSp+1/JWhz9/5Oc8z
+PYuBZifD/LId//rz6PKOaraFzqxxfVuQ+XG0zg4r6BR49N8HxHNK3TRlmYHad+te
+Ok0P8HUzusJIkZBpX3cJLJponVHbufM2WjGUJF1UpB8yLhDgxiaR4auzUJwxYDhs
+0srRGf1tIBVeOYbvs5HnBfJv6VB9/Co6JCQ5aAH06NmqMyxUO1uUpkMScp6gwM3a
+x8TEjiOkgo2WJ3nSJoa490XTfTkgj206N49cru33TBhMt20KqtHvUk8pJwK63jJt
+GvOZl+bfm2saJdilSUWzM5/U+OLMMjhVqDqz9dpm2t1YXQj+0YfQhCwLkaEnpEnQ
+FnrA5RgY63FaOuN9JjHTQDDGxyiW/OWgUQmFw22U6GI8gFD7jyzvLuXjo0qLL5Ta
+6w2SBdwml29vWQeS1/E/j0KD5b5cfhWDi/7iY9YGDmHZ27GRIg2qpaNomOZ/9x+2
+iZ0OkDEkw19ToVAjCoB8yO4RXAPkl6GtlGyKB5uxdkUfN+/eR6c=
+-----END CERTIFICATE-----
diff --git a/provider/files/nodes/web1/web1.key b/provider/files/nodes/web1/web1.key
new file mode 100644
index 0000000..5951521
--- /dev/null
+++ b/provider/files/nodes/web1/web1.key
@@ -0,0 +1,41 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIHRgIBAAKCAZcAvy7oEccrJcWh9OY6DPOU44s/cf5GzrfdPjVHxRB60jDwmsAQ
+mLFGwAipstBeq9cIJgDyjf6FfWmihZkTM9kDgngtrNJ0lqrkGj9y1VRgAtx1uvQM
+yKTIzcCayhxVbxC0TWONLsP6QKmvhLOynWt+ZqXJfJerlCM44m6Lzd8v4RiCp4u8
+P2mPPSH+XvvYoco9BsS9xBc35uVrA6815cX7ZVNb/G+0plOHhga3yTLctZNKjlX1
+eAr7d/xrik5T943jlhCQRWVKmbztXffBCr6p9v7lWrV9fhZGc1OODA42O4VSJNCZ
+RUkQOvdBonKOD8uV3oxsxUw+sZM1aXsHStF6Oy8JflT+5o/yI3rJ+43fgRqu28oD
+pH1xaGzdunm4eUDfTyzcrDmJXx2vV5+4wZwZaJl1rhMI/PXIW0luDPfMX2G17Tfj
+gOtdM+L1IjEMB+Y+I2czkMeMyiSpIEf/2I3vQWPdRWXKEji32zA2VWyh1d4xoURi
+oR1xxjDuflY3oOFJawYBf1fOZZd0w99vgTK5olHfM53/rQIDAQABAoIBlmo1bMcz
+lkzNlkOvAuDfEP+4A+8YC84bZtWAU/auSQ0sEv5lZNLu6RcVuPCVwYJFW0mBjT5E
+/3PEk30UpQ5QqRp6GSXBZPOuzDmoteq9jPkJ8H2DxvZQVR24ukU9qFijNwcnHu+z
+//qcSd221quNZBMyVtTYjYEmcBuaviAItViffTYG8vVndyPHFsE9uANpjq2L7sBZ
+Bb1IBkNtusuDST3pKVj71afxD4DtinxDvUlCIlEgf9XIhBsMJ9IV4Z/NO3nKiduD
+ggYWZuekHHr10Xf7nX0Tk7sbM0lci7HAgEkWFEmmFzhRh+BJ6UtpMWyJZGXj/qqP
++e8RlZSk87V4XUWjngeccHq48p8fvvb9Y1xUbDc8GeiRDMFLTM135qI/BOHjPJzz
+nKAxzGFGqzGMKCx3DWNC8qBx7AJypimyPSnrVA8UuAcsF99x8CM2l69bZNhGZcaq
+MMxZskwFXys4+pIEq2MFCJ1U2rFSKvNEQ/pXWm5xGirZqv+k6pwCNyrImGbHI5HL
+Hdr3LdSyTg6GBR88vNakzSECgcwA9aMLxE4m3kpVjZlyQy9uglgQRb0M1S5wR8rk
+OYptXyY1Gy1ya5kGpocYFs0FzFEkR9stQBmp3dNWjDIaShynBdRRU8cZPay1+E03
+eLotl12KsFnI8D5SzCVTBUo9pM+vzQbqZg87o1HpOlNuymDNpZzTzKS8W76WZ1Ia
+lwl5MN48+A2Kjw6aN9yAc3OSl8lDrFpT0c/dnkcbNECdiayI1plkrWha1oB+6Wve
+Y3VlYkPWyRQ2M0NdVyxBcTWXyTIEGIaPFMETWszWt/sCgcwAxz++go9h6uCNuFN2
+oRMR1667J5v1N0TUhwpkYyLw+3rQ9k2n93tLza2lshvvbIny5i0frfdwG1UUqq5R
+cvsqobx/PlAHkdcZUuqExEtM9RMK51Ay3QC08v5gdTRUrKA3YofY87I/xTy3aCX6
+yEiur6gqBp5nfW9QfUfRgxbTL0aMx7csHzh/XrovMifAfBCXrqwgiUGag8p7GsfH
+rNEhPZuiw44dkE0Slv5RaLPMUcbeBjlq/mvWt/yxyf27GBuPJ/J0QTjCHeNATncC
+gcwA1ylQn01Nop0+P2BPxCYCCM6Wwl+MpBefZmOEchqdHyFal0nB1hoexzPCmAZS
+s9vHieGky2cvcg0y3G7utEhQzTxjWJ0nsOxeIPeSRX/fe50GZN7gsgAFiqiPBi03
+vevmNBOAspFZTf/r6Zk3jLIqsIykwbby/vH80NgMToyPyYyBn05NNm42DARrx7VO
+jQJQ8uHUVg5cM85ZN/X5iKTG4CNRGswz9Xxsro48KKamfeKqe0vnBhRV6Ivtbvrg
+z+2txMXpAub0yy5uTo0Cgcst3LlQOgqy0p8sV2HN76LCv4BqvJYz847rynOS8h7/
+86QXnYZVC7dGD3s9RPrWQ+Z6HtbU50iRsgLAysEKs097zPSI9kjXw+gbUsnemOqM
+2qY+2hHrFtePuwee0r3Owk4dSuGgLl5JWxFoUp2n7jrvScjqnxl5IN8pBxftkZpo
+nleXPM1WHl4LAtYMOGQw6mzPkuUmUshrH3c4kdWfLL/2+1T6qEKbzXHC+aTpccFM
+7XZ7fknnaBETZoHR2apwAR/xdPhXbuYXlRBfPwKBy1t9f5FtHPEftM10XaXX/yca
+UlV+0OZM7anwKiPHYsLxPJ3vLFLu+vGY3KsO3k4Y/cLS6T7cGXxW05rsFeTHbbJr
+NShxu1IVKPtJEGGg9a3WAfVTyKKh9Sd3yWfTZCxt8kPyQes5BnNe9tl/E3m1RsX8
+r6yVuN1iMuUeVlMDeRs+RM3ENxK7Babp3DDaNBhg41fea6ngv4288D9A25k6B7Ja
+yRBLwplpfYuKZFpiq5ZBRI3ymC/vVgCadRbLiNgHPi0bIgCp3nAXSQ1h
+-----END RSA PRIVATE KEY-----
diff --git a/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub b/provider/files/nodes/web1/web1_ssh.pub
index 1188e5e..1188e5e 100644
--- a/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub
+++ b/provider/files/nodes/web1/web1_ssh.pub
diff --git a/provider/files/nodes/web1_vagrant/web1_vagrant.crt b/provider/files/nodes/web1_vagrant/web1_vagrant.crt
deleted file mode 100644
index c631404..0000000
--- a/provider/files/nodes/web1_vagrant/web1_vagrant.crt
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFQzCCAyugAwIBAgIRAJNb+vLoQwDEbCAKcmN7uREwDQYJKoZIhvcNAQELBQAw
-SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
-GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTEyMTIxMTAwMDAwMFoXDTEz
-MTIxMTAwMDAwMFowIzEhMB8GA1UEAwwYd2ViMV92YWdyYW50LmJpdG1hc2submV0
-MIIBuDANBgkqhkiG9w0BAQEFAAOCAaUAMIIBoAKCAZcAnr87Ao7ABQ78EeTDIrpp
-2cc3gUeS4NBUGf9gpGneiXw7qQDf4MQ0xgMgXk8S2zgx2kPpGkMRH54BOqHRR9h0
-37ncMg7E4gANGMJegkdSk9oXkTM8h1ehlUojv62XgUtugMwnHYb7UsU1FEYlcWxx
-NlYmQwHP9L74a7e9l/xno+i7d9bM7rio26xq9H5BX8kO5Z+1pRH+81zjDUMyB6Ka
-j/R+Yyhim+k2yOlfcUlmRV+TRECbtqyYf3IZ2v+YNU5dUomWgsjU46btg74gMzuO
-26zzTFxKK4V/9w7lKbVkgk3+vv8BuSmF4eLIiuJdzi4qlARUKpZMP2XgnsuGEeVc
-9L1QLDWTlMdHJTmFI/eHTyHOOgCG/W06l4EttHuudZD7k9sJa4cvUHVl4O9U/1JH
-+474t6J02RGGzlehOcLDFC6C2cAokFTYf8EFaoiZje1QewUhRFHRJpLtd3D7FJVX
-cQnDuHqAzkfpcGIy9AuluNMP7UiTNzqyQk9YI32h18Itb/hcwMB8mHyofZaPCFvZ
-U8KxQJmB/QIDAQABo4G0MIGxMB0GA1UdDgQWBBQrCRDh5ojGgnYEk3Wne8pHPzsH
-eDA4BgNVHREEMTAvghZ3ZWIxX3ZhZ3JhbnQuYml0bWFzay5pgg9hcGkuYml0bWFz
-ay5uZXSHBAoFBS8wCwYDVR0PBAQDAgOoMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66LdSV
-Pg+PMA0GCSqGSIb3DQEBCwUAA4ICAQCjXdgSTffKSbCTqGY7wUhtUy2IHzA/Co0l
-x0cCqcV8mirve0MapnRrwq6VhSfU/lWDkKk8L3vQQwrfPvnFkjk3cwAwaP19BaUc
-e8QJIBdWU5JNlTDS4MovUTIZNYtVkcMVGuE9S6CnIrQ5jmIS2QkbbyWIi2X52pzo
-RWl6cdOZGPxOsoTtO+Y5N6IdJ2Z8B69KufZBiZKWSnIWKBDChlBr0U4Nq8IYxsNb
-bN4jS4M4LbFa7vPdDSHpNMz0sgtRD7RZttH0bfEEzvWNCkEQ3McbI/FGV9KTkEDd
-6KGPNHRp3h7sQosz0pTbr1QLVarynb0p3DPbLNrJuzhOHk7nNrbPd8Q4pAyf5I7B
-uEAJuPKHv4NNRXvTD9LU4txAf+oJyqKQ3Gwuh2e1q1JvWJpd7e9CXPVMTPRFrKbd
-d+g0HJarOCc2vDeIzggQDXtbLcPUazfq8wlvYRWXn3DpDzQ9YV60EfIVBS9il29f
-vaEiXkHZZme7NbM1qaOJaj0Xtq4JbC5NIN0LcprTZtVkzuR2g7q4BKsG6qElKCq9
-+J2vyAIsbic0enRv63K5I9YM94UeHjXgiYNqSsmjAwBh1ewGRpbr8flwoanyF+SK
-Pe1g3v7MOpUbg9rUAo9l6eQs/H9ZLectFHLI8vRPobPgLuazNXXqJTz1n4RfjX6Z
-b0skukhFaw==
------END CERTIFICATE-----
diff --git a/provider/files/nodes/web1_vagrant/web1_vagrant.key b/provider/files/nodes/web1_vagrant/web1_vagrant.key
deleted file mode 100644
index 6899392..0000000
--- a/provider/files/nodes/web1_vagrant/web1_vagrant.key
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/provider/files/ssh/known_hosts b/provider/files/ssh/known_hosts
index 6575892..707cd46 100644
--- a/provider/files/ssh/known_hosts
+++ b/provider/files/ssh/known_hosts
@@ -1,8 +1,8 @@
 aligator,aligator.bitmask.i,aligator.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
-ca1_vagrant,ca1_vagrant.bitmask.i,ca1_vagrant.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
-couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+ca1,ca1.bitmask.i,ca1.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+couch1,couch1.bitmask.i,couch1.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
 koala,koala.bitmask.i,koala.bitmask.net,176.53.69.125 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+F/OOIZbQbK7/n6nnijHkYs2qjZzqYXyXUSyIDdA8GOg2g4p89YRvbLSkZ9BLl5x4zgyT3nIw6bee5ADErT266VKcvcYdKzMQ6ws+ZcV5Pa3jL3cmzsIossZBGnP8Q+MmjKP+2uFH0NXkAIABy8Wack/FHuIPWdcBrW61q6FX6788NEmYU2sQHble/K2rg1a5aLZm0HStsJhJL0y13jcw5NhhMVcGREqga6MgQ6iAOJYjbJBQnramOqpPavkUSyvgI68GZqevrFzgCkUCiv9cmIAnZEvOo0MIwmWQlUldHIi6lr9vRt9aqmAq0zuUlpxYk3zL9Q2EiaScgEE1XIkX
 sloth,sloth.bitmask.i,sloth.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
 turtle,turtle.bitmask.i,turtle.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDECAk6ImmnzRsorqoeU7kCpMClhLu80q5AJw1cfZlZMx4PEq0tMnRu2Q0jtGSQwBqU2OzUK+WXljx+5mF/mnJXtAO+/+usQFFzYiovT/7cjEAtYzlcECkqF0TajEIdCcqPoO0GJHpbhenlCfhnan9d3uJWIghI0DioNgeF+Prxw2eqA9UnyeJ+EefWMeo5e6DPjYohFTy/Jg4wpMqbFh/IfKqtp2/6fuz1ssaajePiAt4dVtzCttc8t68oJWr9scnDdlqyr4i7hQSizZiSRCgVwu94WCx2DJsMaxNUY7J9VzgR7T4ja/8TjnHLVMO+dd36A4F0yXVSo7WBZ0AqEsA9
-vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
-web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+vpn1,vpn1.bitmask.i,vpn1.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+web1,web1.bitmask.i,web1.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
diff --git a/provider/hiera/ca1.yaml b/provider/hiera/ca1.yaml
new file mode 100644
index 0000000..31ac06a
--- /dev/null
+++ b/provider/hiera/ca1.yaml
@@ -0,0 +1,141 @@
+--- 
+ca_daemon: 
+  couchdb_hosts: 
+    - couch1.bitmask.i
+  couchdb_user: 
+    password: zyMM7LZMjGE2aUvJ5sH_8SraPuxB2H5L
+    username: admin
+dns: 
+  public: false
+domain: 
+  full: ca1.bitmask.net
+  full_suffix: bitmask.net
+  internal: ca1.bitmask.i
+  internal_suffix: bitmask.i
+  name: ca1.bitmask.i
+hosts: "10.5.5.44    couch1 couch1.bitmask.i couch1.bitmask.net"
+interface: eth0
+ip_address: "10.5.5.48"
+local: true
+name: ca1
+service_type: internal_service
+services: 
+  - ca
+ssh: 
+  authorized_keys: |
+      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2rpPukC7v43Q9RvYgxAx1aDsem7+eZvvSKR+Uvkb0yRvI4h56eds1Cj0pOFOCinjIMyw+LkrhcubWDtFYzC1yTHUUcjSoIi2M+TurQZdTkMnsg2u34U61+EjOPb2jYdxBwUu9e/wDRGqih7FjFYCsHFMPH1ENVS+LZeerXn1F344HIP8VhLpWSjLAKgfMUCuvoTEqNaR4I90w1PAG0uRslYouTuxOA3VOCnf75FW7b4ZuBw1y2rmWcz9Rm5M4tz3EQCeX8v+AIKd6QQU0gFSytcelQtBVqu0YjnnL5Lp+fcKw3BJO+QQXk+OyYqGuP9WQfPPki2tEDHJ9rHcPD3l+w== users/azul/azul_ssh.pub
+      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== users/elijah/elijah_ssh.pub
+      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== users/micah/micah_ssh.pub
+      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= users/varac/varac_ssh.pub
+  known_hosts: "couch1,couch1.bitmask.i,couch1.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9"
+  port: 22
+tags: 
+  - local
+x509: 
+  ca_cert: |
+      -----BEGIN CERTIFICATE-----
+      MIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt
+      YXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v
+      Yml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw
+      FgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV
+      BAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+      ggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai
+      dHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB
+      7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84
+      CA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+
+      znCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4
+      MEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4
+      lPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0
+      bQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl
+      DEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB
+      lfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy
+      YMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw
+      XjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE
+      MAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w
+      DQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl
+      cXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY
+      k/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj
+      RnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG
+      htD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX
+      EIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J
+      aF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l
+      mlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK
+      G6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co
+      Ja8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d
+      69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e
+      yV8e
+      -----END CERTIFICATE-----
+  cert: |
+      -----BEGIN CERTIFICATE-----
+      MIIFIDCCAwigAwIBAgIRANB+fZFtU8sHNToyXck+VfgwDQYJKoZIhvcNAQELBQAw
+      SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
+      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTEyMTIxNzAwMDAwMFoXDTEz
+      MTIxNzAwMDAwMFowGjEYMBYGA1UEAwwPY2ExLmJpdG1hc2submV0MIIBuDANBgkq
+      hkiG9w0BAQEFAAOCAaUAMIIBoAKCAZcAyXW8tcRnuC/bxRM5PMmJ7gez8bvAGxhJ
+      QEZ+ssO2ntmyekAIwXGiFN08Y/iKh66QZ2eNCN3IOKXiKu0Bvu2fzy29QmOH2Tsv
+      tyxLY8/6fzFnLQCqccVsvat+uabPX43Byf1vAhRqH0KXUzTDbnUMJp8UyAhum+V4
+      ms0cGYg+kC0vVb1Xh0PlAC8sg+FLIBNvRv6Ze0pWfV0kIXi+needtpHn4eZhhAMB
+      8ZhCDXV0v9YWVHofHmNj8zmU1xaSyc+dUhA2nhqFZCqmxO8pqIYZoIa4XYiDewqj
+      aYeAyqmZlTYrZahuzcdRphunCY4TLv1w7jRqiy20vYcEdq9kg6rPVyMXIUzCQT/R
+      u7qgloRf1eVn9cC9dT/ZlpWvV5CEcTn5rlDeMvkmxEvSqSaSouo3uQSEJJAhWKl0
+      GTYHPr+vkeHJaJNwxIiQCFOMNmDJBc9XaO6kuVUekHd6KWsQ0Mbs+0GroY9chopN
+      hrayJJ6fl7TIPkOeNJ2/4IqQZjDoB25H5/i7tv8F2zEZIGsXg+aEOsLsTJZzoQID
+      AQABo4GaMIGXMB0GA1UdDgQWBBTlcEZPdBBafSNgG1oKwzNZcRgmSjAeBgNVHREE
+      FzAVgg1jYTEuYml0bWFzay5phwQKBQUwMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAU
+      BggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAWgBS5gYMs
+      vayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEAQFmjRoG6sf2OpTv2
+      8f3Wq9qMWaAoAkhCjwersoYc7xxxSwsdTTSqfDXArYzRLFzYNyGDZBQ2vEUwG2cG
+      Ytr9BW9qIi1m8jcVR/8rXTu8CcL1nANc3EBQd8TIQ0ETSXwCpOPRNN7XgJ4wWrG1
+      PrR1kmT188n5rofwpkqj5A1d0lqDbDlb4PDF242Hvt19vro5YvFlqGT0nlru6MJm
+      QHI0X11KyFhJ2Pt8LlWXG32uarTGs+XgCNLug5uXPqzfF1Gkwz7hZKQOV0KEbv3n
+      J0wVlfIXYsPtiY+E7O/Ax9OMUPY90HlrSyOqCZWlURNTGfy4jnaDV7o0sE8Zu1qf
+      k7aFm755ZYgIGa8Ek7lvESxoIo8b47tHuYgJGH1ISQqY1YjmHWCxG8E/03dcycVx
+      6v4yO8xA5G970NHf+RUrbWzQpbj4dOfXSMFjcHFmC5OAnRPQcFSo+2G7TVUyxb/2
+      65N5pP63bnxHONmCKN1VnRqADMYOsRFfgl7+pzcIz8I3Iirb4JJS14CJC9sjXegX
+      7k15+Hm1e3wXVPuIPuPVevpfdebx3qawmH7RqSkMkmFP4wn8aYgjzPalHoS2vDM6
+      8oGV+NCzMveH+PMkfaQaAYLwMwinT4VQXf+rjgLbEa8eDrOw/8+kDUwzR1ZaycMP
+      CixDR2vdGkxwe9/XYuDB3vFoOZU=
+      -----END CERTIFICATE-----
+  key: |
+      -----BEGIN RSA PRIVATE KEY-----
+      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
+      -----END RSA PRIVATE KEY-----
+  use: true
diff --git a/provider/hiera/ca1_vagrant.yaml b/provider/hiera/ca1_vagrant.yaml
deleted file mode 100644
index 9c29842..0000000
--- a/provider/hiera/ca1_vagrant.yaml
+++ /dev/null
@@ -1,141 +0,0 @@
---- 
-ca_daemon: 
-  couchdb_hosts: 
-    - couchdb1_vagrant.bitmask.i
-  couchdb_user: 
-    password: zyMM7LZMjGE2aUvJ5sH_8SraPuxB2H5L
-    username: admin
-dns: 
-  public: false
-domain: 
-  full: ca1_vagrant.bitmask.net
-  full_suffix: bitmask.net
-  internal: ca1_vagrant.bitmask.i
-  internal_suffix: bitmask.i
-  name: ca1_vagrant.bitmask.i
-hosts: "10.5.5.44    couchdb1_vagrant couchdb1_vagrant.bitmask.i couchdb1_vagrant.bitmask.net"
-interface: eth0
-ip_address: "10.5.5.48"
-local: true
-name: ca1_vagrant
-service_type: internal_service
-services: 
-  - ca
-ssh: 
-  authorized_keys: |
-      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2rpPukC7v43Q9RvYgxAx1aDsem7+eZvvSKR+Uvkb0yRvI4h56eds1Cj0pOFOCinjIMyw+LkrhcubWDtFYzC1yTHUUcjSoIi2M+TurQZdTkMnsg2u34U61+EjOPb2jYdxBwUu9e/wDRGqih7FjFYCsHFMPH1ENVS+LZeerXn1F344HIP8VhLpWSjLAKgfMUCuvoTEqNaR4I90w1PAG0uRslYouTuxOA3VOCnf75FW7b4ZuBw1y2rmWcz9Rm5M4tz3EQCeX8v+AIKd6QQU0gFSytcelQtBVqu0YjnnL5Lp+fcKw3BJO+QQXk+OyYqGuP9WQfPPki2tEDHJ9rHcPD3l+w== users/azul/azul_ssh.pub
-      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== users/elijah/elijah_ssh.pub
-      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== users/micah/micah_ssh.pub
-      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= users/varac/varac_ssh.pub
-  known_hosts: "couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9"
-  port: 22
-tags: 
-  - local
-x509: 
-  ca_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt
-      YXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v
-      Yml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw
-      FgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV
-      BAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-      ggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai
-      dHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB
-      7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84
-      CA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+
-      znCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4
-      MEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4
-      lPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0
-      bQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl
-      DEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB
-      lfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy
-      YMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw
-      XjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE
-      MAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w
-      DQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl
-      cXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY
-      k/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj
-      RnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG
-      htD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX
-      EIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J
-      aF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l
-      mlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK
-      G6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co
-      Ja8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d
-      69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e
-      yV8e
-      -----END CERTIFICATE-----
-  cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIFMDCCAxigAwIBAgIRAIWTs7uEyJH0NrsDFAk3c1QwDQYJKoZIhvcNAQELBQAw
-      SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
-      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTEyMTIxMTAwMDAwMFoXDTEz
-      MTIxMTAwMDAwMFowIjEgMB4GA1UEAwwXY2ExX3ZhZ3JhbnQuYml0bWFzay5uZXQw
-      ggG4MA0GCSqGSIb3DQEBAQUAA4IBpQAwggGgAoIBlwDsTD0bpJZuI0Suqk1b3FZ+
-      5SfpjvBJVD0WhyOZNuvHsVDynXou3JpWENnmcBeMdRxhFeQsHxVC9Q9PUyIxrEHU
-      L2J0ne7WrzZ7TDs7375vo+uIiL3hBXAmsyHxDwc9Ywb7pPDZRL9Vxj5+xMg5KNwi
-      ilJhfbV/uWyPsMKVVoZOxRseRBu+SkhbVKl5PyU9QBR7CJjDzNPXnJmsP9atke8K
-      xmFLTRyUcB2AhVyXapaq294jbQrx4RFg3Kx5SH5jHb9p/ChsSjcC2O1J5KYWYvyS
-      ZPuQfCzy5TYezFx4EVDxF4KLkBto2sI/qJey2aBzT7kfsvz0OOzMVCikmv89N4Qr
-      wBXEbvzF2Sv68Q/Z02mxRo92C3aKTY+Zo8mqn7QY77wfcCcapcGNjt+VjxHPz9wC
-      XUsDyvDciKlvBx3Gxl3LWG/spV4wngwsIXZLZnaPriVydLNFhEFMMi15hqJNK/kc
-      x9fP37G3tRv0DZGEuoILacaigi8WczonjM+XOKO92kZpnLiia1t7olKsKdi/vVMB
-      z0VDkjYJAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFKQb3TACKtXicTE4QgglP82DiWGx
-      MCYGA1UdEQQfMB2CFWNhMV92YWdyYW50LmJpdG1hc2suaYcECgUFMDALBgNVHQ8E
-      BAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAkGA1UdEwQCMAAw
-      HwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48wDQYJKoZIhvcNAQELBQAD
-      ggIBAHswntxe4tEA4D2moTU5u5HiNgrWvGyGz5Jfy5axKGLNZ6yi6aWXMn1cQYy6
-      tBEfqI4hQIOB0UOA5oLdup7FOBXaU337ZHek5jkjRXgW2tsapBumkU4Row1yvwDG
-      a2W0bEjb8D/XQ5WvDmYLETR6e63Z4zTKqUmq7T9Z7O1mg666Ar2h8vo5T5eWSN87
-      6AbTRk8NNMm9JS6gxGDrLOJrJQsSTPuaDxd4jPt5KiuKOC1Ee0Gq5ZIT+IHlX/Zr
-      fuNk1Npm+VnqH04NQlRaFh7q8ntWXattHHXd9In/Q2w4AFucZo2ZSzwgvYSPeUnO
-      +7cubCLwqh06YLvgy1DQJDza3/0sCwctoS8QE6CoTA7veO4fCQLW+MDT4jLtpLSA
-      mMlpyDBkCnWOowld/yacbOzqhGxor/Y/YbVHBE0lW6jGRNbQi4W1eTG6hdpAyEoY
-      f4BzR7dgvs0JuEijPLxBHlIFVUjzTV7MDovwyaPQN6CQiQgzbl0jHNDWevYqJnxX
-      FZPCRAxHDFATVdP8ufG7DdH+v/eHqJe0sdNhxaGkcDJ1ckgo5zbNjF4CuRetvzwO
-      jX1PVfhNDDB4VwHDXkM+92hgvC0TvIwvt6DKUdA2tNTKkkKAwpclfM+NjhjS4sSe
-      k89Wi/f/8wJc92HypTMfy/EasPkf/hSwsiERiQIk/no6XE6U
-      -----END CERTIFICATE-----
-  key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      MIIHSAIBAAKCAZcA7Ew9G6SWbiNErqpNW9xWfuUn6Y7wSVQ9FocjmTbrx7FQ8p16
-      LtyaVhDZ5nAXjHUcYRXkLB8VQvUPT1MiMaxB1C9idJ3u1q82e0w7O9++b6PriIi9
-      4QVwJrMh8Q8HPWMG+6Tw2US/VcY+fsTIOSjcIopSYX21f7lsj7DClVaGTsUbHkQb
-      vkpIW1SpeT8lPUAUewiYw8zT15yZrD/WrZHvCsZhS00clHAdgIVcl2qWqtveI20K
-      8eERYNyseUh+Yx2/afwobEo3AtjtSeSmFmL8kmT7kHws8uU2HsxceBFQ8ReCi5Ab
-      aNrCP6iXstmgc0+5H7L89DjszFQopJr/PTeEK8AVxG78xdkr+vEP2dNpsUaPdgt2
-      ik2PmaPJqp+0GO+8H3AnGqXBjY7flY8Rz8/cAl1LA8rw3IipbwcdxsZdy1hv7KVe
-      MJ4MLCF2S2Z2j64lcnSzRYRBTDIteYaiTSv5HMfXz9+xt7Ub9A2RhLqCC2nGooIv
-      FnM6J4zPlzijvdpGaZy4omtbe6JSrCnYv71TAc9FQ5I2CQIDAQABAoIBlwDJS4T/
-      CG2Rs3+t36v45jHU9bfTcg3mGdnUWBkOS0f+HGJd26MbSpg7Wy2U7cZRw+4CEpkG
-      sQ/2szZwl9xYPmrxq9AOkf/FaQtba6xGLCtZhWV/MSW4DF7myNDQPsInHDX1pyP5
-      omPwWOoiKdZ7QwCMeBMHtAQqozYFDkok18mgTq70UIblyvfqvauFezJpBC6uRLuG
-      iPWqBmCu6M8jm17saeS2NiFznjKzqmgfIRDqylRpD1o0hUu9nR9cTlJEczH9wm5Z
-      GbvVNCCoQXnA9TDfevqG+/y0BB/TA9ZFqdiu9XNNPY46SWki7TPdEZsE1SJBVSLF
-      ojhaC0mfxBMtH+9k4hQr32U/HoCGt6zLoVAcT5/ZfGIB3Xk3nN+NVCLu5WO/CaZJ
-      diVcZgubaBC1hIqT/U4pu5U30HYW0ur4rADSIaHXlWmTsYjyK1r1INuNIsKvYYOT
-      ALhEuqQXYg5e71jQjqnFmDQrLuBv3u4is2l12fDr1j6SLC6+p6EnG/cjW0LFu9uE
-      Mnmhx0T6wYrMBiayy3t2GL1VAoHMAPxPy1+zxnqx7xGqybH9BNBb/zB7Srp9PkWU
-      1lutF0ll7vzWOwFw/4vHymy+Svl2PrLlSwOjlfYAml4H6ezULJOQ0fyu1HXSRShe
-      N0oiYbZwSbcU0JiTlfflhuNxS/s0W37UU8rGOcUycNrlqR/qYC+ce9m/imQkbs/P
-      4Zt1e5mHJAhod1nEXq+2WwoBjRanjk/R7tFQL+7WgdJ2xKNlgMSdAWP6mZqfni6S
-      tae9Glx0HIgJCs0ptNWOybbTOHXvPZjGmz5e8WR8b++zAoHMAO/AhEy6Gfmp249k
-      2Fz9dbgPB4AyF0HABis/Dno+EyzmIJ0jD9oaZaw2R/uP63s9SGzbmmbzWyIGmwbK
-      yxLn1g30KAEVgQQNEHC6FPIe5FDpAD6CeMDpZwUTeH/1uAk8PWQaUzl14QiFTb8j
-      LKx5517NuHQuDlMgNNOj69r0ZNhP3SA28yb0+vzSI5fO6XtOIjTmnNTlIecJsODu
-      HyXT4Ul00aKPe92AJT8I+KkBH2K0RAFCuR1Oo/dq2wMmDzIWI6FUFK7pyxchgwVT
-      AoHMAMP06Ru70POry+Ppw9ojiyCTwp8RslkiOkHqNY1f4k0UCMd/TrZw31fdZF6O
-      cEZMyqdAI8GAxFAZ6coL1Wck5jX5bM0Vr1aOZz3R5pkCGOeLUAUL+nH1dazhK6Dr
-      djp0UHcxSp6a03VPFo07ft2VtvxjSWE1PLNIBHQLnMmTNdpoNdj94Wvrcip/szcT
-      O1OT8JgXkKYp5ABXwt4FdfT9OUP6OIFAuRl4zG6ZbNIIsTeKyjnw492xfYu66PjA
-      FQKrOyizXxDSxiHn7zu3AoHLPUEKjC/gAxGKrxAs11VKhkQQvogNuRa+fL4XjNPf
-      QlFpc7xJiIfGAkG8EmGq4Em//0/8GuGCHydg5FNbnvDsl5QRxHUiCU7tLF/eih2q
-      Z6GgFlhvUZpQX9Ohrc+xvWpOpQy0xrF/VRX5zyPFfiuHGYml3skFj+dil9ABqmdW
-      fI2rCVgAt6tPlNh7j4Wl0YMc6jchSqNgDg9DybQM8TU5EfNuvAG8u9LJsVkxbryC
-      sE0uMsRBV2OIMOZ0HlHTABD3+Xfp8OZ6pOZC+1ECgcwAwotjFrwHBPquC1+y7GO+
-      saHZCti4FFDoCAVuqgJ8qC8orgdSe0Pj/zvMPrrDLFMtGG9Bimnsgyj4w6BuahsB
-      e6ObvX5jaWzdb2Mh/5JQUoMC6FMXG0XR2z3QuP9RvkDgnAxFTafXMadsiqFv/wL0
-      H9nPLEt6Zq73GCRL44sMHbDEZRFYIDUC7cKsAw7QRnNGsa4boew6GKGeAJCw8X3G
-      OsbMk+8+PrwwEFXz5WGlWFO8WM/HbIuPCquc8knLoFZDF29jsr7pgMG7X6M=
-      -----END RSA PRIVATE KEY-----
-  use: true
diff --git a/provider/hiera/couch1.yaml b/provider/hiera/couch1.yaml
new file mode 100644
index 0000000..b9a6d3b
--- /dev/null
+++ b/provider/hiera/couch1.yaml
@@ -0,0 +1,145 @@
+--- 
+couch: 
+  users: 
+    admin: 
+      password: zyMM7LZMjGE2aUvJ5sH_8SraPuxB2H5L
+      username: admin
+    ca_daemon: 
+      password: nFdNr2AYEKTwLe_tcFdFKN_vVBsWagvd
+      username: ca_daemon
+    webapp: 
+      password: 4xWQcf7C9ACY3rRkf4AajLF2CSMWLLTz
+      username: webapp
+dns: 
+  public: false
+domain: 
+  full: couch1.bitmask.net
+  full_suffix: bitmask.net
+  internal: couch1.bitmask.i
+  internal_suffix: bitmask.i
+  name: couch1.bitmask.i
+hosts: ~
+ip_address: "10.5.5.44"
+local: true
+name: couch1
+service_type: internal_service
+services: 
+  - couchdb
+ssh: 
+  authorized_keys: |
+      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2rpPukC7v43Q9RvYgxAx1aDsem7+eZvvSKR+Uvkb0yRvI4h56eds1Cj0pOFOCinjIMyw+LkrhcubWDtFYzC1yTHUUcjSoIi2M+TurQZdTkMnsg2u34U61+EjOPb2jYdxBwUu9e/wDRGqih7FjFYCsHFMPH1ENVS+LZeerXn1F344HIP8VhLpWSjLAKgfMUCuvoTEqNaR4I90w1PAG0uRslYouTuxOA3VOCnf75FW7b4ZuBw1y2rmWcz9Rm5M4tz3EQCeX8v+AIKd6QQU0gFSytcelQtBVqu0YjnnL5Lp+fcKw3BJO+QQXk+OyYqGuP9WQfPPki2tEDHJ9rHcPD3l+w== users/azul/azul_ssh.pub
+      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== users/elijah/elijah_ssh.pub
+      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== users/micah/micah_ssh.pub
+      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= users/varac/varac_ssh.pub
+  known_hosts: ~
+  port: 22
+tags: 
+  - local
+x509: 
+  ca_cert: |
+      -----BEGIN CERTIFICATE-----
+      MIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt
+      YXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v
+      Yml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw
+      FgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV
+      BAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+      ggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai
+      dHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB
+      7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84
+      CA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+
+      znCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4
+      MEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4
+      lPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0
+      bQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl
+      DEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB
+      lfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy
+      YMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw
+      XjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE
+      MAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w
+      DQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl
+      cXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY
+      k/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj
+      RnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG
+      htD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX
+      EIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J
+      aF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l
+      mlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK
+      G6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co
+      Ja8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d
+      69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e
+      yV8e
+      -----END CERTIFICATE-----
+  cert: |
+      -----BEGIN CERTIFICATE-----
+      MIIFJjCCAw6gAwIBAgIRAPWLCpZJmrD7NtpgwQRYfB0wDQYJKoZIhvcNAQELBQAw
+      SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
+      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTEyMTIxNzAwMDAwMFoXDTEz
+      MTIxNzAwMDAwMFowHTEbMBkGA1UEAwwSY291Y2gxLmJpdG1hc2submV0MIIBuDAN
+      BgkqhkiG9w0BAQEFAAOCAaUAMIIBoAKCAZcAp+s0KN3cOcF+0wIA3SwgIU3KAJQy
+      asE8O1/kTak6kUVrOJKKqCpiWeLcpjQmXipxkI+k0G96st6+4zRdgRTy6RptSTD2
+      BeYlc+LhAxUpptsxo2aziNwmIjFbbs4ZBddKu1yf1tn2PwcXTfWNQXy/JSiKK+h6
+      CaaynRMh8Xk2t/7XCM6LgN+GvUIIVVqIxW1Xuy09YRRb94Q7Br+87MgoLBFMg9t8
+      KpxP2RdMeDDnUjd/yUGeqxgIYyIlYlAwpWhUt5aoO2c7pQXnSKOo108SdYANpcB1
+      sZRej7MHe9VzwiW9TpY1T8edCjzYBlwxQ5++oFvp7ltQjO/MYDTHGpnzKuUw5SSf
+      dlfsIaoVUAqgHYjUmy6nig8MgmBpvDqNAan4+6EQ74kHEndo6qCjfYVJ+UGqej4e
+      OcXbxiOz89MRy8z/I6oGHb7Advf8UZeQX07aYBceVnGMvucWvw780pqFDWmTMMc8
+      ZQ5TIpdW33dGu6YAtslVjKk22RJb/ITGgiCX9999VuUfVvOIyjR/nn5NSmWv6pNH
+      /QIDAQABo4GdMIGaMB0GA1UdDgQWBBQNB1ox/tn/jrCfD5NaIYTnW5eWazAhBgNV
+      HREEGjAYghBjb3VjaDEuYml0bWFzay5phwQKBQUsMAsGA1UdDwQEAwIFoDAdBgNV
+      HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAW
+      gBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEARV+Dl88u
+      ueMv792ZodchkIc7w7yo82yzHbUJfxXj/TA8QN86PY3PzmZ8FBCyqboiXIqxuOsC
+      5Tax2fEPifU4zsV52figElEKhg6dgexbDIFJ6Yr4mfS6gNbXO9j5g3IjZ8UMfAWT
+      m/3yy4q0zmCpdNCC8FArsd/BS78TpTuu/ysB7yD1hjADV/BZLP8vP4F3V/4+D2rO
+      4+a1+mB+blBV7x/92/NevBOYc9V2J1uwQ3f1V7MbdBWYhZePgtO3nAZFUvRWas9R
+      Y7tLLAorUj/z7DdgN03c/noRgovhYjgcopSCRxFFVaVfhEBmWO5chfVhiSQes2H0
+      +akm300VMunoi7oMg2TZ+areGtFyd9i+9E5q/HUs5jLHCyXhNauycntWyMIfiiff
+      4w3govwaT9L+TfknW5dcQq2QzOZJgWttlsw6gQFwi747dllHhEKRlvoeI1tbMpKp
+      qOub+KctTSMjjYDYonJmUbZ0F2BtNwIlQdhqJ9TKUXOkjdy6D34sbtq7euYUmVej
+      8uCypP9Spb5RmldBokGGAVBUOukq5IdyX5nUZTKtwU/9zx2fSaI5TaUsxYiHWtQs
+      YzJYykIhn6fck3HKpPJx9nbwGkFbLuhP6km/HSoi3OTnlnRlmhyK53blqEZy7I59
+      ZJduH1rtHsWJEjjDrTR4MjJZHjY1hxb0KJ8=
+      -----END CERTIFICATE-----
+  key: |
+      -----BEGIN RSA PRIVATE KEY-----
+      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
+      -----END RSA PRIVATE KEY-----
+  use: true
diff --git a/provider/hiera/couchdb1_vagrant.yaml b/provider/hiera/couchdb1_vagrant.yaml
deleted file mode 100644
index 8dc425e..0000000
--- a/provider/hiera/couchdb1_vagrant.yaml
+++ /dev/null
@@ -1,145 +0,0 @@
---- 
-couch: 
-  users: 
-    admin: 
-      password: zyMM7LZMjGE2aUvJ5sH_8SraPuxB2H5L
-      username: admin
-    ca_daemon: 
-      password: nFdNr2AYEKTwLe_tcFdFKN_vVBsWagvd
-      username: ca_daemon
-    webapp: 
-      password: 4xWQcf7C9ACY3rRkf4AajLF2CSMWLLTz
-      username: webapp
-dns: 
-  public: false
-domain: 
-  full: couchdb1_vagrant.bitmask.net
-  full_suffix: bitmask.net
-  internal: couchdb1_vagrant.bitmask.i
-  internal_suffix: bitmask.i
-  name: couchdb1_vagrant.bitmask.i
-hosts: ~
-ip_address: "10.5.5.44"
-local: true
-name: couchdb1_vagrant
-service_type: internal_service
-services: 
-  - couchdb
-ssh: 
-  authorized_keys: |
-      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2rpPukC7v43Q9RvYgxAx1aDsem7+eZvvSKR+Uvkb0yRvI4h56eds1Cj0pOFOCinjIMyw+LkrhcubWDtFYzC1yTHUUcjSoIi2M+TurQZdTkMnsg2u34U61+EjOPb2jYdxBwUu9e/wDRGqih7FjFYCsHFMPH1ENVS+LZeerXn1F344HIP8VhLpWSjLAKgfMUCuvoTEqNaR4I90w1PAG0uRslYouTuxOA3VOCnf75FW7b4ZuBw1y2rmWcz9Rm5M4tz3EQCeX8v+AIKd6QQU0gFSytcelQtBVqu0YjnnL5Lp+fcKw3BJO+QQXk+OyYqGuP9WQfPPki2tEDHJ9rHcPD3l+w== users/azul/azul_ssh.pub
-      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== users/elijah/elijah_ssh.pub
-      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== users/micah/micah_ssh.pub
-      ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= users/varac/varac_ssh.pub
-  known_hosts: ~
-  port: 22
-tags: 
-  - local
-x509: 
-  ca_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt
-      YXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v
-      Yml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw
-      FgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV
-      BAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-      ggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai
-      dHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB
-      7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84
-      CA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+
-      znCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4
-      MEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4
-      lPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0
-      bQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl
-      DEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB
-      lfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy
-      YMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw
-      XjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE
-      MAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w
-      DQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl
-      cXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY
-      k/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj
-      RnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG
-      htD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX
-      EIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J
-      aF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l
-      mlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK
-      G6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co
-      Ja8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d
-      69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e
-      yV8e
-      -----END CERTIFICATE-----
-  cert: |
-      -----BEGIN CERTIFICATE-----
-      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
-      -----END CERTIFICATE-----
-  key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      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
-      -----END RSA PRIVATE KEY-----
-  use: true
diff --git a/provider/hiera/vpn1_vagrant.yaml b/provider/hiera/vpn1.yaml
index 9827088..1b721ea 100644
--- a/provider/hiera/vpn1_vagrant.yaml
+++ b/provider/hiera/vpn1.yaml
@@ -2,16 +2,16 @@
 dns: 
   public: true
 domain: 
-  full: vpn1_vagrant.bitmask.net
+  full: vpn1.bitmask.net
   full_suffix: bitmask.net
-  internal: vpn1_vagrant.bitmask.i
+  internal: vpn1.bitmask.i
   internal_suffix: bitmask.i
-  name: vpn1_vagrant.bitmask.net
+  name: vpn1.bitmask.net
 hosts: ~
 interface: eth0
 ip_address: "10.5.5.45"
 local: true
-name: vpn1_vagrant
+name: vpn1
 openvpn: 
   adblock: false
   filter_dns: true
@@ -75,34 +75,34 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
+      GKb26e3kwgpBwVagSNl+BnXQ7eSLMQ==
       -----END CERTIFICATE-----
   dh: |
       -----BEGIN DH PARAMETERS-----
@@ -118,44 +118,44 @@ x509:
       -----END DH PARAMETERS-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
diff --git a/provider/hiera/web1_vagrant.yaml b/provider/hiera/web1.yaml
index a1a1476..659f160 100644
--- a/provider/hiera/web1_vagrant.yaml
+++ b/provider/hiera/web1.yaml
@@ -68,19 +68,19 @@ definition_files:
       }
 dns: 
   aliases: 
-    - web1_vagrant.bitmask.net
+    - web1.bitmask.net
     - api.bitmask.net
   public: true
 domain: 
-  full: web1_vagrant.bitmask.net
+  full: web1.bitmask.net
   full_suffix: bitmask.net
-  internal: web1_vagrant.bitmask.i
+  internal: web1.bitmask.i
   internal_suffix: bitmask.i
-  name: web1_vagrant.bitmask.net
-hosts: "10.5.5.44    couchdb1_vagrant couchdb1_vagrant.bitmask.i couchdb1_vagrant.bitmask.net"
+  name: web1.bitmask.net
+hosts: "10.5.5.44    couch1 couch1.bitmask.i couch1.bitmask.net"
 ip_address: "10.5.5.47"
 local: true
-name: web1_vagrant
+name: web1
 service_type: public_service
 services: 
   - webapp
@@ -90,13 +90,13 @@ ssh:
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== users/elijah/elijah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== users/micah/micah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= users/varac/varac_ssh.pub
-  known_hosts: "couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9"
+  known_hosts: "couch1,couch1.bitmask.i,couch1.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9"
   port: 22
 tags: 
   - local
 webapp: 
   couchdb_hosts: 
-    - couchdb1_vagrant.bitmask.i
+    - couch1.bitmask.i
   couchdb_user: 
     password: zyMM7LZMjGE2aUvJ5sH_8SraPuxB2H5L
     username: admin
@@ -140,35 +140,34 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      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
-      b0skukhFaw==
+      MIIFMjCCAxqgAwIBAgIQGJkppW19drBJwQdr4YDD3DANBgkqhkiG9w0BAQsFADBK
+      MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
+      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTIxMjE3MDAwMDAwWhcNMTMx
+      MjE3MDAwMDAwWjAbMRkwFwYDVQQDDBB3ZWIxLmJpdG1hc2submV0MIIBuDANBgkq
+      hkiG9w0BAQEFAAOCAaUAMIIBoAKCAZcAvy7oEccrJcWh9OY6DPOU44s/cf5Gzrfd
+      PjVHxRB60jDwmsAQmLFGwAipstBeq9cIJgDyjf6FfWmihZkTM9kDgngtrNJ0lqrk
+      Gj9y1VRgAtx1uvQMyKTIzcCayhxVbxC0TWONLsP6QKmvhLOynWt+ZqXJfJerlCM4
+      4m6Lzd8v4RiCp4u8P2mPPSH+XvvYoco9BsS9xBc35uVrA6815cX7ZVNb/G+0plOH
+      hga3yTLctZNKjlX1eAr7d/xrik5T943jlhCQRWVKmbztXffBCr6p9v7lWrV9fhZG
+      c1OODA42O4VSJNCZRUkQOvdBonKOD8uV3oxsxUw+sZM1aXsHStF6Oy8JflT+5o/y
+      I3rJ+43fgRqu28oDpH1xaGzdunm4eUDfTyzcrDmJXx2vV5+4wZwZaJl1rhMI/PXI
+      W0luDPfMX2G17TfjgOtdM+L1IjEMB+Y+I2czkMeMyiSpIEf/2I3vQWPdRWXKEji3
+      2zA2VWyh1d4xoURioR1xxjDuflY3oOFJawYBf1fOZZd0w99vgTK5olHfM53/rQID
+      AQABo4GsMIGpMB0GA1UdDgQWBBQBRXT6o1p21xUyEzwUW2dWhFmJZTAwBgNVHREE
+      KTAngg53ZWIxLmJpdG1hc2suaYIPYXBpLmJpdG1hc2submV0hwQKBQUvMAsGA1Ud
+      DwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIw
+      ADAfBgNVHSMEGDAWgBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsF
+      AAOCAgEAQLhHtWj/fYF747Jq33orNKF6VlZ+JowGR15ByS5bBLkwN6IZOgS64dKY
+      axLbR3XSDHflfzqA7wDCo06I32XUNdtxiiOvgw16JlvgWu20gBU5NCjQI7mvnrcX
+      ox9RJ4vfmXG1t/PemLodBm77LPLJ8tUTZNQRV5MF3+dPdSmNSp+1/JWhz9/5Oc8z
+      PYuBZifD/LId//rz6PKOaraFzqxxfVuQ+XG0zg4r6BR49N8HxHNK3TRlmYHad+te
+      Ok0P8HUzusJIkZBpX3cJLJponVHbufM2WjGUJF1UpB8yLhDgxiaR4auzUJwxYDhs
+      0srRGf1tIBVeOYbvs5HnBfJv6VB9/Co6JCQ5aAH06NmqMyxUO1uUpkMScp6gwM3a
+      x8TEjiOkgo2WJ3nSJoa490XTfTkgj206N49cru33TBhMt20KqtHvUk8pJwK63jJt
+      GvOZl+bfm2saJdilSUWzM5/U+OLMMjhVqDqz9dpm2t1YXQj+0YfQhCwLkaEnpEnQ
+      FnrA5RgY63FaOuN9JjHTQDDGxyiW/OWgUQmFw22U6GI8gFD7jyzvLuXjo0qLL5Ta
+      6w2SBdwml29vWQeS1/E/j0KD5b5cfhWDi/7iY9YGDmHZ27GRIg2qpaNomOZ/9x+2
+      iZ0OkDEkw19ToVAjCoB8yO4RXAPkl6GtlGyKB5uxdkUfN+/eR6c=
       -----END CERTIFICATE-----
   commercial_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -277,44 +276,44 @@ x509:
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      MIIHRgIBAAKCAZcAvy7oEccrJcWh9OY6DPOU44s/cf5GzrfdPjVHxRB60jDwmsAQ
+      mLFGwAipstBeq9cIJgDyjf6FfWmihZkTM9kDgngtrNJ0lqrkGj9y1VRgAtx1uvQM
+      yKTIzcCayhxVbxC0TWONLsP6QKmvhLOynWt+ZqXJfJerlCM44m6Lzd8v4RiCp4u8
+      P2mPPSH+XvvYoco9BsS9xBc35uVrA6815cX7ZVNb/G+0plOHhga3yTLctZNKjlX1
+      eAr7d/xrik5T943jlhCQRWVKmbztXffBCr6p9v7lWrV9fhZGc1OODA42O4VSJNCZ
+      RUkQOvdBonKOD8uV3oxsxUw+sZM1aXsHStF6Oy8JflT+5o/yI3rJ+43fgRqu28oD
+      pH1xaGzdunm4eUDfTyzcrDmJXx2vV5+4wZwZaJl1rhMI/PXIW0luDPfMX2G17Tfj
+      gOtdM+L1IjEMB+Y+I2czkMeMyiSpIEf/2I3vQWPdRWXKEji32zA2VWyh1d4xoURi
+      oR1xxjDuflY3oOFJawYBf1fOZZd0w99vgTK5olHfM53/rQIDAQABAoIBlmo1bMcz
+      lkzNlkOvAuDfEP+4A+8YC84bZtWAU/auSQ0sEv5lZNLu6RcVuPCVwYJFW0mBjT5E
+      /3PEk30UpQ5QqRp6GSXBZPOuzDmoteq9jPkJ8H2DxvZQVR24ukU9qFijNwcnHu+z
+      //qcSd221quNZBMyVtTYjYEmcBuaviAItViffTYG8vVndyPHFsE9uANpjq2L7sBZ
+      Bb1IBkNtusuDST3pKVj71afxD4DtinxDvUlCIlEgf9XIhBsMJ9IV4Z/NO3nKiduD
+      ggYWZuekHHr10Xf7nX0Tk7sbM0lci7HAgEkWFEmmFzhRh+BJ6UtpMWyJZGXj/qqP
+      +e8RlZSk87V4XUWjngeccHq48p8fvvb9Y1xUbDc8GeiRDMFLTM135qI/BOHjPJzz
+      nKAxzGFGqzGMKCx3DWNC8qBx7AJypimyPSnrVA8UuAcsF99x8CM2l69bZNhGZcaq
+      MMxZskwFXys4+pIEq2MFCJ1U2rFSKvNEQ/pXWm5xGirZqv+k6pwCNyrImGbHI5HL
+      Hdr3LdSyTg6GBR88vNakzSECgcwA9aMLxE4m3kpVjZlyQy9uglgQRb0M1S5wR8rk
+      OYptXyY1Gy1ya5kGpocYFs0FzFEkR9stQBmp3dNWjDIaShynBdRRU8cZPay1+E03
+      eLotl12KsFnI8D5SzCVTBUo9pM+vzQbqZg87o1HpOlNuymDNpZzTzKS8W76WZ1Ia
+      lwl5MN48+A2Kjw6aN9yAc3OSl8lDrFpT0c/dnkcbNECdiayI1plkrWha1oB+6Wve
+      Y3VlYkPWyRQ2M0NdVyxBcTWXyTIEGIaPFMETWszWt/sCgcwAxz++go9h6uCNuFN2
+      oRMR1667J5v1N0TUhwpkYyLw+3rQ9k2n93tLza2lshvvbIny5i0frfdwG1UUqq5R
+      cvsqobx/PlAHkdcZUuqExEtM9RMK51Ay3QC08v5gdTRUrKA3YofY87I/xTy3aCX6
+      yEiur6gqBp5nfW9QfUfRgxbTL0aMx7csHzh/XrovMifAfBCXrqwgiUGag8p7GsfH
+      rNEhPZuiw44dkE0Slv5RaLPMUcbeBjlq/mvWt/yxyf27GBuPJ/J0QTjCHeNATncC
+      gcwA1ylQn01Nop0+P2BPxCYCCM6Wwl+MpBefZmOEchqdHyFal0nB1hoexzPCmAZS
+      s9vHieGky2cvcg0y3G7utEhQzTxjWJ0nsOxeIPeSRX/fe50GZN7gsgAFiqiPBi03
+      vevmNBOAspFZTf/r6Zk3jLIqsIykwbby/vH80NgMToyPyYyBn05NNm42DARrx7VO
+      jQJQ8uHUVg5cM85ZN/X5iKTG4CNRGswz9Xxsro48KKamfeKqe0vnBhRV6Ivtbvrg
+      z+2txMXpAub0yy5uTo0Cgcst3LlQOgqy0p8sV2HN76LCv4BqvJYz847rynOS8h7/
+      86QXnYZVC7dGD3s9RPrWQ+Z6HtbU50iRsgLAysEKs097zPSI9kjXw+gbUsnemOqM
+      2qY+2hHrFtePuwee0r3Owk4dSuGgLl5JWxFoUp2n7jrvScjqnxl5IN8pBxftkZpo
+      nleXPM1WHl4LAtYMOGQw6mzPkuUmUshrH3c4kdWfLL/2+1T6qEKbzXHC+aTpccFM
+      7XZ7fknnaBETZoHR2apwAR/xdPhXbuYXlRBfPwKBy1t9f5FtHPEftM10XaXX/yca
+      UlV+0OZM7anwKiPHYsLxPJ3vLFLu+vGY3KsO3k4Y/cLS6T7cGXxW05rsFeTHbbJr
+      NShxu1IVKPtJEGGg9a3WAfVTyKKh9Sd3yWfTZCxt8kPyQes5BnNe9tl/E3m1RsX8
+      r6yVuN1iMuUeVlMDeRs+RM3ENxK7Babp3DDaNBhg41fea6ngv4288D9A25k6B7Ja
+      yRBLwplpfYuKZFpiq5ZBRI3ymC/vVgCadRbLiNgHPi0bIgCp3nAXSQ1h
       -----END RSA PRIVATE KEY-----
   use: true
diff --git a/provider/nodes/ca1_vagrant.json b/provider/nodes/ca1.json
index a4ea563..a4ea563 100644
--- a/provider/nodes/ca1_vagrant.json
+++ b/provider/nodes/ca1.json
diff --git a/provider/nodes/couchdb1_vagrant.json b/provider/nodes/couch1.json
index 4b1dde1..4b1dde1 100644
--- a/provider/nodes/couchdb1_vagrant.json
+++ b/provider/nodes/couch1.json
diff --git a/provider/nodes/vpn1_vagrant.json b/provider/nodes/vpn1.json
index 12e01d6..12e01d6 100644
--- a/provider/nodes/vpn1_vagrant.json
+++ b/provider/nodes/vpn1.json
diff --git a/provider/nodes/web1_vagrant.json b/provider/nodes/web1.json
index 689ce62..689ce62 100644
--- a/provider/nodes/web1_vagrant.json
+++ b/provider/nodes/web1.json