Skip to content

Commit 6c679b5

Browse files
committed
SYS-313 docker 18.02 updates for weewx, nexus; add mcelog to nodes
1 parent 57b6ad3 commit 6c679b5

4 files changed

Lines changed: 8 additions & 1 deletion

File tree

ansible/roles/monitoring_agent/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,6 @@ opensuse_repos:
4848

4949
ubuntu_packages:
5050
- bc
51+
- mcelog
5152
- nagios-nrpe-server
5253
- smartmontools

images/weewx/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ENV ALTITUDE="100, foot" \
1717
DB_NAME=weewx_a \
1818
DB_NAME_FORECAST=weewx_f \
1919
DB_USER=weewx \
20+
DEBUG=0 \
2021
DEVICE_PORT=/dev/ttyUSB0 \
2122
HTML_ROOT=/var/www/weewx \
2223
LOCATION="Anytown, USA" \

images/weewx/entrypoint.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ DB_PASS=$(cat /run/secrets/weewx-db-password)
44
WUNDER_PASS=$(cat /run/secrets/weewx-wunderground-password)
55
WUNDER_API_KEY=$(cat /run/secrets/weewx-wunderground-apikey)
66
SSHKEY=weewx-rsync-sshkey
7+
WX_GROUP=dialout
78
HOMEDIR=/home/$WX_USER
89
PATH=$HOMEDIR/bin:$PATH
910

@@ -22,6 +23,7 @@ if [ ! -e $HOMEDIR/weewx.conf.bak ]; then
2223
sed --in-place=.bak -e "s/location = DESC/location = \"$LOCATION\"/" \
2324
-e "s/altitude = 0, foot/altitude = $ALTITUDE/" \
2425
-e "s/archive_interval =.*/archive_interval = $LOGGING_INTERVAL/" \
26+
-e "s/debug = 0/debug = $DEBUG/" \
2527
-e "s/latitude =.*/latitude = $LATITUDE/" \
2628
-e "s/longitude =.*/longitude = $LONGITUDE/" \
2729
-e "s:port = /dev/.*:port = $DEVICE_PORT:" \
@@ -62,6 +64,7 @@ if [ ! -e $HOMEDIR/weewx.conf.bak ]; then
6264
wee_device --set-tz-code=$TZ_CODE
6365
fi
6466

67+
sed -i -e "s/^\$ModLoad imklog/#\$ModLoad imklog/" /etc/rsyslog.conf
6568
rsyslogd
6669

6770
cp /run/secrets/$SSHKEY /run/$SSHKEY && chmod 400 /run/$SSHKEY
@@ -77,6 +80,8 @@ EOF
7780
fi
7881

7982
chown -R $WX_USER $HOMEDIR $HTML_ROOT /run/$SSHKEY
83+
# Docker 18.02 changes group to root at launch
84+
chgrp $WX_GROUP /dev/ttyUSB0
8085
set +e
8186
su $WX_USER -c "PATH=$PATH weewxd $HOMEDIR/weewx.conf|grep -v LOOP:"
8287
# Failure: attempt restart only every 2 minutes

stacks/nexus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3"
22
services:
33

44
app:
5-
image: sonatype/nexus3:3.7.0
5+
image: sonatype/nexus3:3.8.0
66
hostname: nexus
77
environment:
88
INSTALL4J_ADD_VM_PARAMS: >

0 commit comments

Comments
 (0)