2 files changed, 55 insertions, 53 deletions
diff --git a/resources/config/aai/aai_keystore b/resources/config/aai/aai_keystore
index d50b33e..f5a80d8 100644
--- a/resources/config/aai/aai_keystore
+++ b/resources/config/aai/aai_keystore
diff --git a/resources/config/haproxy/aai.pem b/resources/config/haproxy/aai.pem
index e6dfd6a..22779a7 100644
--- a/resources/config/haproxy/aai.pem
+++ b/resources/config/haproxy/aai.pem
@@ -1,31 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFATCCA+mgAwIBAgIIWY+5kgf/UH8wDQYJKoZIhvcNAQELBQAwRzELMAkGA1UE
+MIIFJTCCBA2gAwIBAgIIJpgs+ja+zwYwDQYJKoZIhvcNAQELBQAwRzELMAkGA1UE
 BhMCVVMxDTALBgNVBAoMBE9OQVAxDjAMBgNVBAsMBU9TQUFGMRkwFwYDVQQDDBBp
-bnRlcm1lZGlhdGVDQV85MB4XDTE5MDMyNjAzMjc1MloXDTIwMDMyNjAzMjc1Mlow
-azERMA8GA1UEAwwIYWFpLm9uYXAxDzANBgkqhkiG9w0BCQEWADEZMBcGA1UECwwQ
-YWFpQGFhaS5vbmFwLm9yZzEOMAwGA1UECwwFT1NBQUYxDTALBgNVBAoMBE9OQVAx
-CzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuyZj
-PvQrgB2bhyE3kpSH6OjXigs/+MfmV4eOrEwmMzQ1lWjItu2z5WY9xNGCky85G3Pr
-qmCfT/qNPXd0W5kEujYlL0QnvrCa77WP3kSSu0kMKdUJV3S90Rp1SOhGFU/WroAQ
-XvlzyBCunqQ9/F/L6mS8dLotUbkGIQlojAYOukWOT/+ogMMxzpxtb91QR+Wl4YeY
-yzX//0rls/6nEKzCh2STHJuTkXqL0kod+KY08unpvMX2J/SEeHdWLS8Gsuus6oqM
-r4bFyquua/U1ApxEMn0/agY58V75dF5CRPJRYrqqf9I6DBr0SntHv6pzMhokjewl
-ukkrEsvIOkqEvIcE+QIDAQABo4IByzCCAccwCQYDVR0TBAIwADAOBgNVHQ8BAf8E
-BAMCBeAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFQGA1UdIwRN
-MEuAFIH3mVsQuciM3vNSXupOaaBDPqzdoTCkLjAsMQ4wDAYDVQQLDAVPU0FBRjEN
-MAsGA1UECgwET05BUDELMAkGA1UEBhMCVVOCAQcwHQYDVR0OBBYEFFziBN1nFOnS
-Sp7XkxOuzVNR1GFLMIIBEQYDVR0RBIIBCDCCAQSCCGFhaS5vbmFwghJhYWktc3Bh
-cmt5LWJlLm9uYXCCG2FhaS5hcGkuc2ltcGxlZGVtby5vbmFwLm9yZ4IlYWFpLmVs
-YXN0aWNzZWFyY2guc2ltcGxlZGVtby5vbmFwLm9yZ4IlYWFpLmdyZW1saW5zZXJ2
-ZXIuc2ltcGxlZGVtby5vbmFwLm9yZ4IdYWFpLmhiYXNlLnNpbXBsZWRlbW8ub25h
-cC5vcmeCJWFhaS5zZWFyY2hzZXJ2aWNlLnNpbXBsZWRlbW8ub25hcC5vcmeCF2Fh
-aS5zaW1wbGVkZW1vLm9uYXAub3JnghphYWkudWkuc2ltcGxlZGVtby5vbmFwLm9y
-ZzANBgkqhkiG9w0BAQsFAAOCAQEAlqwzbZv/0uxVPmFJMB2t5B2nw3GNojLwxnHh
-UVKzrLbDDpM36CkY8uX9kYAaf/Eg8eA5Jp0T9lGCheg0TNHM9OBqyyvDPjewZ5jO
-N0xooRs7gh4bYtQaWIjCOg6bXg+mHkW4VVbpewMJYivGpJZQ76LauuHtg1OA688s
-fy4SGrbC902OoPZ8zJlINOyljqSa+uNwvv6bg9Iqnuq/jUaFpKOYVUkMzw/ImVzy
-3kXH/hY+nz4FNvMPlULgwxskOBRp90a5VWBC48cNzg4aNtanVz6lPAr/AVD1R6jt
-ZDEd3Ww8nTlRKjUryxgoorqo8ThctZscWBpHMRW4B/LgGEYtRA==
+bnRlcm1lZGlhdGVDQV85MB4XDTE5MDkyNzE5MzQ1NFoXDTIwMDkyNzE5MzQ1NFow
+gY4xETAPBgNVBAMMCGFhaS5vbmFwMS4wLAYJKoZIhvcNAQkBFh9tYXJrLmQubWFu
+YWdlckBwZW9wbGUub3NhYWYuY29tMR0wGwYDVQQLDBRhYWlAYWFpLm9uYXAub3Jn
+OkRFVjEOMAwGA1UECwwFT1NBQUYxDTALBgNVBAoMBE9OQVAxCzAJBgNVBAYTAlVT
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1KCd/hI7j0CSfWqCbPfM
+KZCCbOgLxFe16QMYk8m4hiuEd53B0Mm/M0tcDpHp51OwvAt5UCNzsa5MRJg5Tg1j
+XLZ+m1/xN+2D8D+iMp+0AfQt2iTEct9LpA5axAPBxmwGlCsrLv8iQBOmlJn4SXVl
+TjSPwstTL3OhKKM5nflGSjhyksKvY72BpLZUmaktTB2rlVis3lYGp4Pp6MtEKnZM
+s4M9albu+L4sbDGIudkvmqmyohT6hSL7L1Px+YoL5DrRAdOrogIqkdhCUMm3mXLY
+vWoXOLzuZ27bTTHZM7E5NP8S5Ko9LH7Ryv6zBAzDsxYsE+NE5ujVCY9sLq5D972x
+WwIDAQABo4IByzCCAccwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBeAwIAYDVR0l
+AQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFQGA1UdIwRNMEuAFIH3mVsQuciM
+3vNSXupOaaBDPqzdoTCkLjAsMQ4wDAYDVQQLDAVPU0FBRjENMAsGA1UECgwET05B
+UDELMAkGA1UEBhMCVVOCAQcwHQYDVR0OBBYEFJHb/F7Oi9y8mo6oqhVcRmFDZO6W
+MIIBEQYDVR0RBIIBCDCCAQSCCGFhaS5vbmFwghJhYWktc3Bhcmt5LWJlLm9uYXCC
+G2FhaS5hcGkuc2ltcGxlZGVtby5vbmFwLm9yZ4IlYWFpLmVsYXN0aWNzZWFyY2gu
+c2ltcGxlZGVtby5vbmFwLm9yZ4IlYWFpLmdyZW1saW5zZXJ2ZXIuc2ltcGxlZGVt
+by5vbmFwLm9yZ4IdYWFpLmhiYXNlLnNpbXBsZWRlbW8ub25hcC5vcmeCJWFhaS5z
+ZWFyY2hzZXJ2aWNlLnNpbXBsZWRlbW8ub25hcC5vcmeCF2FhaS5zaW1wbGVkZW1v
+Lm9uYXAub3JnghphYWkudWkuc2ltcGxlZGVtby5vbmFwLm9yZzANBgkqhkiG9w0B
+AQsFAAOCAQEAOFC1zeyuRIzK0DfCUUAOacPlK5MD2uiDt+eSeOLIIb34MCITBhSq
+5fhrXJwaXULzKS+w/mJWqo6HDyD7xefz05jfnEi4g1BRzll7kMbtyl88rQp6jRwu
+Qr9L/DtYcGWgYgwpsKIncIh/ikFEPqbmbKcAfISCDptbHTQm29QEbjCSp9crQncr
+z24aaBRjYAUW9AtNLWh+lmZSIMmtynR/xSWGuo+Js8Ab6h7g0uk5qXIPwEHs4E1G
+StvMIohRbecvpWfg98zysA1hELkdZHxzyKXVHq8fSxfosi/xK43JuAN6SrJz5Ja3
+C297UuKJOw7EaMzOMLML4ylBIWs8x0JB6g==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEdTCCAl2gAwIBAgIBBzANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB
@@ -53,30 +54,31 @@ uKKISHqVJuw/vXHl1jNibEo9+JuQ88VNuAcm7WpGUogeCa2iAlPTckPZei+MwZ8w
 tpvxTyYlZEC8DWzY1VC29+W2N5cvh01e2E3Ql08W1zL63dqrgdEZ3VWjzooYi4ep
 BmMXTvouW+Flyvcw/0oTcfN0biDIt0mCkZ5CQVjfGL9DTOYteR5hw+k=
 -----END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAuyZjPvQrgB2bhyE3kpSH6OjXigs/+MfmV4eOrEwmMzQ1lWjI
-tu2z5WY9xNGCky85G3PrqmCfT/qNPXd0W5kEujYlL0QnvrCa77WP3kSSu0kMKdUJ
-V3S90Rp1SOhGFU/WroAQXvlzyBCunqQ9/F/L6mS8dLotUbkGIQlojAYOukWOT/+o
-gMMxzpxtb91QR+Wl4YeYyzX//0rls/6nEKzCh2STHJuTkXqL0kod+KY08unpvMX2
-J/SEeHdWLS8Gsuus6oqMr4bFyquua/U1ApxEMn0/agY58V75dF5CRPJRYrqqf9I6
-DBr0SntHv6pzMhokjewlukkrEsvIOkqEvIcE+QIDAQABAoIBAEe1OrvJZM2PCqOp
-N5jjbnvwk32iN93EAl8xYppkBxMBgzJ/VsC4rYBNP4elWym4I2KAdSDwKrrDXtDZ
-b20VYXlT+8VzkOMA2izU3Y4lqi82mwGATjcDVSPExoGr9gZ+c9yi1yL8478ZnT7N
-4a5Mql5iQM9c8rZodY+9AiD8xTHbgXbaGmBsDhTxT/HPDsoacR/SHMh3XowbhAcs
-eXAe+NdDtLcG6WOEqi/EhkagkWvsecIBoy888Ffbxa5h/DLEaCCoC3Dw1tWFX8KM
-86sC9sQKDVRVKpKs2/9MGl9LoPi9jNDrOP6/Zx3T4k479ozGp/0G70LzmUcih72j
-MUbr4f0CgYEA/AV0yOLZh0i2K53jpv3e8RDJkOBFuLb0ZZVdGkVYHncw9/WY070E
-TJi0B51RAJtdSksAWa6o+1+VaJKQHtMZpABwMWDMRQUqdC+o+knONRpdCHwxXnSl
-gvujFyYJhURKDr42z0xjbQrHaEZRuVJ6tzJQhFtE66G01ngREhDPbUsCgYEAvhrB
-A/IOQpPaHcfU2ik80VE0KU9N4Ez50ZlheEbBDVTrMWzuFy8p9niNSfDKC7s5aqlP
-DgDvTD80D8Zw6+yT/aDU5iEf5vMdKc1pnlr8jJoCNSvuyJZ40kDSehsBOKC+YN3g
-b6xaYWIcH3mwwoLZO9XFsN5KAg/dSMJED8AGAEsCgYAduMMCIgbHdqLNWAyOGCif
-w3wSEvEGDMWb6VaWj5EJ3sKuq48/gW4tXmD0+O+ho7EH3vqGmRuisa4cLBTFHd5L
-QiX5HNJaXXaZRzmlcujXyGkqZAMqgZU3clfUlg7PYbNeM76hCgA7zuaffJOMyJZi
-XpOyWFUzeNmr5XMV71eXKwKBgEtgzFvGJMVdXsUkMU/3vfe5XRdsLJLdssjbKnzI
-gU/J9h/480caGmdyUYOaCGMyb4fNbl09HaV8AianJqtFeUC9/uzpAX9PsqaanmB9
-71nIz0tKCjpa/7lOnqZwAsHzasl58L4W9xdaEZChbecSfxRspSCGY44BwFpTPS2J
-lFeVAoGAFOetqKStyEy+qruEOMk+lWwaKLGZ4hLk7qmFochxwrXgx7hcZ4Zrqkv9
-7qyQtbAalFiCHGmLBdSb+GLfD/1pPUA3wJoLo/I3f4g9c7cw7m7r8MdWPDXSL2Vk
-vM97Syv92KQUBl8te7S3+bDBNklgb+KwRqSk3QRAl8ARWEjg8Kk=
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDUoJ3+EjuPQJJ9
+aoJs98wpkIJs6AvEV7XpAxiTybiGK4R3ncHQyb8zS1wOkennU7C8C3lQI3OxrkxE
+mDlODWNctn6bX/E37YPwP6Iyn7QB9C3aJMRy30ukDlrEA8HGbAaUKysu/yJAE6aU
+mfhJdWVONI/Cy1Mvc6Eoozmd+UZKOHKSwq9jvYGktlSZqS1MHauVWKzeVgang+no
+y0Qqdkyzgz1qVu74vixsMYi52S+aqbKiFPqFIvsvU/H5igvkOtEB06uiAiqR2EJQ
+ybeZcti9ahc4vO5nbttNMdkzsTk0/xLkqj0sftHK/rMEDMOzFiwT40Tm6NUJj2wu
+rkP3vbFbAgMBAAECggEBAM4iqQkYRAWtZFeSWr+pvJTPNKLAlCfVoNY12i3s8qeg
+qNwOZUg1Ttg7xxOZAlryF/U2anX26MLpZ6dYrLWu5RWNF1EqwoCmE7Nm/ah2i90Z
+DRrfalSzhnGWOQivW70yHW6oK0V0s4/LfUOzwbH1zjDzZCxFUnA+eY8cL0+nyy1H
+phUoW8EYUZXqVhtVgn3oBCcC54OLhefzS4zvpM9KV3WEwu0aSbaP8vA8ZYLuOZo/
+HWnFTJNDi+g140ZWo0BaCAix2ZFEAX9Gv/XnQw28mcLD8Cy0szW6AqHBBvff1hBR
+ivK5CDfFhZgrj/1cnp85Dy1PDzM20K0bQjUMT7rY64ECgYEA/09y2TjJ/QNWXXUt
+3mqenmLJRfwtKDRE81d2j8p2R+3rh9zn7frivYgw9KcKCN9OAnWG1LV6vjUuRAwD
+7pPHeqBsh9O2GV7/+CN0a0UFxlcIdulKRBAdHpuiNa+CxXMuv5K7hisI6nr3dzA7
+SSzkLFJe7mI7oZ0LQtrWpyjiAZcCgYEA1TOnDqrnEKkgnCf7Bttk3pdsVmsTff4z
+WEygxOIIwk543Bixw76C4ZPOuNKVqQ0A0qDX7/JGksziQ8PnCOoWV3cnLdmnNoMS
+1EebVo9ZxBMZSC5Kwqrx1yRtXxSgHdJJag9SVl2odORtcjOx5+CtM+JnBPU2Xy5z
+VpUW1fY2ft0CgYBCUuBR/8exO6m285br3aTBHoaM8LrGY/W5hXIeXoklnHAARmnV
+z8QRWozlMXOQ5Hm+d8uD/HUbbnNLaBepZah/eadYDa6TnrM+Qe+fYjni0X84bNhH
+ICyAZAvaiHKfWpG9YJ/odcuGJlWdF+F+2/OWc/uHT+uPy10+i90RZbR4lwKBgHTN
+F3ixqGU4QuVKAfx/tYM88d1mTAd6fCaj1HAIZUQOOaha3wieFpX+pAIdXGCA/zJl
+a+fIk2FZXZxCdxArLpI8dPppg3IZ3PbvQ+roHgWNcQxaUBrWDCgRjNnKMu4jhpTU
+UAeAyAlCG7O1HoIqVLlYD5hnvqHmkMmeZCRT/wcBAoGAU5xMksckNWvdz6D89BzY
+9a2bgcb0kRVbFicF4GleaheCKhiqtdrTxEiyg1ZwNWTcK/pN8ZSgjV7chs28lkPR
+uZFDLL6Y+ZZZaqY8hnTdaMHXVIg3revfUWYS5+Em+7ZxkofFLw4AuGoWKt354sug
+vM/Ukk+vi7GDiJIKsqWACFA=
+-----END PRIVATE KEY-----