From b009986ce411be4b4d562a4c7bc07f504aba61cc Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 24 Aug 2020 16:48:38 -0400 Subject: [PATCH] Fixed escaping for DB certs in web images --- .DB_CERT_FILE | 21 ++++++++++ .DB_KEY_FILE | 27 +++++++++++++ .ZBX_DB_CA_FILE | 42 ++++++++++++++++++++ .ZBX_DB_CERT_FILE | 21 ++++++++++ .ZBX_DB_KEY_FILE | 27 +++++++++++++ web-apache-mysql/ubuntu/docker-entrypoint.sh | 4 ++ web-apache-pgsql/ubuntu/docker-entrypoint.sh | 4 ++ web-nginx-mysql/ubuntu/docker-entrypoint.sh | 4 ++ web-nginx-pgsql/ubuntu/docker-entrypoint.sh | 4 ++ 9 files changed, 154 insertions(+) create mode 100644 .DB_CERT_FILE create mode 100644 .DB_KEY_FILE create mode 100644 .ZBX_DB_CA_FILE create mode 100644 .ZBX_DB_CERT_FILE create mode 100644 .ZBX_DB_KEY_FILE diff --git a/.DB_CERT_FILE b/.DB_CERT_FILE new file mode 100644 index 000000000..05b7cc833 --- /dev/null +++ b/.DB_CERT_FILE @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDejCCAmICAQEwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAkxWMQ0wCwYD +VQQIDARSaWdhMQ0wCwYDVQQHDARSaWdhMQ8wDQYDVQQKDAZaYWJiaXgxCzAJBgNV +BAsMAklUMRUwEwYDVQQDDAxteXNxbC1zZXJ2ZXIxIDAeBgkqhkiG9w0BCQEWEWRv +dG5lZnRAZ21haWwuY29tMB4XDTIwMDgyNDIwMjIwMloXDTMwMDcwMzIwMjIwMlow +gYIxCzAJBgNVBAYTAkxWMQ0wCwYDVQQIDARSaWdhMQ0wCwYDVQQHDARSaWdhMQ8w +DQYDVQQKDAZaYWJiaXgxCzAJBgNVBAsMAklUMRUwEwYDVQQDDAxteXNxbC1zZXJ2 +ZXIxIDAeBgkqhkiG9w0BCQEWEWRvdG5lZnRAZ21haWwuY29tMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDYZafFy25N8HxMZhpEX3L4DtDJOxdIQl4Ep +42O8yCs+7n9RaN6I+v3o0D3uGtEKY7no9tSHNz+0bNki2ndW+CAtcmp447/4/3ye +d/4G7b2hGqzEcjg71nMOJPKYFpLCcWVSa7u5qgNW70payhNV7CmVnV9ywe0udDNA +k7Er7zLb2WBwKMZgmM923uZFllEXet2zd8+lh3GFfhE/zOZATLB0deK8TJoipWPB +w/iyjBpBYpOND/J0nBXGaZLSKp3osyeUzBh9v85CJM/d+/sSPyfLiS+XdL9YqDUn +FAgW3MQ88POJ0HnFz5UNF7A+9yEv3BTfqIOW1hk4SFQ2vOS+/wIDAQABMA0GCSqG +SIb3DQEBCwUAA4IBAQA+/BFABAxNYvTn2SIr8sqLYnrDgh7hrQC1VjZ6HvnmgvlY +KRO76Ub7CwUErvkFEWvdHEiUa0FfEUohGpNngoTyQ7ngQ/r94J9f6FGIdBJcZ7W4 +lgdIXHfgiP1QojyedTyyB8h2BJ3sB74GDmiXolU53Q88XKTaWMQ6WBSV2vVRqPH0 +ITRzH7TLDyul6Qi0UWJkhNs3eJhCCbzTLDz2CmqDRguVKgHeLis8MFVP80+Jiluk +xnJAhIOO4MnVzdwb4aIJ9pZW0dZ/13cDt3rzRvgJDvPnCrHWFeuUvyPrMxZkMDOw +TbdB5coYXLVLcvi/ZbzIKt4WHIBbF00ja6n/BrqB +-----END CERTIFICATE----- diff --git a/.DB_KEY_FILE b/.DB_KEY_FILE new file mode 100644 index 000000000..e2dcf31dc --- /dev/null +++ b/.DB_KEY_FILE @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAtDYZafFy25N8HxMZhpEX3L4DtDJOxdIQl4Ep42O8yCs+7n9R +aN6I+v3o0D3uGtEKY7no9tSHNz+0bNki2ndW+CAtcmp447/4/3yed/4G7b2hGqzE +cjg71nMOJPKYFpLCcWVSa7u5qgNW70payhNV7CmVnV9ywe0udDNAk7Er7zLb2WBw +KMZgmM923uZFllEXet2zd8+lh3GFfhE/zOZATLB0deK8TJoipWPBw/iyjBpBYpON +D/J0nBXGaZLSKp3osyeUzBh9v85CJM/d+/sSPyfLiS+XdL9YqDUnFAgW3MQ88POJ +0HnFz5UNF7A+9yEv3BTfqIOW1hk4SFQ2vOS+/wIDAQABAoIBACFGX/js6T1cBS4j +s7HiNpq+xyZNp7flKsUex2JCN0hqm8sj3R9U/8wAeC2DUeTHtnhlinuREIqGC8WR +blsScA+OuXWH7Vx4RPy/wO79C8B4JDgtsHQ6p+nYAsOVu7lnTdnsUISt/AFFbpbu +jscDPPlHUGXniuP97HbuQ71BmJAo74l6PEE2YPo2QwyLCNslA7KRIi+P7Xcys+4c +6ZUiNAK1K0G8bZNsjgYLWNNiK08kGIalhbF3Y3rY1XDvIJ1nNdS7UtgHioVXnW8W +KztiEMPqRpdKvxuKSSQHGXfNXnd9gDTKBDs/A+AuAVkuCIYFTaCl3LN7VMlztPeh +AwCRqKkCgYEA3t53nx/ZCdTQXGVcrugCAvr0UFr8z5k2Slx+4MxniKqZwOdyQ4ma +qvgkkKa28IzEsr6wRBTkKC6Hvh/1mo6BDNTddKJtBSTc/EWtxefEgN6Yty5iBRt0 +BNjaRb++7GKtGG4p1fN0sH3ZkZJ8tFZ0gEnimv8Kd0StPbPZWFiqctMCgYEAzwA+ +0YMQc+JJKZra8X8oErXXDP7zLnZ3wOZciZC8d23Ek83pblXVfGchYwZ5BZpk0TM8 +JrWZ8hcF6clb22H7UqKg3woTq5zzCJdRxXS3nKdCS9qoip7+GKHNd8Q4yTqle1N1 +djuD6BXNTiNp3+HbjV0xKSciggeABnDlsIO8L6UCgYEAj7t19j+536dKQWx1m6+x +LG7ghbpIdTJgWxDQGvZ4hyFPS6N4g6oI/95M5qU+MmD2sjhcwWufwXJQxQMjiGwD +Ol1F/WSLXtfpVSEy8wGIL3xfjTPyr0yHRGD+VCFXZmg1Lh5OCNecF/7yA/ovRrbD +J8F+zWtSOp0mBTcqItn8A1UCgYAb9ZiGjAFo5aOkLvprrBUpkc4eP0FxgSbjsznE +ivwp1XW70RA6ivVu/C8SRQmLrDL53sW9JMJKZLmzvjLeCvn7S2QXPDEz+NsKygWN +ehpi2mSmAj7JmngPs6shBiv1Yip/4eH3ukoyyt8UMsxWJReWnIPLXzHWBlVQiWc8 +1E5S0QKBgQDJWlDDdMkp5KW7/o0UbXjL+hmYLNmwJemy2IH4VUSWLoPPjfaSPw9D +uWxqfdWyQwmWiGGiXEXMd2Pd0FfOa10PfH0v2OVrj9/Ak+pW/KiwXt0c+BNX7Ftv +0iN17SsnKmUmZvLp7TiafFxTFz3kVw984S/I3CUv78rQDTRJfIStog== +-----END RSA PRIVATE KEY----- diff --git a/.ZBX_DB_CA_FILE b/.ZBX_DB_CA_FILE new file mode 100644 index 000000000..f666cd1cc --- /dev/null +++ b/.ZBX_DB_CA_FILE @@ -0,0 +1,42 @@ +-----BEGIN CERTIFICATE----- +MIIDejCCAmICAQEwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAkxWMQ0wCwYD +VQQIDARSaWdhMQ0wCwYDVQQHDARSaWdhMQ8wDQYDVQQKDAZaYWJiaXgxCzAJBgNV +BAsMAklUMRUwEwYDVQQDDAxteXNxbC1zZXJ2ZXIxIDAeBgkqhkiG9w0BCQEWEWRv +dG5lZnRAZ21haWwuY29tMB4XDTIwMDgyNDIwMjIwMloXDTMwMDcwMzIwMjIwMlow +gYIxCzAJBgNVBAYTAkxWMQ0wCwYDVQQIDARSaWdhMQ0wCwYDVQQHDARSaWdhMQ8w +DQYDVQQKDAZaYWJiaXgxCzAJBgNVBAsMAklUMRUwEwYDVQQDDAxteXNxbC1zZXJ2 +ZXIxIDAeBgkqhkiG9w0BCQEWEWRvdG5lZnRAZ21haWwuY29tMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtDYZafFy25N8HxMZhpEX3L4DtDJOxdIQl4Ep +42O8yCs+7n9RaN6I+v3o0D3uGtEKY7no9tSHNz+0bNki2ndW+CAtcmp447/4/3ye +d/4G7b2hGqzEcjg71nMOJPKYFpLCcWVSa7u5qgNW70payhNV7CmVnV9ywe0udDNA +k7Er7zLb2WBwKMZgmM923uZFllEXet2zd8+lh3GFfhE/zOZATLB0deK8TJoipWPB +w/iyjBpBYpOND/J0nBXGaZLSKp3osyeUzBh9v85CJM/d+/sSPyfLiS+XdL9YqDUn +FAgW3MQ88POJ0HnFz5UNF7A+9yEv3BTfqIOW1hk4SFQ2vOS+/wIDAQABMA0GCSqG +SIb3DQEBCwUAA4IBAQA+/BFABAxNYvTn2SIr8sqLYnrDgh7hrQC1VjZ6HvnmgvlY +KRO76Ub7CwUErvkFEWvdHEiUa0FfEUohGpNngoTyQ7ngQ/r94J9f6FGIdBJcZ7W4 +lgdIXHfgiP1QojyedTyyB8h2BJ3sB74GDmiXolU53Q88XKTaWMQ6WBSV2vVRqPH0 +ITRzH7TLDyul6Qi0UWJkhNs3eJhCCbzTLDz2CmqDRguVKgHeLis8MFVP80+Jiluk +xnJAhIOO4MnVzdwb4aIJ9pZW0dZ/13cDt3rzRvgJDvPnCrHWFeuUvyPrMxZkMDOw +TbdB5coYXLVLcvi/ZbzIKt4WHIBbF00ja6n/BrqB +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDezCCAmMCAQEwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAkxWMQ0wCwYD +VQQIDARSaWdhMQ0wCwYDVQQHDARSaWdhMQ8wDQYDVQQKDAZaYWJiaXgxCzAJBgNV +BAsMAklUMRUwEwYDVQQDDAxteXNxbC1zZXJ2ZXIxIDAeBgkqhkiG9w0BCQEWEWRv +dG5lZnRAZ21haWwuY29tMB4XDTIwMDgyNDIwMjI0N1oXDTMwMDcwMzIwMjI0N1ow +gYMxCzAJBgNVBAYTAkxWMQ0wCwYDVQQIDARSaWdhMQ0wCwYDVQQHDARSaWdhMQ8w +DQYDVQQKDAZaYWJiaXgxCzAJBgNVBAsMAklUMRYwFAYDVQQDDA16YWJiaXgtc2Vy +dmVyMSAwHgYJKoZIhvcNAQkBFhFkb3RuZWZ0QGdtYWlsLmNvbTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAKFmcXQWKkZDmGyirvVAbdQkjvHeEmMz8a5V +4DrQcEmvoDus/6XdG6dfdOAzYLD+iJV1nkH3dB32uaV0W/P6+ltknwe9pxK67wk5 +uNW1xZ1Qw9OPBz9F/Dl8sVrzLCoIXrYXXb1qKGhJ8o/sagBCJGHTT7SA2zSzDnQZ +B35mgng2Ugk9FsFL6mJUdF75Z1QwmVOO1HbfGwHW+UfJtD1afIuG5wS8kKE5dNKy +V4T3ZlTM8PQW0Adae/efaUEC04ofeJl8qCSrGdYsQASFJ5DdFWq+c2tzWJ8KpMiI +buX7b+MKnerAI9VjtY130Sma4z5wZgxLAVmB66wfKpgsMImukRsCAwEAATANBgkq +hkiG9w0BAQsFAAOCAQEATPQreWK9kZ5vPTq/Mu4Rx74rtuVkdvTUS+cYEPFXy/Ph +8FKTvh58k3UrdWKcKC+oaEABuDWoPur+waKoww77V/JEsR2quO4/+14eg1KyUOPj +jHDqAQKNFQP9njuqTL37elj1r1ng+iq4+3JoQwTQ/0Xxc5ScrH6r2/4HtPjB6HBz +Nwat1m4+8bbqdZ2YAtPeu4uTb56li/Kj2FbREX1MN+/ztmvppw62MIeRxhFwNBdc +IfissJXcPqE5GDWagcXCQWePI9gvcXR8d/0uIp8mdShSjXeZL+0twjYvIHGWQM6v +uVlbl0a4mf05ZM1NaZiBD6zjTroQjAp/c8Ln5cu+ow== +-----END CERTIFICATE----- diff --git a/.ZBX_DB_CERT_FILE b/.ZBX_DB_CERT_FILE new file mode 100644 index 000000000..06fb16563 --- /dev/null +++ b/.ZBX_DB_CERT_FILE @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDezCCAmMCAQEwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAkxWMQ0wCwYD +VQQIDARSaWdhMQ0wCwYDVQQHDARSaWdhMQ8wDQYDVQQKDAZaYWJiaXgxCzAJBgNV +BAsMAklUMRUwEwYDVQQDDAxteXNxbC1zZXJ2ZXIxIDAeBgkqhkiG9w0BCQEWEWRv +dG5lZnRAZ21haWwuY29tMB4XDTIwMDgyNDIwMjI0N1oXDTMwMDcwMzIwMjI0N1ow +gYMxCzAJBgNVBAYTAkxWMQ0wCwYDVQQIDARSaWdhMQ0wCwYDVQQHDARSaWdhMQ8w +DQYDVQQKDAZaYWJiaXgxCzAJBgNVBAsMAklUMRYwFAYDVQQDDA16YWJiaXgtc2Vy +dmVyMSAwHgYJKoZIhvcNAQkBFhFkb3RuZWZ0QGdtYWlsLmNvbTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAKFmcXQWKkZDmGyirvVAbdQkjvHeEmMz8a5V +4DrQcEmvoDus/6XdG6dfdOAzYLD+iJV1nkH3dB32uaV0W/P6+ltknwe9pxK67wk5 +uNW1xZ1Qw9OPBz9F/Dl8sVrzLCoIXrYXXb1qKGhJ8o/sagBCJGHTT7SA2zSzDnQZ +B35mgng2Ugk9FsFL6mJUdF75Z1QwmVOO1HbfGwHW+UfJtD1afIuG5wS8kKE5dNKy +V4T3ZlTM8PQW0Adae/efaUEC04ofeJl8qCSrGdYsQASFJ5DdFWq+c2tzWJ8KpMiI +buX7b+MKnerAI9VjtY130Sma4z5wZgxLAVmB66wfKpgsMImukRsCAwEAATANBgkq +hkiG9w0BAQsFAAOCAQEATPQreWK9kZ5vPTq/Mu4Rx74rtuVkdvTUS+cYEPFXy/Ph +8FKTvh58k3UrdWKcKC+oaEABuDWoPur+waKoww77V/JEsR2quO4/+14eg1KyUOPj +jHDqAQKNFQP9njuqTL37elj1r1ng+iq4+3JoQwTQ/0Xxc5ScrH6r2/4HtPjB6HBz +Nwat1m4+8bbqdZ2YAtPeu4uTb56li/Kj2FbREX1MN+/ztmvppw62MIeRxhFwNBdc +IfissJXcPqE5GDWagcXCQWePI9gvcXR8d/0uIp8mdShSjXeZL+0twjYvIHGWQM6v +uVlbl0a4mf05ZM1NaZiBD6zjTroQjAp/c8Ln5cu+ow== +-----END CERTIFICATE----- diff --git a/.ZBX_DB_KEY_FILE b/.ZBX_DB_KEY_FILE new file mode 100644 index 000000000..c2211599d --- /dev/null +++ b/.ZBX_DB_KEY_FILE @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEAoWZxdBYqRkOYbKKu9UBt1CSO8d4SYzPxrlXgOtBwSa+gO6z/ +pd0bp1904DNgsP6IlXWeQfd0Hfa5pXRb8/r6W2SfB72nErrvCTm41bXFnVDD048H +P0X8OXyxWvMsKghethddvWooaEnyj+xqAEIkYdNPtIDbNLMOdBkHfmaCeDZSCT0W +wUvqYlR0XvlnVDCZU47Udt8bAdb5R8m0PVp8i4bnBLyQoTl00rJXhPdmVMzw9BbQ +B1p7959pQQLTih94mXyoJKsZ1ixABIUnkN0Var5za3NYnwqkyIhu5ftv4wqd6sAj +1WO1jXfRKZrjPnBmDEsBWYHrrB8qmCwwia6RGwIDAQABAoIBAQCJiy3gSgtYub4p +xjHnWzK9eTJAOIne9KNfeFuQg5VNllesw29RwC4S4qxNbDtYWnG3PPbTLLhN2La4 +o4LBVv8H56YHCL5aneebKw+zQCbaO7vGjLsWVuPtcbAK2/SlFWDxONRv2Qn6ZhpK +QKTM95DdtSDVqIImVPlaQwI5284P9o/dzrV+qFkx+P7T+t1gObj3tkLE00cA4rQx +ji2EEbRZaqVDUk47jn0doTz26hjdbBD4T7n3RG3VUsNLLG2D8bXmaRhbK31ZTr0V +Y80kj4f3sZKdjr8DY/24fsqRWXhwG1e1bmEtI7uovHzX/ONATCMkEwxcLbCTZHFl +AtlDvVmxAoGBANZXwtsQZvCNvuVXRFR9KjZuQi/Iol8FF+3PL4/JjHy7cCwBmdsC +V577VamAW9cdhTTlX5cg/8X9d73/zbhyaga+k0K9DjhwiE4hT/VKC8U79dTZRWqe +wBeMWfE0/D5v7+h7v9VVVAIJBnsToGl1xgCisMcYPbb9foQKc3FqyjMfAoGBAMDE +ncv4e8V29OC3aU7RPDrwAq2rOukp3p8hIlZ1n5eHRHkI1vYPGzhhmIf0Ro9pINqS +9ixyJ9OgLuiMX1GQTOsqvKovxln47HUSlxC0MzpZenmX+eSRNtiIsxxvBNBSpL5J +KF/m9hyAGxmwUnyCo3fY4oK3vJa7WOTGfDQmL76FAoGAJGvFMHQZCccMKOwrMDAU +fCtAE96DuKGk70PFUSluNcOjy9Z5zj0XpmwOoj6tXGAnwlU3aPayf3ISZraQvkay +vXKkkzKMuApnHt+KNqPeXCVUIFbK9NME0PuITPQz6Ggc2+QrNJTLMY1XDJLJLyJU +AseiQjJcSjvIw6cC9sKumQECgYB2JUttYwtA+GqXe/IwG29l1ApgNK0zkLTgJOet +xAOfVIl0ASX2w0V0peRdlyrT5KP9MstsbD7aprd5UedtzxpFm/jr+cIBDN6n1k/+ +LeOj5Il7EtlW7GWICyhzydtSbwSHl8EGHkFDMITrlrTHmS3lW2lgoooUfBi8hqZD +NBBZHQKBgFK3aT5SYzuw6VC5GgP0YgkucWa1UhhNGWpugtVcEMeaGs1nhcEbAeH7 +/mND+LqcAqxu/bu+42+5QtwzPuUKpZ2jDZw+Bbs4eC3zFf/1zGriyK8a4V25w0te +cZ0OAeeiHowN9ceqR/D1jL/DEs9gcDLnO/VvpSsGeRigmSNQGmWn +-----END RSA PRIVATE KEY----- diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh index 4d1654ee7..153a87292 100755 --- a/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -226,6 +226,10 @@ prepare_zbx_web_config() { history_storage_url=$(escape_spec_char "${ZBX_HISTORYSTORAGEURL}") history_storage_types=$(escape_spec_char "${ZBX_HISTORYSTORAGETYPES}") + ZBX_DB_KEY_FILE=$(escape_spec_char "${ZBX_DB_KEY_FILE}") + ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") + ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") + sed -i \ -e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \ -e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \ diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh index 49d8268ec..d539e4727 100755 --- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -246,6 +246,10 @@ prepare_zbx_web_config() { history_storage_url=$(escape_spec_char "${ZBX_HISTORYSTORAGEURL}") history_storage_types=$(escape_spec_char "${ZBX_HISTORYSTORAGETYPES}") + ZBX_DB_KEY_FILE=$(escape_spec_char "${ZBX_DB_KEY_FILE}") + ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") + ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") + sed -i \ -e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \ -e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \ diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 40e5bc1ae..f4731c7d7 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -253,6 +253,10 @@ prepare_zbx_web_config() { history_storage_url=$(escape_spec_char "${ZBX_HISTORYSTORAGEURL}") history_storage_types=$(escape_spec_char "${ZBX_HISTORYSTORAGETYPES}") + ZBX_DB_KEY_FILE=$(escape_spec_char "${ZBX_DB_KEY_FILE}") + ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") + ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") + sed -i \ -e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \ -e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \ diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 53d8ae519..dad9542a5 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -267,6 +267,10 @@ prepare_zbx_web_config() { history_storage_url=$(escape_spec_char "${ZBX_HISTORYSTORAGEURL}") history_storage_types=$(escape_spec_char "${ZBX_HISTORYSTORAGETYPES}") + ZBX_DB_KEY_FILE=$(escape_spec_char "${ZBX_DB_KEY_FILE}") + ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") + ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") + sed -i \ -e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \ -e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \