summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp13
-rw-r--r--templates/modules_dir_00_default_settings_ServerName.conf.erb2
2 files changed, 15 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 4850615..1e02fef 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -117,7 +117,20 @@ class apache::gentoo inherits apache::base {
source => "apache/vhosts.d/default_vhost.include",
destination => "$config_dir/vhosts.d/default_vhost.include",
}
+
apache::module::file { '00_default_settings': }
+ apache::module::file { '00_error_documents': }
+
+ # to set the default for the ServerName
+ file { '00_default_settings_ServerName.conf':
+ path => '$modules_dir/00_default_settings_ServerName.conf',
+ ensure => file,
+ owner => 'root',
+ group => 0,
+ mode => 644,
+ require => Package[apache],
+ content => template('apache/modules_dir_00_default_settings_ServerName.conf.erb'),
+ }
}
class apache::debian inherits apache::base {
diff --git a/templates/modules_dir_00_default_settings_ServerName.conf.erb b/templates/modules_dir_00_default_settings_ServerName.conf.erb
new file mode 100644
index 0000000..93c048a
--- /dev/null
+++ b/templates/modules_dir_00_default_settings_ServerName.conf.erb
@@ -0,0 +1,2 @@
+ServerName <%= fqdn %>
+