summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/module.pp2
-rw-r--r--templates/apache2.conf.erb.jessie2
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