clean up openvpn and x509

2 files changed, 24 insertions, 194 deletions

diff --git a/provider/hiera/aligator.yaml b/provider/hiera/aligator.yaml
index a4e2063..027a731 100644
--- a/provider/hiera/aligator.yaml
+++ b/provider/hiera/aligator.yaml
@@ -13,103 +13,6 @@ local: false
 name: aligator
 openvpn: 
   adblock: false
-  ca_crt: |
-      -----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-----
-  ca_key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      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
-      -----END RSA PRIVATE KEY-----
-  dh: |
-      -----BEGIN DH PARAMETERS-----
-      MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb
-      p6nz2rYVMBdFWH8aiR5PZnByu2XKm6WUCLpYfWyGWr2FkQoCNCeqVkuxxTOf6Pol
-      T6JKJmRClsg/v3nffptoYvzvbLwRJu2lsiRGRUK/TvjJtOl0UIYz0Xtc3b387lLl
-      bhFyri/TF4YzP9dS/UNDRM9yeBUTNsnSTK0fktMyXwmpB5V7viiNeXLzZ28sQUZl
-      7YmacrOtj6bXqnlYBftshAaGg24rAI1aBziflXiIqOwcUNVEs55vNV8FnLww/JDu
-      1DW9e55mOQHJCTIMfa1bp9uFGiZvxP2yaY2kgaAFYItjY9tCoWI6+vYXWH0uLIc3
-      MktM1RDPR7AJDWlu6jiUangFTIX9S0bkfLtbZIxENQWzTxiXHD2mJCBJvFxQgtw3
-      fMHUS+wYpA2KwiDfcBnp3uUSAhbJTERMXTPGeQ4MFDlhdHiLGp8ux43NIG6AOWdF
-      Drr+AcevR5Iu9Sk6laUOZrYiK0FKPq07Ytn+WSKa3wIBCw==
-      -----END DH PARAMETERS-----
   filter_dns: true
   gateway_address: "176.53.69.121"
   location: "Location Unknown"
@@ -203,6 +106,18 @@ x509:
       cK9MCNFHWPJlmnjTYblrpWfsyilIb88VNgGKa2KBUf76iFRz9SlQnVYTOMkKyxiP
       iNAwofYOepOEx2a5TJYcBqjX/A==
       -----END CERTIFICATE-----
+  dh: |
+      -----BEGIN DH PARAMETERS-----
+      MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb
+      p6nz2rYVMBdFWH8aiR5PZnByu2XKm6WUCLpYfWyGWr2FkQoCNCeqVkuxxTOf6Pol
+      T6JKJmRClsg/v3nffptoYvzvbLwRJu2lsiRGRUK/TvjJtOl0UIYz0Xtc3b387lLl
+      bhFyri/TF4YzP9dS/UNDRM9yeBUTNsnSTK0fktMyXwmpB5V7viiNeXLzZ28sQUZl
+      7YmacrOtj6bXqnlYBftshAaGg24rAI1aBziflXiIqOwcUNVEs55vNV8FnLww/JDu
+      1DW9e55mOQHJCTIMfa1bp9uFGiZvxP2yaY2kgaAFYItjY9tCoWI6+vYXWH0uLIc3
+      MktM1RDPR7AJDWlu6jiUangFTIX9S0bkfLtbZIxENQWzTxiXHD2mJCBJvFxQgtw3
+      fMHUS+wYpA2KwiDfcBnp3uUSAhbJTERMXTPGeQ4MFDlhdHiLGp8ux43NIG6AOWdF
+      Drr+AcevR5Iu9Sk6laUOZrYiK0FKPq07Ytn+WSKa3wIBCw==
+      -----END DH PARAMETERS-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIHRgIBAAKCAZcA1EAMEQRhtaiBJ3fPCWOt8KucK4T5DdNtM4V9gvmctNqztdrs
diff --git a/provider/hiera/vpn1_vagrant.yaml b/provider/hiera/vpn1_vagrant.yaml
index e361555..e41c7d5 100644
--- a/provider/hiera/vpn1_vagrant.yaml
+++ b/provider/hiera/vpn1_vagrant.yaml
@@ -13,103 +13,6 @@ local: true
 name: vpn1_vagrant
 openvpn: 
   adblock: false
-  ca_crt: |
-      -----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-----
-  ca_key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      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
-      -----END RSA PRIVATE KEY-----
-  dh: |
-      -----BEGIN DH PARAMETERS-----
-      MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb
-      p6nz2rYVMBdFWH8aiR5PZnByu2XKm6WUCLpYfWyGWr2FkQoCNCeqVkuxxTOf6Pol
-      T6JKJmRClsg/v3nffptoYvzvbLwRJu2lsiRGRUK/TvjJtOl0UIYz0Xtc3b387lLl
-      bhFyri/TF4YzP9dS/UNDRM9yeBUTNsnSTK0fktMyXwmpB5V7viiNeXLzZ28sQUZl
-      7YmacrOtj6bXqnlYBftshAaGg24rAI1aBziflXiIqOwcUNVEs55vNV8FnLww/JDu
-      1DW9e55mOQHJCTIMfa1bp9uFGiZvxP2yaY2kgaAFYItjY9tCoWI6+vYXWH0uLIc3
-      MktM1RDPR7AJDWlu6jiUangFTIX9S0bkfLtbZIxENQWzTxiXHD2mJCBJvFxQgtw3
-      fMHUS+wYpA2KwiDfcBnp3uUSAhbJTERMXTPGeQ4MFDlhdHiLGp8ux43NIG6AOWdF
-      Drr+AcevR5Iu9Sk6laUOZrYiK0FKPq07Ytn+WSKa3wIBCw==
-      -----END DH PARAMETERS-----
   filter_dns: true
   gateway_address: "10.5.5.46"
   location: "Location Unknown"
@@ -203,6 +106,18 @@ x509:
       K8cucLJ8wWht25o9s32QPPDNir43t+bYPfdVUsMKLFtJb1FUWMTCfV3aSaWaRhBb
       5njsXQau0NVAH9rQNVqJ1iSgcs4qDH/EUYREZQ==
       -----END CERTIFICATE-----
+  dh: |
+      -----BEGIN DH PARAMETERS-----
+      MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb
+      p6nz2rYVMBdFWH8aiR5PZnByu2XKm6WUCLpYfWyGWr2FkQoCNCeqVkuxxTOf6Pol
+      T6JKJmRClsg/v3nffptoYvzvbLwRJu2lsiRGRUK/TvjJtOl0UIYz0Xtc3b387lLl
+      bhFyri/TF4YzP9dS/UNDRM9yeBUTNsnSTK0fktMyXwmpB5V7viiNeXLzZ28sQUZl
+      7YmacrOtj6bXqnlYBftshAaGg24rAI1aBziflXiIqOwcUNVEs55vNV8FnLww/JDu
+      1DW9e55mOQHJCTIMfa1bp9uFGiZvxP2yaY2kgaAFYItjY9tCoWI6+vYXWH0uLIc3
+      MktM1RDPR7AJDWlu6jiUangFTIX9S0bkfLtbZIxENQWzTxiXHD2mJCBJvFxQgtw3
+      fMHUS+wYpA2KwiDfcBnp3uUSAhbJTERMXTPGeQ4MFDlhdHiLGp8ux43NIG6AOWdF
+      Drr+AcevR5Iu9Sk6laUOZrYiK0FKPq07Ytn+WSKa3wIBCw==
+      -----END DH PARAMETERS-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIHRQIBAAKCAZcAljxvke/E26+KeVNBTwufPaf5ndLJk1Y7C2Q+3ml+EemiwlKR