Added tzdata package to Zabbix components

This commit is contained in:
Alexey Pustovalov
2020-08-29 05:20:45 -04:00
31 changed files with 317 additions and 18 deletions

View File

@ -164,14 +164,38 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`.
The varable is PHP ``max_input_time`` option. By default, value is `300`.
### `ZBX_SESSION_NAME`
The variable is Zabbix frontend [definition](https://www.zabbix.com/documentation/4.2/manual/web_interface/definitions). String used as the name of the Zabbix frontend session cookie. By default, value is `zbx_sessionid`.
### `ZBX_DB_ENCRYPTION`
The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default.
### `ZBX_DB_KEY_FILE`
The variable allows to specify the full path to a valid TLS key file. Available since 5.0.0.
### `ZBX_DB_CERT_FILE`
The variable allows to specify the full path to a valid TLS certificate file. Available since 5.0.0.
### `ZBX_DB_CA_FILE`
The variable allows to specify the full path to a valid TLS certificate authority file. Available since 5.0.0.
### `ZBX_DB_VERIFY_HOST`
The variable allows to activate host verification. Available since 5.0.0.
### `ZBX_DB_CIPHER_LIST`
The variable allows to specify a custom list of valid ciphers. The format of the cipher list must conform to the OpenSSL standard. Available since 5.0.0.
## Allowed volumes for the Zabbix web interface container
### ``/etc/ssl/nginx``
The volume allows to enable HTTPS for the Zabbix web interface. The volume must contains two files ``ssl.crt``, ``ssl.key`` and ``dhparam.pem`` prepared for Nginx SSL connections.
The volume allows to enable HTTPS for the Zabbix web interface. The volume must contains three files ``ssl.crt``, ``ssl.key`` and ``dhparam.pem`` prepared for Nginx SSL connections.
Please follow official Nginx [documentation](http://nginx.org/en/docs/http/configuring_https_servers.html) to get more details about how to create certificate files.

View File

@ -163,15 +163,41 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`.
The varable is PHP ``max_input_time`` option. By default, value is `300`.
<<<<<<< HEAD
### `ZBX_SESSION_NAME`
The variable is Zabbix frontend [definition](https://www.zabbix.com/documentation/4.2/manual/web_interface/definitions). String used as the name of the Zabbix frontend session cookie. By default, value is `zbx_sessionid`.
=======
### `ZBX_DB_ENCRYPTION`
The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default.
### `ZBX_DB_KEY_FILE`
The variable allows to specify the full path to a valid TLS key file. Available since 5.0.0.
### `ZBX_DB_CERT_FILE`
The variable allows to specify the full path to a valid TLS certificate file. Available since 5.0.0.
### `ZBX_DB_CA_FILE`
The variable allows to specify the full path to a valid TLS certificate authority file. Available since 5.0.0.
### `ZBX_DB_VERIFY_HOST`
The variable allows to activate host verification. Available since 5.0.0.
### `ZBX_DB_CIPHER_LIST`
The variable allows to specify a custom list of valid ciphers. The format of the cipher list must conform to the OpenSSL standard. Available since 5.0.0.
>>>>>>> master
## Allowed volumes for the Zabbix web interface container
### ``/etc/ssl/nginx``
The volume allows to enable HTTPS for the Zabbix web interface. The volume must contains two files ``ssl.crt``, ``ssl.key`` and ``dhparam.pem`` prepared for Nginx SSL connections.
The volume allows to enable HTTPS for the Zabbix web interface. The volume must contains three files ``ssl.crt``, ``ssl.key`` and ``dhparam.pem`` prepared for Nginx SSL connections.
Please follow official Nginx [documentation](http://nginx.org/en/docs/http/configuring_https_servers.html) to get more details about how to create certificate files.

View File

@ -163,15 +163,41 @@ The varable is PHP ``upload_max_filesize`` option. By default, value is `2M`.
The varable is PHP ``max_input_time`` option. By default, value is `300`.
<<<<<<< HEAD
### `ZBX_SESSION_NAME`
The variable is Zabbix frontend [definition](https://www.zabbix.com/documentation/4.2/manual/web_interface/definitions). String used as the name of the Zabbix frontend session cookie. By default, value is `zbx_sessionid`.
=======
### `ZBX_DB_ENCRYPTION`
The variable allows to activate encryption for connections to Zabbix database. Even if no other environment variables are specified, connections will be TLS-encrypted if `ZBX_DB_ENCRYPTION=true` specified. Available since 5.0.0. Disabled by default.
### `ZBX_DB_KEY_FILE`
The variable allows to specify the full path to a valid TLS key file. Available since 5.0.0.
### `ZBX_DB_CERT_FILE`
The variable allows to specify the full path to a valid TLS certificate file. Available since 5.0.0.
### `ZBX_DB_CA_FILE`
The variable allows to specify the full path to a valid TLS certificate authority file. Available since 5.0.0.
### `ZBX_DB_VERIFY_HOST`
The variable allows to activate host verification. Available since 5.0.0.
### `ZBX_DB_CIPHER_LIST`
The variable allows to specify a custom list of valid ciphers. The format of the cipher list must conform to the OpenSSL standard. Available since 5.0.0.
>>>>>>> master
## Allowed volumes for the Zabbix web interface container
### ``/etc/ssl/nginx``
The volume allows to enable HTTPS for the Zabbix web interface. The volume must contains two files ``ssl.crt``, ``ssl.key`` and ``dhparam.pem`` prepared for Nginx SSL connections.
The volume allows to enable HTTPS for the Zabbix web interface. The volume must contains three files ``ssl.crt``, ``ssl.key`` and ``dhparam.pem`` prepared for Nginx SSL connections.
Please follow official Nginx [documentation](http://nginx.org/en/docs/http/configuring_https_servers.html) to get more details about how to create certificate files.

View File

@ -281,6 +281,10 @@ prepare_zbx_web_config() {
ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}")
ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}")
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" \