Added support for setting local timezone, and updated README

This commit is contained in:
Jack-Benny Persson 2020-04-29 20:12:16 +02:00
parent 6a4fc4dea7
commit 6a64f09ea5
2 changed files with 14 additions and 5 deletions

View File

@ -17,11 +17,13 @@ Everything is controlled using the follwing environment variables.
* **TICKET** is the ticket you get from the master (if you are using Director
you find it under the Agent tab of the host).
* **ACCEPT_CONFIG** takes a ***y*** or ***n*** value for yes or no. The default is
***n***.
***n***
* **ACCEPT_COMMANDS** takes a ***y*** or ***n*** value for yes or no. The default is
***n***.
***n***
* **DISABLE_CONFD** takes a ***y*** or ***n*** value for yes or no. The default is
***y***. This should be a sane default for most people.
* **LOCAL_TIMEZONE** sets the local timezone of the satellite. For example
*Europe/Stockholm* or *America/New_York*
## Example usage
```
@ -44,6 +46,7 @@ services:
image: jackbenny/icinga-satellite
ports:
- 5665:5665
restart:always
environment:
- CN=icinga-sat02.local
- ZONE=icinga-sat02.local
@ -54,6 +57,7 @@ services:
- ACCEPT_CONFIG=y
- ACCEPT_COMMANDS=y
- DISABLE_CONFD=y
- LOCAL_TIMEZONE=Europe/Stockholm
```
## Images
@ -62,6 +66,6 @@ services:
> instead, tagged *0.n*.
There are two available images for you to choose from. The default one (0.*n*) is based on
Debian 10, with Icinga2 from Icingas official repository. The other image (0.*n*-alpine) is
based on Alpine 3.11, with Icinga2 from Alpines repository. The Alpine image is much smaller
in size.
Ubuntu 18.04, with Icinga2 from Icingas official repository. The other image (0.*n*-alpine) is
based on Alpine 3.11, with Icinga2 from Alpines repository. From 0.1.1-alpine and up, the Alpine
image is built on the latest Alpine. The Alpine image is much smaller in size.

View File

@ -37,6 +37,11 @@ else
DISABLE_CONF=" "
fi
# Set the local timezone
if [ ! -z "$LOCAL_TIMEZONE" ]; then
ln -sf /usr/share/zoneinfo/"$LOCAL_TIMEZONE" /etc/localtime
fi
icinga2 pki new-cert --cn "$CN" \
--key /var/lib/icinga2/certs/"${CN}".key \
--cert /var/lib/icinga2/certs/"${CN}".crt