summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Dockerfile4
-rw-r--r--munin.conf2
-rw-r--r--nginx-munin2
3 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index cf26e49..0ada776 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,8 +49,8 @@ RUN \
rm -rf /var/lib/munin/cgi-tmp && \
ln -s /munin/www/cache /var/lib/munin/cgi-tmp && \
\
- 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 && \
+ 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 && \
for name in "/var/tmp/nginx /munin/"; do find $name -type d -print0 | xargs -0 chmod g+x; done
EXPOSE 8080
diff --git a/munin.conf b/munin.conf
index a331659..aa3e550 100644
--- a/munin.conf
+++ b/munin.conf
@@ -1,5 +1,5 @@
dbdir /munin/db
-rundir /var/run/munin
+rundir /tmp
htmldir /munin/www
logdir /munin/log
diff --git a/nginx-munin b/nginx-munin
index 07451b3..4dc9764 100644
--- a/nginx-munin
+++ b/nginx-munin
@@ -24,6 +24,6 @@ server {
}
location / {
- rewrite ^/$ /munin/ redirect; break;
+ rewrite ^/$ munin/ redirect; break;
}
}