Move datafile lock into the database folder and keep the rest of run files outside of the volume (since UNIX domain sockets can't be created on GlusterFS)

1 files changed, 7 insertions, 7 deletions

diff --git a/Dockerfile b/Dockerfile
index fd9120e..cf26e49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
     SUPERCRONIC=supercronic-linux-amd64 \
     SUPERCRONIC_SHA1SUM=be43e64c45acd6ec4fce5831e03759c89676a0ea
 
-VOLUME /munin
+VOLUME /munin/db
 #Only small temporary files, doesn't need volume
 #VOLUME /var/lib/nginx
 
@@ -22,8 +22,7 @@ ADD ./munin.conf /etc/munin/munin.conf
 ADD ./nginx.conf /etc/nginx/nginx.conf
 ADD ./nginx-munin /etc/nginx/sites-enabled/munin
 ADD ./start-munin.sh /munin.sh
-ADD ./munin-graph-logging.patch /usr/lib/munin
-ADD ./munin-update-logging.patch /usr/lib/munin
+ADD ./patches /patches
 
 # rsyslog is not actually used, but I keep here configuration just in case
 # Nginx always creates error_log in /var/log/nginx, but doesn't write there if other locating is configured
@@ -41,16 +40,17 @@ RUN \
     rm -f /etc/nginx/sites-enabled/default && \
     \
     ln -s /usr/share/webapps/munin/cgi /usr/lib/munin/cgi && \
-    cd /usr/lib/munin && patch munin-graph < munin-graph-logging.patch && patch munin-update < munin-update-logging.patch && \
+    cd /usr/lib/munin && patch munin-graph < /patches/munin-graph-logging.patch && patch munin-update < /patches/munin-update-logging.patch && \
+    cd /usr/share/perl5/vendor_perl/Munin/Master/ && patch Update.pm < /patches/munin-ds-datalock.patch && \
     sed -re "/@[[:alnum:]]+/ d; s|munin if|if|" /etc/munin/munin.cron.sample > /etc/munin/munin.cron && \
     \
-    bash -c "mkdir -p /munin/{db,run,log,www/cache}" && \
+    bash -c "mkdir -p /munin/{db,log,www/cache}" && \
     ln -s ../www/cache /munin/db/cgi-tmp && \
     rm -rf /var/lib/munin/cgi-tmp && \
     ln -s /munin/www/cache /var/lib/munin/cgi-tmp && \
     \
-    chgrp -R root /munin /etc/munin/munin.conf /var/tmp/nginx /var/lib/nginx && \
-    chmod -R g+rw /munin /etc/munin/munin.conf /var/tmp/nginx  && \
+    chgrp -R root /munin /var/run/munin /etc/munin/munin.conf /var/tmp/nginx /var/lib/nginx && \
+    chmod -R g+rw /munin /var/run/munin /etc/munin/munin.conf /var/tmp/nginx  && \
     for name in "/var/tmp/nginx /munin/"; do find $name -type d -print0 | xargs -0 chmod g+x; done
 
 EXPOSE 8080