From acaaec6e96cd6523c4c8d84ee50b2d5026fbe7f4 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 16 Apr 2023 15:07:18 +0200 Subject: [PATCH] run --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e74beaa..b7fe1bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,9 @@ RUN apt-get update && \ && apt-get clean && \ rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/* +COPY munin_stats /etc/munin/plugins/munin_stats +COPY munin_update /etc/munin/plugins/munin_update + RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf) && \ (sed -i 's/^Alias.*/Alias \/ \/var\/cache\/munin\/www\//g' /etc/apache2/sites-available/000-default.conf) && \ (sed -i 's/Allow from .*/Satisfy Any/g' /etc/apache2/sites-available/000-default.conf) && \ @@ -29,9 +32,10 @@ RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf) (mkdir -p /var/run/munin && \ chown -R munin:munin /var/run/munin) && \ (chfn -f 'munin' root) && \ - (/usr/sbin/a2enmod fcgid) - -RUN rm -rf /etc/munin/plugins + (/usr/sbin/a2enmod fcgid) \ + rm -rf /etc/munin/plugins \ + chmod +x /etc/munin/plugins/munin_stats \ + chmod +x /etc/munin/plugins/munin_update COPY 000-default.conf /etc/apache2/sites-available/000-default.conf COPY logrotate-munin /etc/logrotate.d/munin @@ -40,9 +44,6 @@ COPY ssmtp.conf /etc/ssmtp/ssmtp.conf COPY revaliases /etc/ssmtp/revaliases COPY munin_mail.conf /etc/munin/munin-conf.d/munin_mail.conf -COPY munin_stats /etc/munin/plugins/munin_stats -COPY munin_update /etc/munin/plugins/munin_update -RUN chmod +x /etc/munin/plugins/munin_stats ; chmod +x /etc/munin/plugins/munin_update # copy launcher COPY run.sh /usr/local/bin/run RUN chmod +x /usr/local/bin/run