Support v0.14 and v1

docker.sh

@@ -5,12 +5,12 @@ set -euxo pipefail
 COMMAND=$1
 
 if [ "$COMMAND" = "login" ]; then
-   if [ -z "${CI:-}" ]; then
-      PROFILE="--profile engineering"
+    if [ -z "${CI:-}" ]; then
+      OPTS="--profile engineering --no-include-email"
     else
-      PROFILE=""
+      OPTS=""
     fi
-    $(aws $PROFILE ecr get-login --region us-east-1)
+    $(aws ecr get-login --region us-east-1 $OPTS)
     exit 0
 fi
 

fluent-plugin-splunk.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'fluentd', [">= 0.12.0", "< 0.14"]
+  spec.add_dependency 'fluentd', [">= 0.12.0"]
   spec.add_dependency 'json'
   spec.add_dependency 'httpclient'
 

lib/fluent/plugin/out_splunk_hec.rb

@@ -8,9 +8,9 @@ module Fluent
   class SplunkHECOutput < ObjectBufferedOutput
     Fluent::Plugin.register_output('splunk_hec', self)
 
-    config_param :host, :string, required: true
-    config_param :port, :integer, required: true
-    config_param :token, :string, required: true
+    config_param :host, :string
+    config_param :port, :integer
+    config_param :token, :string
 
     # for metadata
     config_param :default_host, :string, default: nil

lib/fluent/plugin/out_splunk_tcp.rb

@@ -11,8 +11,8 @@ module Fluent
   class SplunkTCPOutput < ObjectBufferedOutput
     Fluent::Plugin.register_output('splunk_tcp', self)
 
-    config_param :host, :string, required: true
-    config_param :port, :integer, required: true
+    config_param :host, :string
+    config_param :port, :integer
 
     config_param :format, :string, default: 'raw'
 
@@ -35,6 +35,13 @@ class SplunkTCPOutput < ObjectBufferedOutput
     config_param :client_key, :string, default: nil
     config_param :client_key_pass, :string, default: nil
 
+    def implement?(feature)
+      if feature == :custom_format
+        return false
+      end
+      super
+    end
+
     def configure(conf)
       super
 

test/Dockerfiles/enterprise/6.0.14/etc_ssl/auth/ca.pem

@@ -1,22 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDkTCCAnmgAwIBAgIJAPAmS3BA3WO7MA0GCSqGSIb3DQEBCwUAMF8xCzAJBgNV
-BAYTAkpQMQ4wDAYDVQQIDAVUb2t5bzEOMAwGA1UEBwwFVG9reW8xITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDENMAsGA1UEAwwEbXlDQTAeFw0xNzAz
-MDYxMTE5MjVaFw0xODAzMDYxMTE5MjVaMF8xCzAJBgNVBAYTAkpQMQ4wDAYDVQQI
-DAVUb2t5bzEOMAwGA1UEBwwFVG9reW8xITAfBgNVBAoMGEludGVybmV0IFdpZGdp
-dHMgUHR5IEx0ZDENMAsGA1UEAwwEbXlDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAL3UidGYt7j9X2iHCEIDsnNy8sQwWKgkukUmpcut+U83zPJOpfYk
-YQ2BjIQS9DhYBincPO7hktqgJrTBRJ+5bnYK68ntVSxa42uOV3BQ9QhLpL0aMH3M
-BAljmRC14SgVTemj/Dj/ufMA1JsfwtbdUW4xUmDZ9uhiJgO20i9Ac3RagJbDzXp2
-f/o/F2tu+oqSPQLzuD8FF1HOld2qlGTrfqrcRfbz2lm4y6WznBuJfwFI9qWcpTc9
-/HKrRVnPgc7Bg+3d/wHvo/umn5j0hjCk+qb7MQulGeiRllAjkkoQ1yw0viCCQksE
-VsIxD090p0lE+CfhvAzKYUcGCp8OcyTZEC0CAwEAAaNQME4wHQYDVR0OBBYEFJXY
-rZiYvWGb6fLgJbLCXjPzqvG/MB8GA1UdIwQYMBaAFJXYrZiYvWGb6fLgJbLCXjPz
-qvG/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJzxVczRnErpMZZy
-TAy62tcnU0j/OMWfuwFd7ChSNKcc4lj0kv6ocbAnzwPxYs4UWlW7wrtFjUV8IxYi
-Y6LOL2Td1EUVGANYI09pm9svDdrhlp/sZyTCPsHBZvtrl50GWjsXaM2zMEr09WM1
-6UAaHlhnlQx/eJFPtDpw+HkQop0rMuatTXtq44PXyGVMCB+3vPwiOIciJE8irR13
-dFQ9WsW9XJU/dtWdoGoznhAO7XBglZXwI+BY2ja3IxpiONgK+768oFPrMsf/2qc0
-3x3Ktng9KmSf1Oh7b0wVzAEquc+Shdv2TNtMTB2AJbfRSI7DlRALIAj51C5S+OVP
-JsoBiXU=
+MIIDizCCAnOgAwIBAgIJAKOX/fMCEYDlMA0GCSqGSIb3DQEBCwUAMFwxCzAJBgNV
+BAYTAkpQMQ4wDAYDVQQIDAVUb2t5bzEOMAwGA1UEBwwFVG9reW8xDjAMBgNVBAoM
+BVRva3lvMQ4wDAYDVQQLDAVUb2t5bzENMAsGA1UEAwwEbXlDQTAeFw0xODA0MDQx
+NTA5MjNaFw0yODA0MDExNTA5MjNaMFwxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIDAVU
+b2t5bzEOMAwGA1UEBwwFVG9reW8xDjAMBgNVBAoMBVRva3lvMQ4wDAYDVQQLDAVU
+b2t5bzENMAsGA1UEAwwEbXlDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANFUe6WZ7LwNiMaIUwfceQLBs5FcaLgEtx9S9XFBp2K6hkr60JtS4DB+5NH8
+b2CdUpKAL+wD7abN7q8gQiK/EyMq7f9hh9McBeuyy6nqe+Gsbn+JgZCRr8HqEV70
+FXiR6O+Dnd/XwriHhB12MxF4Xb3fMnVCY3lEltVEn3mcOJ4CbcvNWd3uOz4Y3qN5
+Oa5ZbOTTvWDRWV/c+eFaHHqdxO0/mKN+TpAzqCnVEZfEh7wPSYYIoIHDCROzFHox
+pok4bW+0cv6tfvEAP/FToE8rTinrD4KqCLaZg6uJPBCfA2brKwVaSwsYhB0rrMua
+b7LgFPidHWH44mmEqL2xwWnbZesCAwEAAaNQME4wHQYDVR0OBBYEFAYEbR2JnEsY
+E0zPNPZ5exSP8J7LMB8GA1UdIwQYMBaAFAYEbR2JnEsYE0zPNPZ5exSP8J7LMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFXzuxwlfAclmp56HBKpEHq1
+hFnf/S6zjz0M8UnT9C7ncVSaqbFe2rnlL9aWXzI5tU3i/BGsxd2gOo08vXemTsES
+Dc2dX+Kv9OGWJuXGiP2uQwCbMXnvjqHTx++PfcPp7oYVctIabudC7x8WvZw6BUvF
+vWijVkg0ayGDV+LvX4fjPStMPd6ZFxyFktke6i0RhylAG+fzp6C4H06kojp0dWq6
+A58Dm7F1PnZ2dqXb4BR4Ylmr3chOq/uSJPtTOnI5A7TaJYiD8CRSvQ66fRYtfFWx
+KXuse36nKrQOhjityqBZ46PFkVE6iXU5X39qpA74c3vuf8CuUw8M30QGM0IezQk=
 -----END CERTIFICATE-----

test/Dockerfiles/enterprise/6.0.14/etc_ssl/auth/cacert.pem

@@ -1,22 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDkTCCAnmgAwIBAgIJAPAmS3BA3WO7MA0GCSqGSIb3DQEBCwUAMF8xCzAJBgNV
-BAYTAkpQMQ4wDAYDVQQIDAVUb2t5bzEOMAwGA1UEBwwFVG9reW8xITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDENMAsGA1UEAwwEbXlDQTAeFw0xNzAz
-MDYxMTE5MjVaFw0xODAzMDYxMTE5MjVaMF8xCzAJBgNVBAYTAkpQMQ4wDAYDVQQI
-DAVUb2t5bzEOMAwGA1UEBwwFVG9reW8xITAfBgNVBAoMGEludGVybmV0IFdpZGdp
-dHMgUHR5IEx0ZDENMAsGA1UEAwwEbXlDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAL3UidGYt7j9X2iHCEIDsnNy8sQwWKgkukUmpcut+U83zPJOpfYk
-YQ2BjIQS9DhYBincPO7hktqgJrTBRJ+5bnYK68ntVSxa42uOV3BQ9QhLpL0aMH3M
-BAljmRC14SgVTemj/Dj/ufMA1JsfwtbdUW4xUmDZ9uhiJgO20i9Ac3RagJbDzXp2
-f/o/F2tu+oqSPQLzuD8FF1HOld2qlGTrfqrcRfbz2lm4y6WznBuJfwFI9qWcpTc9
-/HKrRVnPgc7Bg+3d/wHvo/umn5j0hjCk+qb7MQulGeiRllAjkkoQ1yw0viCCQksE
-VsIxD090p0lE+CfhvAzKYUcGCp8OcyTZEC0CAwEAAaNQME4wHQYDVR0OBBYEFJXY
-rZiYvWGb6fLgJbLCXjPzqvG/MB8GA1UdIwQYMBaAFJXYrZiYvWGb6fLgJbLCXjPz
-qvG/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJzxVczRnErpMZZy
-TAy62tcnU0j/OMWfuwFd7ChSNKcc4lj0kv6ocbAnzwPxYs4UWlW7wrtFjUV8IxYi
-Y6LOL2Td1EUVGANYI09pm9svDdrhlp/sZyTCPsHBZvtrl50GWjsXaM2zMEr09WM1
-6UAaHlhnlQx/eJFPtDpw+HkQop0rMuatTXtq44PXyGVMCB+3vPwiOIciJE8irR13
-dFQ9WsW9XJU/dtWdoGoznhAO7XBglZXwI+BY2ja3IxpiONgK+768oFPrMsf/2qc0
-3x3Ktng9KmSf1Oh7b0wVzAEquc+Shdv2TNtMTB2AJbfRSI7DlRALIAj51C5S+OVP
-JsoBiXU=
+MIIDizCCAnOgAwIBAgIJAKOX/fMCEYDlMA0GCSqGSIb3DQEBCwUAMFwxCzAJBgNV
+BAYTAkpQMQ4wDAYDVQQIDAVUb2t5bzEOMAwGA1UEBwwFVG9reW8xDjAMBgNVBAoM
+BVRva3lvMQ4wDAYDVQQLDAVUb2t5bzENMAsGA1UEAwwEbXlDQTAeFw0xODA0MDQx
+NTA5MjNaFw0yODA0MDExNTA5MjNaMFwxCzAJBgNVBAYTAkpQMQ4wDAYDVQQIDAVU
+b2t5bzEOMAwGA1UEBwwFVG9reW8xDjAMBgNVBAoMBVRva3lvMQ4wDAYDVQQLDAVU
+b2t5bzENMAsGA1UEAwwEbXlDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANFUe6WZ7LwNiMaIUwfceQLBs5FcaLgEtx9S9XFBp2K6hkr60JtS4DB+5NH8
+b2CdUpKAL+wD7abN7q8gQiK/EyMq7f9hh9McBeuyy6nqe+Gsbn+JgZCRr8HqEV70
+FXiR6O+Dnd/XwriHhB12MxF4Xb3fMnVCY3lEltVEn3mcOJ4CbcvNWd3uOz4Y3qN5
+Oa5ZbOTTvWDRWV/c+eFaHHqdxO0/mKN+TpAzqCnVEZfEh7wPSYYIoIHDCROzFHox
+pok4bW+0cv6tfvEAP/FToE8rTinrD4KqCLaZg6uJPBCfA2brKwVaSwsYhB0rrMua
+b7LgFPidHWH44mmEqL2xwWnbZesCAwEAAaNQME4wHQYDVR0OBBYEFAYEbR2JnEsY
+E0zPNPZ5exSP8J7LMB8GA1UdIwQYMBaAFAYEbR2JnEsYE0zPNPZ5exSP8J7LMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFXzuxwlfAclmp56HBKpEHq1
+hFnf/S6zjz0M8UnT9C7ncVSaqbFe2rnlL9aWXzI5tU3i/BGsxd2gOo08vXemTsES
+Dc2dX+Kv9OGWJuXGiP2uQwCbMXnvjqHTx++PfcPp7oYVctIabudC7x8WvZw6BUvF
+vWijVkg0ayGDV+LvX4fjPStMPd6ZFxyFktke6i0RhylAG+fzp6C4H06kojp0dWq6
+A58Dm7F1PnZ2dqXb4BR4Ylmr3chOq/uSJPtTOnI5A7TaJYiD8CRSvQ66fRYtfFWx
+KXuse36nKrQOhjityqBZ46PFkVE6iXU5X39qpA74c3vuf8CuUw8M30QGM0IezQk=
 -----END CERTIFICATE-----

test/Dockerfiles/enterprise/6.0.14/etc_ssl/auth/server.pem

@@ -3,107 +3,107 @@ Certificate:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
     Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=JP, ST=Tokyo, L=Tokyo, O=Internet Widgits Pty Ltd, CN=myCA
+        Issuer: C=JP, ST=Tokyo, L=Tokyo, O=Tokyo, OU=Tokyo, CN=myCA
         Validity
-            Not Before: Mar  6 11:30:43 2017 GMT
-            Not After : Mar  6 11:30:43 2018 GMT
-        Subject: C=JP, ST=Tokyo, O=Internet Widgits Pty Ltd, CN=127.0.0.1
+            Not Before: Apr  4 15:18:05 2018 GMT
+            Not After : Apr  1 15:18:05 2028 GMT
+        Subject: C=JP, ST=Tokyo, O=Tokyo, OU=Tokyo, CN=127.0.0.1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:a8:67:e4:69:23:70:c8:c8:b8:62:b0:76:05:51:
-                    90:c8:05:54:de:14:3b:ce:0c:d3:16:22:af:9d:80:
-                    37:84:ff:82:41:29:32:ac:21:19:c5:dc:39:e2:7f:
-                    12:b6:71:37:90:66:33:1a:4a:68:09:a6:d8:49:a2:
-                    fd:15:62:6e:05:eb:cb:94:68:e5:20:10:08:64:a9:
-                    65:2d:f5:f9:73:4a:a8:85:a6:ea:e5:45:fd:c7:a1:
-                    08:99:84:9c:5d:d4:f6:f1:69:66:6e:14:78:fc:b4:
-                    6c:bf:52:24:0b:f4:04:94:e0:ae:55:59:4c:dd:02:
-                    f1:c4:d8:c6:79:46:8c:86:3d:cf:df:59:6e:62:97:
-                    7c:f1:df:89:76:db:6b:74:f1:86:f9:e7:75:f1:c8:
-                    a4:bd:03:d5:63:4a:60:22:39:be:1d:5d:5e:dd:93:
-                    46:df:74:be:dd:a1:79:0f:e9:4d:3c:ab:f4:83:c1:
-                    fb:a8:35:1d:23:41:c2:57:6a:0b:93:19:c6:bc:e7:
-                    7c:6a:f5:ed:48:0b:02:ec:4d:99:90:bd:12:aa:a7:
-                    00:1f:22:f7:c4:74:a6:91:73:61:d6:b5:f3:bc:9a:
-                    fa:8f:28:64:63:b7:07:8c:46:0f:f1:f9:f8:23:36:
-                    50:1e:34:10:ec:99:cc:11:4e:23:75:ac:6c:1c:8a:
-                    02:bd
+                    00:b3:56:b9:5d:39:ac:a8:21:39:0a:ec:32:61:00:
+                    70:79:ad:23:f9:bb:cc:b7:9a:00:8d:68:21:48:eb:
+                    ab:de:cb:f2:84:cb:a9:dc:6e:ef:47:4e:be:1d:c1:
+                    65:92:91:45:2d:21:8b:57:88:28:7e:46:df:6d:49:
+                    7c:47:d7:66:8c:cf:48:10:d9:ef:10:04:87:a5:67:
+                    08:fd:5f:90:94:11:5c:db:0c:3b:d4:53:05:2a:42:
+                    dc:1d:38:53:64:7a:58:0b:6d:4d:cc:9b:3e:17:87:
+                    41:26:fe:eb:d5:7d:8d:51:4c:0b:0b:59:24:f3:50:
+                    d7:ac:fd:95:45:e1:a2:07:cf:a1:02:33:e2:4a:56:
+                    a7:a8:bf:36:e3:a2:b9:1f:4f:28:16:58:a5:45:79:
+                    37:0e:5b:ba:62:fd:47:71:8a:05:5e:c0:ba:6d:42:
+                    cf:70:a6:67:69:78:d6:58:c1:3e:3b:61:df:d4:b9:
+                    0d:e1:5e:86:64:26:03:ca:bd:a0:19:39:84:08:fe:
+                    5c:ce:7d:37:f2:2f:e7:43:29:f3:44:e6:4f:17:be:
+                    a7:57:4b:37:6b:e7:b5:a0:cf:d8:fe:d6:72:cb:52:
+                    db:d4:79:77:2b:6d:1c:12:e1:3c:36:16:c6:b6:68:
+                    3a:1f:09:23:db:2a:71:20:4e:37:d0:a5:4d:ac:fb:
+                    ee:ed
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                50:57:99:83:7D:7D:3E:AC:66:84:A7:34:40:D0:C3:4D:7E:EA:DD:5C
+                88:20:EE:CB:45:DC:D2:B2:2C:C6:B0:5D:E3:6B:7C:BB:54:22:DB:87
             X509v3 Authority Key Identifier: 
-                keyid:95:D8:AD:98:98:BD:61:9B:E9:F2:E0:25:B2:C2:5E:33:F3:AA:F1:BF
+                keyid:06:04:6D:1D:89:9C:4B:18:13:4C:CF:34:F6:79:7B:14:8F:F0:9E:CB
 
     Signature Algorithm: sha256WithRSAEncryption
-         36:8f:3c:4e:d5:eb:5e:a8:88:a2:3c:b9:d3:31:49:3e:a2:8d:
-         a6:9b:58:7e:58:8c:97:61:ed:d5:b1:b0:fd:ef:89:5a:78:92:
-         13:60:e1:e3:80:b7:48:8b:f1:2b:86:7b:91:8a:df:38:fa:a2:
-         20:4b:f9:84:61:2f:e8:7c:2a:00:f8:be:92:5b:a4:bc:7f:92:
-         e0:86:c5:76:90:26:8a:e5:4a:da:f3:3e:80:82:98:0d:16:55:
-         b2:c4:cf:4a:f6:09:ce:a8:25:6c:49:76:94:4c:e1:47:37:38:
-         de:cf:38:c7:9c:1a:26:19:f2:65:3b:04:86:5b:b7:9b:ae:a5:
-         b3:d1:74:41:ea:9f:b5:5d:d2:fe:7e:f4:fb:e5:71:10:01:e9:
-         72:26:d0:04:da:e0:7f:1d:9d:69:61:13:d2:3f:ae:f5:e2:c8:
-         d3:74:00:0d:89:93:62:1b:8d:ca:01:13:8a:60:f6:d6:a1:2d:
-         1d:b2:e9:57:57:4f:3c:5e:c7:06:df:71:37:fa:d5:f2:cf:be:
-         ea:ad:0d:fe:a5:c9:86:40:e6:eb:3f:49:81:46:3d:09:e3:af:
-         1f:f7:06:e6:ce:77:62:e6:3a:32:00:a4:d1:97:de:33:e0:86:
-         58:19:3a:2b:da:9d:c9:c2:e3:76:5f:37:12:96:9e:e7:c2:fb:
-         11:60:2c:b1
+         6b:31:2b:aa:78:52:be:6d:72:b3:86:a1:2f:bc:5d:9a:cc:ff:
+         d2:ac:48:1c:ed:60:b1:f3:bb:fe:9b:3e:63:8d:5c:fe:64:0c:
+         63:8d:2a:d4:7c:d6:66:08:a3:d3:ae:c0:3c:f9:a5:fa:0d:4e:
+         aa:fc:94:ad:ed:5f:a5:df:44:b2:7d:24:c6:8b:41:8a:b9:2f:
+         46:b4:30:1f:e5:c8:0d:4e:33:42:b3:a0:ac:b8:b6:cc:e5:f9:
+         18:56:e7:d6:e2:24:b2:75:e1:03:c0:02:db:73:a9:db:e1:21:
+         69:e5:e0:bd:5e:8c:dc:74:70:22:95:8b:c7:19:f4:1d:2c:df:
+         d1:17:d4:08:06:e8:de:97:32:26:18:a5:79:86:ea:c4:b8:0b:
+         1a:f7:47:c8:5d:d7:81:ce:49:55:dc:fa:92:b1:c9:59:86:d4:
+         e4:9e:c4:d5:dd:43:f9:94:99:c1:75:2c:6a:cf:c4:eb:61:08:
+         76:6c:a0:87:84:37:f2:28:f5:f8:d4:ba:f8:6e:c8:9c:db:8e:
+         c8:aa:fa:d1:06:e5:3c:8b:f0:4e:a2:98:7a:f7:89:f1:40:da:
+         0d:27:8f:b2:f4:50:69:8f:30:39:43:c5:9f:51:72:e2:e9:00:
+         6e:59:08:73:01:fa:96:89:a1:e6:09:f7:c9:12:21:67:fe:1c:
+         58:16:f6:f9
 -----BEGIN CERTIFICATE-----
-MIIDqTCCApGgAwIBAgIBATANBgkqhkiG9w0BAQsFADBfMQswCQYDVQQGEwJKUDEO
-MAwGA1UECAwFVG9reW8xDjAMBgNVBAcMBVRva3lvMSEwHwYDVQQKDBhJbnRlcm5l
-dCBXaWRnaXRzIFB0eSBMdGQxDTALBgNVBAMMBG15Q0EwHhcNMTcwMzA2MTEzMDQz
-WhcNMTgwMzA2MTEzMDQzWjBUMQswCQYDVQQGEwJKUDEOMAwGA1UECAwFVG9reW8x
-ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDESMBAGA1UEAwwJMTI3
-LjAuMC4xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqGfkaSNwyMi4
-YrB2BVGQyAVU3hQ7zgzTFiKvnYA3hP+CQSkyrCEZxdw54n8StnE3kGYzGkpoCabY
-SaL9FWJuBevLlGjlIBAIZKllLfX5c0qohabq5UX9x6EImYScXdT28WlmbhR4/LRs
-v1IkC/QElOCuVVlM3QLxxNjGeUaMhj3P31luYpd88d+JdttrdPGG+ed18cikvQPV
-Y0pgIjm+HV1e3ZNG33S+3aF5D+lNPKv0g8H7qDUdI0HCV2oLkxnGvOd8avXtSAsC
-7E2ZkL0SqqcAHyL3xHSmkXNh1rXzvJr6jyhkY7cHjEYP8fn4IzZQHjQQ7JnMEU4j
-daxsHIoCvQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVu
-U1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUUFeZg319PqxmhKc0
-QNDDTX7q3VwwHwYDVR0jBBgwFoAUlditmJi9YZvp8uAlssJeM/Oq8b8wDQYJKoZI
-hvcNAQELBQADggEBADaPPE7V616oiKI8udMxST6ijaabWH5YjJdh7dWxsP3viVp4
-khNg4eOAt0iL8SuGe5GK3zj6oiBL+YRhL+h8KgD4vpJbpLx/kuCGxXaQJorlStrz
-PoCCmA0WVbLEz0r2Cc6oJWxJdpRM4Uc3ON7POMecGiYZ8mU7BIZbt5uupbPRdEHq
-n7Vd0v5+9PvlcRAB6XIm0ATa4H8dnWlhE9I/rvXiyNN0AA2Jk2IbjcoBE4pg9tah
-LR2y6VdXTzxexwbfcTf61fLPvuqtDf6lyYZA5us/SYFGPQnjrx/3BubOd2LmOjIA
-pNGX3jPghlgZOivancnC43ZfNxKWnufC+xFgLLE=
+MIIDozCCAougAwIBAgIBATANBgkqhkiG9w0BAQsFADBcMQswCQYDVQQGEwJKUDEO
+MAwGA1UECAwFVG9reW8xDjAMBgNVBAcMBVRva3lvMQ4wDAYDVQQKDAVUb2t5bzEO
+MAwGA1UECwwFVG9reW8xDTALBgNVBAMMBG15Q0EwHhcNMTgwNDA0MTUxODA1WhcN
+MjgwNDAxMTUxODA1WjBRMQswCQYDVQQGEwJKUDEOMAwGA1UECAwFVG9reW8xDjAM
+BgNVBAoMBVRva3lvMQ4wDAYDVQQLDAVUb2t5bzESMBAGA1UEAwwJMTI3LjAuMC4x
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs1a5XTmsqCE5CuwyYQBw
+ea0j+bvMt5oAjWghSOur3svyhMup3G7vR06+HcFlkpFFLSGLV4gofkbfbUl8R9dm
+jM9IENnvEASHpWcI/V+QlBFc2ww71FMFKkLcHThTZHpYC21NzJs+F4dBJv7r1X2N
+UUwLC1kk81DXrP2VReGiB8+hAjPiSlanqL8246K5H08oFlilRXk3Dlu6Yv1HcYoF
+XsC6bULPcKZnaXjWWME+O2Hf1LkN4V6GZCYDyr2gGTmECP5czn038i/nQynzROZP
+F76nV0s3a+e1oM/Y/tZyy1Lb1Hl3K20cEuE8NhbGtmg6Hwkj2ypxIE430KVNrPvu
+7QIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
+bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUiCDuy0Xc0rIsxrBd42t8u1Qi
+24cwHwYDVR0jBBgwFoAUBgRtHYmcSxgTTM809nl7FI/wnsswDQYJKoZIhvcNAQEL
+BQADggEBAGsxK6p4Ur5tcrOGoS+8XZrM/9KsSBztYLHzu/6bPmONXP5kDGONKtR8
+1mYIo9OuwDz5pfoNTqr8lK3tX6XfRLJ9JMaLQYq5L0a0MB/lyA1OM0KzoKy4tszl
++RhW59biJLJ14QPAAttzqdvhIWnl4L1ejNx0cCKVi8cZ9B0s39EX1AgG6N6XMiYY
+pXmG6sS4Cxr3R8hd14HOSVXc+pKxyVmG1OSexNXdQ/mUmcF1LGrPxOthCHZsoIeE
+N/Io9fjUuvhuyJzbjsiq+tEG5TyL8E6imHr3ifFA2g0nj7L0UGmPMDlDxZ9RcuLp
+AG5ZCHMB+paJoeYJ98kSIWf+HFgW9vk=
 -----END CERTIFICATE-----
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCoZ+RpI3DIyLhi
-sHYFUZDIBVTeFDvODNMWIq+dgDeE/4JBKTKsIRnF3DnifxK2cTeQZjMaSmgJpthJ
-ov0VYm4F68uUaOUgEAhkqWUt9flzSqiFpurlRf3HoQiZhJxd1PbxaWZuFHj8tGy/
-UiQL9ASU4K5VWUzdAvHE2MZ5RoyGPc/fWW5il3zx34l222t08Yb553XxyKS9A9Vj
-SmAiOb4dXV7dk0bfdL7doXkP6U08q/SDwfuoNR0jQcJXaguTGca853xq9e1ICwLs
-TZmQvRKqpwAfIvfEdKaRc2HWtfO8mvqPKGRjtweMRg/x+fgjNlAeNBDsmcwRTiN1
-rGwcigK9AgMBAAECggEAawuu+s3WUSqVWdYFDxhryVjqO0ftQ+qO+tENhDYOFHI9
-n6HKXfOkaEq2WKyhfmq1AQqVjS6itw/hB92ctc0dVpItk6ahjiHi0+mBMRfbeleI
-i3wwb5Bv4kcQKlVK97H5TjbLL0nAJhGh1nMmCpsPlnrDFelvnETU3WVVs50Okf0M
-cTQG9hfWpTOhpgF04Qhl0iMpVW+0pmWPtdz2ba8ybNexxF8M0DWFjJTp67SQm7vX
-tBHFUW+VnL1NJ0JdxAnVGWpVjx+O56w9JyiwDJuJox7HHzCb89LZfoWICsp/V5dd
-7r8eS0MXicvtPdRNE+AVEuVRDO52h/N8J+2/AG78gQKBgQDUDSC5MsPvvcsd9yM4
-m2W3cyG+Wdz2FDecZDUWD2lEms4JHsStMMfZs6eH6ahacZp4s4r0lWlwSBOzQq3h
-Fp74lAZ+fcbImeDs2r42qN1TpuTfn/14OV+F6CZh9yzEkyJc/Z1uIJmYa3oQXDCM
-x/H4PEHil/drNsEqpkFNHKPU8QKBgQDLTw3GnTUY4RR2vzr295naf6ZqluTluG4W
-r0nqbKX5Ja3vR1AvRnYw/v5QeJ89WI3t0jJsJL8ewDJP5d/D8ZMF48Kg1DDKQErG
-JZUYEqj0DoKPBp1ZRJER2uYvf0K4ve/MycQCIewFaV0U/ys411uKwm49/+Gwtxei
-IOfKcIFajQKBgFZeJnboE2AhWIqS71iOCqbmkNbb+SCNaX0cX3blvgWAW+zhCFBW
-LwAfqVu1Mqnr3XPOBQnLlU9zO/rmbLXiJcuvVtnMVtu7uR4flhvjOYppzoy6uF1w
-WNTMkl2SdDx4hSWE8ss5IfYvyF7Dfc7JXWey+07UgKS9f33ki3Jh+OSxAoGBAKDy
-wmsbhS9e8D5ZgSqGNUxehbYYIrkhWjWnKxLkVDh69clZYUcrtuFu3JGEDDwaYLGH
-F9e493w2lx3dU1nhYozlE+0STlWutANNOUzHaO1cl0r255YFy/qgml27l2x9INu0
-VvGBPUHDeabnoqXrB1NAPNnkOh0VtSXqetUuX5j5AoGAcU0uHnnIZSbhR4LcKTzr
-p8fJ6nCtTboRdYkZptgz91NMzwMGXaFIq/c/Fwpb0CGgwOD5CSaOYf9UL1gmVL5J
-OdICWwNdR3WFfoJXJMnDftFHOf3lLeyXBJ3MTtc2KY92NefTm6rrqlmkOFuTWdh4
-6j45pON5oDsKwDyKHCSJMqo=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCzVrldOayoITkK
+7DJhAHB5rSP5u8y3mgCNaCFI66vey/KEy6ncbu9HTr4dwWWSkUUtIYtXiCh+Rt9t
+SXxH12aMz0gQ2e8QBIelZwj9X5CUEVzbDDvUUwUqQtwdOFNkelgLbU3Mmz4Xh0Em
+/uvVfY1RTAsLWSTzUNes/ZVF4aIHz6ECM+JKVqeovzbjorkfTygWWKVFeTcOW7pi
+/UdxigVewLptQs9wpmdpeNZYwT47Yd/UuQ3hXoZkJgPKvaAZOYQI/lzOfTfyL+dD
+KfNE5k8XvqdXSzdr57Wgz9j+1nLLUtvUeXcrbRwS4Tw2Fsa2aDofCSPbKnEgTjfQ
+pU2s++7tAgMBAAECggEAYNDMuRtNrmZhGRhyChPmpIloBoXv+p5U9gHlFizEWD7Z
+6f7Y8HujCWflEsM5RmrOYZLeWp7S3Xj9XU5ynYYXgqTUTuSYPplzcUOygrZ4orbM
+3iQ4mGNJQotdsRibTH8P0PttKKwWVTVbYuX0AwkIpX7b54B0hjZ6eJVdZKBujLAO
+dzB7CLfpRAWPlmTsho0Utyh8WZ3yy/HaRLm5zkkAedUZJ4Y+C/dZ3E0Jq/CZptFd
+kifwEWg+rWXhZqK1TWcKUj80lxRqsLm26N1e5aELxxZ3bmVJ5+slYn8Ur9SLCPZP
+VuIaCjWjqTDaF0Y4Mbnon+UT36XjNnBUOI7yoMHZMQKBgQDkVBp+HbEugfHrkaRS
+OUIUlNoaXbg9Yacv/9TRfhTLuxwJKEcL55cqexPfOVUivlx7lNpafCxUss5c3JjV
+GGmkrgO59bq9HfeVD2lw3MbK3UElXdsd/hLby2eTK1BIa0sim47O8hHeFRtyS86u
+igpvADf2p97FBtYvfyYEc4NWawKBgQDJErZcjcHo5o6iumqC8rdpFpl2iw/e44S1
+/FLuPNY4x4VpmjIbcq0x9uH0mP64epjS7j1xmSzeNaLpjZbi6MIKLnuVzk3Tu7s7
+hW1FddBCus6O/hBEZoe80imPNFRGswdYV3+010VvQrX9uNhKtUBImpCMeaSfPxkU
+nNdztv42BwKBgDwJIS4oAH6KDGI0WVCFXaqruO1V1yvMkXk9e2faDv3CpQyDWqr2
+qfixg/gdyxTnmMmlygQgwkdC/J/OISFm2eBDIRe0VPWE+6Rl+QOECYEtzANXOlYY
+iDzirskziliAXbEr1dD0NV5/jkfvRtj90uB83josyZZkxcyXUhe5h78hAoGABUSV
+PIWGQAjSUdcadUXQolMyQBXSm59QWcg7j/xODHzFtQeSKn/to7J5JwRfIAwuNtCB
+EZnWwBedpgrMmjNI6iVfnYQjK9nuRNfxDfHRO/5S7RIg8PnSspK6/gJ79sI3/guE
+0AMX0Zto0zXljMeE4KIUCWoicv2fNZgKWQDBVj8CgYEA4ITpUhV7FNPw76Zo+9nY
+48czmOeVo0MfrBMdFq8KJoh6zx2MA5GFeyPu3CP74vwYlc2PH8amHjkGzTmP5kO3
+Hthmvmeru9ic4oJnK7NkpcST8mESeb1GZEpIUh7c6saT1J2/O69c6zvVvZEAmjyX
+7XNa7qpjZ4tTAFLPa3NGDdo=
 -----END PRIVATE KEY-----