Commit 902f386a authored by peter's avatar peter

Merge branch 'imagemagick_dir_diff' into 'master'

ImageMagick directory difference (14.04 vs !14.04)

See merge request !88
parents bd77b1af 55775592
{% if salt['grains.get']('os_family') == 'Debian' %}
{% set imagemagick = salt['grains.filter_by']({
'Debian': {'pkg': 'imagemagick'},
'RedHat': {'pkg': 'ImageMagick'},
}, default='Debian') %}
'14.04': { 'pkg': 'imagemagick', 'dir': '/etc/ImageMagick' },
'16.04': { 'pkg': 'imagemagick', 'dir': '/etc/ImageMagick-6' },
'18.04': { 'pkg': 'imagemagick', 'dir': '/etc/ImageMagick-6' },
}, grain='osrelease', default='14.04') %}
{% else %}
{% set imagemagick = { 'pkg': 'ImageMagick', 'dir': '/etc/ImageMagick' } %}
{% endif %}
{% set tomcat = salt['grains.filter_by']({
'Debian': {'lib': '/usr/share/tomcat7/lib'},
'RedHat': {'lib': '/var/lib/tomcat7/lib'},
}, default='Debian') %}
\ No newline at end of file
}, default='Debian') %}
......@@ -85,8 +85,8 @@ swftools:
{{imagemagick.pkg}}:
pkg.installed
/etc/ImageMagick/policy.xml:
{{ imagemagick.dir }}/policy.xml:
file.managed:
- source: salt://alfresco/files/policy.xml
- require:
- pkg: {{ imagemagick.pkg }}
- pkg: {{ imagemagick.pkg }}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment