Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/288142
Change subject: ocg: set correct ImageMagick conf dir on jessie ...................................................................... ocg: set correct ImageMagick conf dir on jessie As pointed out by Hashar (T134773) the ImageMagick config dir became /etc/ImageMagick-6/ on jessie, so we need to adjust it. Bug:T84723 Change-Id: I178e75078ad34003e65ac397b56d7cc09d294478 --- M modules/ocg/templates/usr.bin.nodejs.apparmor.erb 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/42/288142/1 diff --git a/modules/ocg/templates/usr.bin.nodejs.apparmor.erb b/modules/ocg/templates/usr.bin.nodejs.apparmor.erb index eb6a9b9..e4b20e2 100644 --- a/modules/ocg/templates/usr.bin.nodejs.apparmor.erb +++ b/modules/ocg/templates/usr.bin.nodejs.apparmor.erb @@ -71,8 +71,14 @@ /usr/share/mime/** r, + <% if scope.function_os_version(['debian >= jessie']) %> + /etc/ImageMagick-6/** r, + /usr/share/ImageMagick-6/** r, + <% else %> /etc/ImageMagick/** r, /usr/share/ImageMagick*/** r, + <% end %> + /usr/lib/x86_64-linux-gnu/ImageMagick*/** rm, # I think it needs this for glibc -- To view, visit https://gerrit.wikimedia.org/r/288142 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I178e75078ad34003e65ac397b56d7cc09d294478 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits