diff --git a/Dockerfile b/Dockerfile index a0edd5c..e33865c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ FROM thallian/confd-env:latest -ENV CERT_HOME /etc/ssl/murmur - RUN apk add --no-cache \ murmur \ icu-libs \ @@ -10,6 +8,4 @@ RUN apk add --no-cache \ ADD /rootfs / -VOLUME [ "/etc/ssl/murmur" ] - EXPOSE 64738 diff --git a/rootfs/bin/restart-services b/rootfs/bin/restart-services deleted file mode 100755 index df6ae74..0000000 --- a/rootfs/bin/restart-services +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv sh - -s6-svc -t /var/run/s6/services/murmur diff --git a/rootfs/etc/confd/templates/murmur.ini.tmpl b/rootfs/etc/confd/templates/murmur.ini.tmpl index 460484b..8379511 100644 --- a/rootfs/etc/confd/templates/murmur.ini.tmpl +++ b/rootfs/etc/confd/templates/murmur.ini.tmpl @@ -72,7 +72,7 @@ icesecretwrite= # logs to the file 'murmur.log'. If you leave this field blank # on Unix-like systems, Murmur will force itself into foreground # mode which logs to the console. -logfile=/var/log/murmur.log +logfile= # If set, Murmur will write its process ID to this file # when running in daemon mode (when the -fg flag is not @@ -157,8 +157,8 @@ registerName={{ getenv "ROOT_NAME" "Root" }} # If you have a proper SSL certificate, you can provide the filenames here. # Otherwise, Murmur will create it's own certificate automatically. -sslCert={{getenv "CERT_HOME"}}/{{getenv "CERT_DOMAIN"}}.crt -sslKey={{getenv "CERT_HOME"}}/{{getenv "CERT_DOMAIN"}}.key +sslCert=/etc/ssl/murmur/tls.crt +sslKey=/etc/ssl/murmur/tls.key # The sslCiphers option chooses the cipher suites to make available for use # in SSL/TLS. This option is server-wide, and cannot be set on a diff --git a/rootfs/etc/fix-attrs.d/01-murmur-database b/rootfs/etc/fix-attrs.d/01-murmur-database deleted file mode 100644 index 6295851..0000000 --- a/rootfs/etc/fix-attrs.d/01-murmur-database +++ /dev/null @@ -1 +0,0 @@ -/var/lib/murmur/ true murmur 0640 0750 diff --git a/rootfs/var/spool/incron/root b/rootfs/var/spool/incron/root deleted file mode 100644 index 8f76c54..0000000 --- a/rootfs/var/spool/incron/root +++ /dev/null @@ -1 +0,0 @@ -/etc/ssl/murmur IN_ATTRIB /bin/restart-services