diff options
| -rw-r--r-- | manifests/gentoo.pp | 2 | ||||
| -rw-r--r-- | templates/modules_dir_00_default_settings_ServerName.conf.erb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/manifests/gentoo.pp b/manifests/gentoo.pp index 46ad8cb..b7bcf94 100644 --- a/manifests/gentoo.pp +++ b/manifests/gentoo.pp @@ -26,7 +26,7 @@ class apache::gentoo inherits apache::package { # set the default for the ServerName file{"${config_dir}/modules.d/00_default_settings_ServerName.conf": - content => template('apache/modules_dir_00_default_settings_ServerName.conf.erb'), + content => "ServerName ${fqdn}\n", require => Package[apache], owner => root, group => 0, mode => 0644; } diff --git a/templates/modules_dir_00_default_settings_ServerName.conf.erb b/templates/modules_dir_00_default_settings_ServerName.conf.erb deleted file mode 100644 index 93c048a..0000000 --- a/templates/modules_dir_00_default_settings_ServerName.conf.erb +++ /dev/null @@ -1,2 +0,0 @@ -ServerName <%= fqdn %> - |