diff --git a/Dockerfile b/Dockerfile index 283fded..897feeb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ FROM ubuntu:24.04 -# install and configure munin - # hadolint ignore=DL3008 RUN apt-get update && \ RUNLEVEL=1 DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \ @@ -44,6 +42,7 @@ RUN chmod +x /etc/munin/plugins/munin_stats && \ COPY 000-default.conf /etc/apache2/sites-available/000-default.conf COPY logrotate-munin /etc/logrotate.d/munin COPY munin.conf /etc/munin/munin.conf +COPY munin-node.conf /etc/munin/munin-node.conf COPY ssmtp.conf /etc/ssmtp/ssmtp.conf COPY revaliases /etc/ssmtp/revaliases COPY munin_mail.conf /etc/munin/munin-conf.d/munin_mail.conf diff --git a/munin-node.conf b/munin-node.conf new file mode 100644 index 0000000..93202a1 --- /dev/null +++ b/munin-node.conf @@ -0,0 +1,62 @@ +# +# Example config-file for munin-node +# + +log_level 4 +log_file /var/log/munin/munin-node.log +pid_file /var/run/munin/munin-node.pid + +background 1 +setsid 1 + +user root +group root + +# This is the timeout for the whole transaction. +# Units are in sec. Default is 15 min +# +# global_timeout 900 + +# This is the timeout for each plugin. +# Units are in sec. Default is 1 min +# +# timeout 60 + +# Regexps for files to ignore +ignore_file [\#~]$ +ignore_file DEADJOE$ +ignore_file \.bak$ +ignore_file %$ +ignore_file \.dpkg-(tmp|new|old|dist)$ +ignore_file \.rpm(save|new)$ +ignore_file \.pod$ + +# Set this if the client doesn't report the correct hostname when +# telnetting to localhost, port 4949 +# +host_name munin-master + +# A list of addresses that are allowed to connect. This must be a +# regular expression, since Net::Server does not understand CIDR-style +# network notation unless the perl module Net::CIDR is installed. You +# may repeat the allow line as many times as you'd like + +allow ^127\.0\.0\.1$ +allow ^::1$ + +# If you have installed the Net::CIDR perl module, you can use one or more +# cidr_allow and cidr_deny address/mask patterns. A connecting client must +# match any cidr_allow, and not match any cidr_deny. Note that a netmask +# *must* be provided, even if it's /32 +# +# Example: +# +# cidr_allow 127.0.0.1/32 +# cidr_allow 192.0.2.0/24 +# cidr_deny 192.0.2.42/32 + +# Which address to bind to; +host 0.0.0.0 + +# And which port +port 4949 diff --git a/run.sh b/run.sh index e110745..d0dadfb 100644 --- a/run.sh +++ b/run.sh @@ -24,7 +24,6 @@ THISSERVERNAME=${SERVERNAME:="munin"} sed -i "s/^\[localhost\.localdomain\]/\[$SERVERNAME\]/g" /etc/apache2/sites-available/000-default.conf # configure mail notification - if [[ -n "$MAILCONTACT" && -n "$MAILSERVER" && -n "$MAILPORT" && -n "$MAILUSER" && -n "$MAILPASSWORD" && -n "$MAILDOMAIN" ]] ; then MAILCONTACT=${MAILCONTACT:="contact@domain.test"} sed -i "s/mailcontact/$MAILCONTACT/g" /etc/ssmtp/ssmtp.conf @@ -81,7 +80,7 @@ fi # ensure munin folder exist and have right permission mkdir -p /var/lib/munin/cgi-tmp /var/cache/munin/www -chown -R munin:munin /var/lib/munin /var/cache/munin +chown -R munin:munin /var/lib/munin /var/cache/munin chmod -R ugo+rw /var/lib/munin/cgi-tmp chown munin:munin /var/log/munin/munin-graph.log chown munin:munin /var/log/munin/munin-limits.log