BBlack has submitted this change and it was merged. Change subject: VCL compilation perms fixups, round 2 ......................................................................
VCL compilation perms fixups, round 2 Change-Id: I39b0e9038d6ff748c97976d2e62ec22044e4b724 --- M modules/varnish/files/reload-vcl M modules/varnish/templates/varnish.init.erb 2 files changed, 6 insertions(+), 2 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/modules/varnish/files/reload-vcl b/modules/varnish/files/reload-vcl index ee2e6e0..47f1fa0 100755 --- a/modules/varnish/files/reload-vcl +++ b/modules/varnish/files/reload-vcl @@ -5,6 +5,9 @@ # # Stig Sandbeck Mathisen <[email protected]> +# Explicit umask to avoid /var/lib/varnish/ perms issues +umask 022 + # Settings defaults=/etc/default/varnish secret=/etc/varnish/secret diff --git a/modules/varnish/templates/varnish.init.erb b/modules/varnish/templates/varnish.init.erb index ff4e9b3..6f9a11b 100755 --- a/modules/varnish/templates/varnish.init.erb +++ b/modules/varnish/templates/varnish.init.erb @@ -24,8 +24,9 @@ test -x $DAEMON || exit 0 -# Workaround whatever keeps breaking perms for VCL compiles... -/bin/chmod +rx /var/lib/varnish/* ||: +# Explicit umask to avoid issues with VCL compilation under /var/lib/varnish/ +# when the mask is more-strict than this... +umask 022 # Include varnish defaults if available if [ -f /etc/default/varnish<%= @instancesuffix %> ] ; then -- To view, visit https://gerrit.wikimedia.org/r/187048 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39b0e9038d6ff748c97976d2e62ec22044e4b724 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack <[email protected]> Gerrit-Reviewer: BBlack <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
