Updates x509, miami tag

6 files changed, 76 insertions, 65 deletions

diff --git a/files/cert/bitmask.net.crt b/files/cert/bitmask.net.crt
index d213ef3..5f7a852 100644
--- a/files/cert/bitmask.net.crt
+++ b/files/cert/bitmask.net.crt
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIGTDCCBTSgAwIBAgISA2ATH6eSGruMGnTcLXUSJ7K+MA0GCSqGSIb3DQEBCwUA
+MIIGTTCCBTWgAwIBAgISA23GER91n2bctCd/sRK0CYJ+MA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODEyMjQwOTA2MDNaFw0x
-OTAzMjQwOTA2MDNaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTAzMjYxNjQyMDRaFw0x
+OTA2MjQxNjQyMDRaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
 9w0BAQEFAAOCAg8AMIICCgKCAgEAp7bmYyi5KdLAcnEndZUCVoJw19cZgaDwJb/I
 R1fuHhHkp98J9VPM+vke/8TElLHvdgfNWN1SpCM3uMFtdX6FS2Z4E2MchKp0o7H/
 0CkmEF/ybcNP3MdubTGtutRKkIm8MIqyOZIPNomh9Apwx+HfLi9S+/3hx1UTbelp
@@ -14,25 +14,25 @@ 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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/files/cert/demo.bitmask.net.crt b/files/cert/demo.bitmask.net.crt
index e5aa5a9..0740dd2 100644
--- a/files/cert/demo.bitmask.net.crt
+++ b/files/cert/demo.bitmask.net.crt
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIGWjCCBUKgAwIBAgISAzquQHe9cFVmLeDG8HCPCivNMA0GCSqGSIb3DQEBCwUA
+MIIGWDCCBUCgAwIBAgISAx9eI8psfs0dKsaNl88on6ptMA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTAyMDUwMzU5MjRaFw0x
-OTA1MDYwMzU5MjRaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTAzMjYxNjQ3MzBaFw0x
+OTA2MjQxNjQ3MzBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
 CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a
 qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT
 ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV
@@ -14,25 +14,25 @@ mdARcsSX0Mxw4WlS68nx8ZfcAcg+uE3mcR0kEvQ6EuKiB84EdgFqZm75RJZd9tAD
 0Sp8cvEDtZ1Y/3M048WTFn7J3F/xkl8fmz+b+RgYbEAxb3DCKPjbAQV1c11NYMdj
 fxi0kJIbbjZzqqT6AZijcfEinxoVh9eaYVlnKefTXXumO8+G9HmgET+pTPOhg0xT
 utqfP46QNd89gLQaNQik/xvtRxujGkvhm5TPF0YWtD8pr6JZK7V9ENBFqjy+1fID
-5cQwb5sJzzbfYQIDAQABo4ICZzCCAmMwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+5cQwb5sJzzbfYQIDAQABo4ICZTCCAmEwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
 MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQ5
 AmOl5jUq83up0czS1eGi1ArFtTAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv
 86jsoTBvBggrBgEFBQcBAQRjMGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmlu
 dC14My5sZXRzZW5jcnlwdC5vcmcwLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0Lmlu
 dC14My5sZXRzZW5jcnlwdC5vcmcvMBsGA1UdEQQUMBKCEGRlbW8uYml0bWFzay5u
 ZXQwTAYDVR0gBEUwQzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEF
-BQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEGBgorBgEEAdZ5AgQC
-BIH3BIH0APIAdwB0ftqDMa0zEJEhnM4lT0Jwwr/9XkIgCMY3NXnmEHvMVgAAAWi8
-Bm+SAAAEAwBIMEYCIQD4awm3V+r546UmdD2wFHyHVLQ9/hT+w9qPTTqyWvqoygIh
-AJtpvohMhjVJIwUAlJf9t8uDKWi9SvN8TAYIwTqd6JBZAHcAKTxRllTIOWW6qlD8
-WAfUt2+/WHopctykwwz05UVH9HgAAAFovAZvmAAABAMASDBGAiEAwoPsK3KM4PnF
-ytbA4AJcDYZgsIgH8Rwzy97Gi+7oBtYCIQCgz3dFi4G1Rv1jgMk9Sfpj8FKGYQYq
-GCNK/Vz8O+V4GDANBgkqhkiG9w0BAQsFAAOCAQEALutB5LwdguGHWXzE6RPex4ui
-U5nh4pNuM8Fvlj1haGWW0QxHv8gkvkAIHTPOaBaE896pIfkNRCEG9QJB/uCdw2kw
-Mny/5WDIIYpM2ag9QPcYUaF/Pjj2oFSQh9avJE5FF/q8fmR+D6WuFYv8PpRV8D98
-pdPziowwRuwxex/WmqGgDMILUs7LG7r9KuCMHJu7eo/HbMrklKvjXJoRoYNNIaN7
-cMNCGNs40NbATBXeVXhPbT+q5MKQyG8Q8MHpjpMJQhFt3O05WO9uyWtCKwYEj6KB
-a+tEUVyZm2r8lhimTm6xWtcTaUdWCQQhOtzNIFTQiqMdTI/0jx7RYX0ZM3j21w==
+BQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEEBgorBgEEAdZ5AgQC
+BIH1BIHyAPAAdgDiaUuuJujpQAnohhu2O4PUPuf+dIj7pI8okwGd3fHb/gAAAWm7
+HUFZAAAEAwBHMEUCIF+Q6R71t1tOsJdZRc5wxJwcpfJL4u0zn2hQubo/FhY3AiEA
+jxWgjWWRd/pYkqua6ckFrvmqaf0nn9AgREeEToV7zbYAdgApPFGWVMg5ZbqqUPxY
+B9S3b79Yeily3KTDDPTlRUf0eAAAAWm7HUHAAAAEAwBHMEUCIQCpHNtWdz7bHa4T
+7FdXf2R/COPbeIduHNYuaQ5qykNpnwIgNZBMPIe70XZ/O9lhCQSPWby4YXuCjH+j
+IT9TtI1u8FYwDQYJKoZIhvcNAQELBQADggEBAHRHrBT4xcMBtVqzuFq8QktJUW8k
+NbR+3uE9uZqL0livCr5tTOwo8fTj4OeA9DBUU/Fu7cuUwc+kOOgKzRyp3GtP+kzy
+BnkMIaSdtgcEsa05H9pteqosvRcK+ab7McC5qWA9lLpTcpjfF3r2qaolJhmhKgUS
+/m/WdrTqKYswE5h1qpAJ1PI8o5qiIqn5R4W538A4UV6Jau4V9ItoLtFpa90Ot9B8
+GTpCWX/AoULRNQXCMXWN1Ft8WLtB+9n05Cm1OS3B/bvE0Ny4Zjg9Usy159sds9Ph
+wMxnvDBJGc0b9JVGiveLcRfms1yHIk4Fmx07TKgck1gk4U992V0VLiEfI/k=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/files/webapp/views/home/_masthead.html.haml b/files/webapp/views/home/_masthead.html.haml
index f0d8e2b..832eca0 100644
--- a/files/webapp/views/home/_masthead.html.haml
+++ b/files/webapp/views/home/_masthead.html.haml
@@ -8,4 +8,4 @@
     .row-fluid
       .span12
         .introtext.lead
-          <b>demo.bitmask.net</b> offers free service to anyone trying the <a href="https://bitmask.net">Bitmask application</a>. This provider supports VPN service. To try out email, use <a href="https://mail.bitmask.net">mail.bitmask.net</a>.
\ No newline at end of file
+          <b>demo.bitmask.net</b> offers free service to anyone trying the <a href="https://bitmask.net">Bitmask application</a>. This provider supports the VPN service. To try out email, use <a href="https://mail.bitmask.net">mail.bitmask.net</a>.
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index cbae06d..fd56355 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -563,10 +563,10 @@ x509:
   commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGWjCCBUKgAwIBAgISAzquQHe9cFVmLeDG8HCPCivNMA0GCSqGSIb3DQEBCwUA
+      MIIGWDCCBUCgAwIBAgISAx9eI8psfs0dKsaNl88on6ptMA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTAyMDUwMzU5MjRaFw0x
-      OTA1MDYwMzU5MjRaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTAzMjYxNjQ3MzBaFw0x
+      OTA2MjQxNjQ3MzBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
       CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a
       qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT
       ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV
@@ -578,25 +578,25 @@ x509:
       0Sp8cvEDtZ1Y/3M048WTFn7J3F/xkl8fmz+b+RgYbEAxb3DCKPjbAQV1c11NYMdj
       fxi0kJIbbjZzqqT6AZijcfEinxoVh9eaYVlnKefTXXumO8+G9HmgET+pTPOhg0xT
       utqfP46QNd89gLQaNQik/xvtRxujGkvhm5TPF0YWtD8pr6JZK7V9ENBFqjy+1fID
-      5cQwb5sJzzbfYQIDAQABo4ICZzCCAmMwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+      5cQwb5sJzzbfYQIDAQABo4ICZTCCAmEwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
       MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQ5
       AmOl5jUq83up0czS1eGi1ArFtTAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv
       86jsoTBvBggrBgEFBQcBAQRjMGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmlu
       dC14My5sZXRzZW5jcnlwdC5vcmcwLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0Lmlu
       dC14My5sZXRzZW5jcnlwdC5vcmcvMBsGA1UdEQQUMBKCEGRlbW8uYml0bWFzay5u
       ZXQwTAYDVR0gBEUwQzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEF
-      BQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEGBgorBgEEAdZ5AgQC
-      BIH3BIH0APIAdwB0ftqDMa0zEJEhnM4lT0Jwwr/9XkIgCMY3NXnmEHvMVgAAAWi8
-      Bm+SAAAEAwBIMEYCIQD4awm3V+r546UmdD2wFHyHVLQ9/hT+w9qPTTqyWvqoygIh
-      AJtpvohMhjVJIwUAlJf9t8uDKWi9SvN8TAYIwTqd6JBZAHcAKTxRllTIOWW6qlD8
-      WAfUt2+/WHopctykwwz05UVH9HgAAAFovAZvmAAABAMASDBGAiEAwoPsK3KM4PnF
-      ytbA4AJcDYZgsIgH8Rwzy97Gi+7oBtYCIQCgz3dFi4G1Rv1jgMk9Sfpj8FKGYQYq
-      GCNK/Vz8O+V4GDANBgkqhkiG9w0BAQsFAAOCAQEALutB5LwdguGHWXzE6RPex4ui
-      U5nh4pNuM8Fvlj1haGWW0QxHv8gkvkAIHTPOaBaE896pIfkNRCEG9QJB/uCdw2kw
-      Mny/5WDIIYpM2ag9QPcYUaF/Pjj2oFSQh9avJE5FF/q8fmR+D6WuFYv8PpRV8D98
-      pdPziowwRuwxex/WmqGgDMILUs7LG7r9KuCMHJu7eo/HbMrklKvjXJoRoYNNIaN7
-      cMNCGNs40NbATBXeVXhPbT+q5MKQyG8Q8MHpjpMJQhFt3O05WO9uyWtCKwYEj6KB
-      a+tEUVyZm2r8lhimTm6xWtcTaUdWCQQhOtzNIFTQiqMdTI/0jx7RYX0ZM3j21w==
+      BQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEEBgorBgEEAdZ5AgQC
+      BIH1BIHyAPAAdgDiaUuuJujpQAnohhu2O4PUPuf+dIj7pI8okwGd3fHb/gAAAWm7
+      HUFZAAAEAwBHMEUCIF+Q6R71t1tOsJdZRc5wxJwcpfJL4u0zn2hQubo/FhY3AiEA
+      jxWgjWWRd/pYkqua6ckFrvmqaf0nn9AgREeEToV7zbYAdgApPFGWVMg5ZbqqUPxY
+      B9S3b79Yeily3KTDDPTlRUf0eAAAAWm7HUHAAAAEAwBHMEUCIQCpHNtWdz7bHa4T
+      7FdXf2R/COPbeIduHNYuaQ5qykNpnwIgNZBMPIe70XZ/O9lhCQSPWby4YXuCjH+j
+      IT9TtI1u8FYwDQYJKoZIhvcNAQELBQADggEBAHRHrBT4xcMBtVqzuFq8QktJUW8k
+      NbR+3uE9uZqL0livCr5tTOwo8fTj4OeA9DBUU/Fu7cuUwc+kOOgKzRyp3GtP+kzy
+      BnkMIaSdtgcEsa05H9pteqosvRcK+ab7McC5qWA9lLpTcpjfF3r2qaolJhmhKgUS
+      /m/WdrTqKYswE5h1qpAJ1PI8o5qiIqn5R4W538A4UV6Jau4V9ItoLtFpa90Ot9B8
+      GTpCWX/AoULRNQXCMXWN1Ft8WLtB+9n05Cm1OS3B/bvE0Ny4Zjg9Usy159sds9Ph
+      wMxnvDBJGc0b9JVGiveLcRfms1yHIk4Fmx07TKgck1gk4U992V0VLiEfI/k=
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/penguin.yaml b/hiera/penguin.yaml
index 922e4b0..e147528 100644
--- a/hiera/penguin.yaml
+++ b/hiera/penguin.yaml
@@ -169,10 +169,10 @@ static:
           -----END CERTIFICATE-----
       cert: |
           -----BEGIN CERTIFICATE-----
-          MIIGTDCCBTSgAwIBAgISA2ATH6eSGruMGnTcLXUSJ7K+MA0GCSqGSIb3DQEBCwUA
+          MIIGTTCCBTWgAwIBAgISA23GER91n2bctCd/sRK0CYJ+MA0GCSqGSIb3DQEBCwUA
           MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-          ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODEyMjQwOTA2MDNaFw0x
-          OTAzMjQwOTA2MDNaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
+          ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTAzMjYxNjQyMDRaFw0x
+          OTA2MjQxNjQyMDRaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
           9w0BAQEFAAOCAg8AMIICCgKCAgEAp7bmYyi5KdLAcnEndZUCVoJw19cZgaDwJb/I
           R1fuHhHkp98J9VPM+vke/8TElLHvdgfNWN1SpCM3uMFtdX6FS2Z4E2MchKp0o7H/
           0CkmEF/ybcNP3MdubTGtutRKkIm8MIqyOZIPNomh9Apwx+HfLi9S+/3hx1UTbelp
@@ -184,25 +184,25 @@ static:
           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
-          fgQNYbkCAwEAAaOCAl4wggJaMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
+          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
-          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
+          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
           -----END CERTIFICATE-----
           -----BEGIN CERTIFICATE-----
           MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/tags/miami.json b/tags/miami.json
new file mode 100644
index 0000000..6124aa4
--- /dev/null
+++ b/tags/miami.json
@@ -0,0 +1,11 @@
+{
+  "location": {
+    "name": "Miami",
+    "country_code": "US",
+    "timezone":"-5",
+    "hemisphere": "N"
+  },
+  "ssh": {
+    "port": 22
+  }
+}