From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 12 Aug 2015 18:08:55 +0000 (-0300)
Subject: Pass -f do a2dismod
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=fb723f2b800051eb949b8b0db7360ee2038bc077;p=puppet-apache.git

Pass -f do a2dismod
---

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