Merge branch 'release-1.1.1' into alpine

osixia · Oct 6, 2017 · 837c65d · 837c65d
2 parents d4fd4b1 + 24ca3b7
commit 837c65d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# 0.1.5
+  - chmod 444 logrotate config files
+  - fix jsonssl-helper get traefik ca certificate
+
 ## 0.1.4
   - Fix log-helper with piped input
 

diff --git a/image/service-available/:logrotate/startup.sh b/image/service-available/:logrotate/startup.sh
@@ -3,4 +3,6 @@ log-helper level eq trace && set -x
 ln -sf ${CONTAINER_SERVICE_DIR}/:logrotate/assets/config/logrotate.conf /etc/logrotate.conf
 ln -sf ${CONTAINER_SERVICE_DIR}/:logrotate/assets/config/logrotate_syslogng /etc/logrotate.d/syslog-ng
 
+chmod 444 -R ${CONTAINER_SERVICE_DIR}/:logrotate/assets/config/*
+
 exit 0