diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-08-12 15:08:55 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-08-12 15:08:55 -0300 |
| commit | fb723f2b800051eb949b8b0db7360ee2038bc077 (patch) | |
| tree | acd156e7eb5f9cf93b3a2e94c3fb39c3d420d0d7 | |
| parent | 1a387c2d2bacb63a1d28e2721406a5a3c84bd4e2 (diff) | |
| download | puppet-apache-fb723f2b800051eb949b8b0db7360ee2038bc077.tar.gz puppet-apache-fb723f2b800051eb949b8b0db7360ee2038bc077.tar.bz2 | |
Pass -f do a2dismod
| -rw-r--r-- | manifests/module.pp | 2 | ||||
| -rw-r--r-- | templates/apache2.conf.erb.jessie | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/module.pp b/manifests/module.pp index 64a692c..e44428f 100644 --- a/manifests/module.pp +++ b/manifests/module.pp @@ -14,7 +14,7 @@ define apache::module($ensure = 'present') { } } 'absent': { - exec { "/usr/sbin/a2dismod $name": + exec { "/usr/sbin/a2dismod -f $name": onlyif => "/bin/sh -c '[ -L ${apache::mods}-enabled/${name}.load ] \ && [ ${apache::mods}-enabled/${name}.load -ef ${apache::mods}-available/${name}.load ]'", notify => Exec["force-reload-apache2"], diff --git a/templates/apache2.conf.erb.jessie b/templates/apache2.conf.erb.jessie index 1918048..5d39e89 100644 --- a/templates/apache2.conf.erb.jessie +++ b/templates/apache2.conf.erb.jessie @@ -154,7 +154,7 @@ TypesConfig /etc/mime.types # keep browsers from trying to display binary files as though they are # text. # -DefaultType text/plain +DefaultType none # # HostnameLookups: Log the names of clients or just their IP addresses |