Merge pull request #215 from arthurlogilab/patch-1

Fix conflict ID #214
This commit is contained in:
Niels Abspoel 2018-01-16 21:06:47 +01:00 committed by GitHub
commit 57b2c5d1aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -11,8 +11,9 @@ mod-fcgid:
- pkg: apache - pkg: apache
{% if grains['os_family']=="Debian" %} {% if grains['os_family']=="Debian" %}
a2enmod fcgid: a2enmod fcgid for apache.mod_fcgid:
cmd.run: cmd.run:
- name: a2enmod fcgid
- order: 225 - order: 225
- unless: ls /etc/apache2/mods-enabled/fcgid.load - unless: ls /etc/apache2/mods-enabled/fcgid.load
- require: - require: