diff options
| author | Micah Anderson <micah@riseup.net> | 2013-12-16 17:29:02 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-12-16 17:29:02 -0500 |
| commit | 15757eb2334e614bc90c8d5235834352f72261e4 (patch) | |
| tree | f3a3783b50d782b0d8ca76a7884c64e3cbc08dd9 /manifests/gentoo.pp | |
| parent | 6158f2ad0cb07159b922b6036013a7be1e4dbab5 (diff) | |
| parent | 88dc913a5da951b1a261b6cc6d9767aaf641287d (diff) | |
Merge branch 'master' of labs.riseup.net:module_apache into riseup
Diffstat (limited to 'manifests/gentoo.pp')
| -rw-r--r-- | manifests/gentoo.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/gentoo.pp b/manifests/gentoo.pp index 46ad8cb..86be087 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; } |