From 6a64f09ea5c6103adff70e04139fcc5ad19baed2 Mon Sep 17 00:00:00 2001 From: Jack-Benny Persson Date: Wed, 29 Apr 2020 20:12:16 +0200 Subject: [PATCH] Added support for setting local timezone, and updated README --- README.md | 14 +++++++++----- create-satellite.sh | 5 +++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2949839..9d7fd4e 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/create-satellite.sh b/create-satellite.sh index 7ecd3dc..383f47b 100755 --- a/create-satellite.sh +++ b/create-satellite.sh @@ -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