X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=3b1c6c3a0829805457e8394245c86ce66ac35338;hb=270669d51bb0ab4b1b5fa743c3b1cd622fbb0691;hp=6aafaf3642a3285cac84e369487d7fbfad4a0dae;hpb=a11f1745a83b2295388734b0bc7a5f1697a9c859;p=mirror%2Fdsa-puppet.git diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 6aafaf364..3b1c6c3a0 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -75,11 +75,10 @@ file=/etc/mtab file=/etc/ssh_random_seed file=/etc/asound.conf -<% case hoster - when "ubcece", "darmstadt", "ftcollins" then "" - else "file=/etc/resolv.conf -" -end -%> +<% case hoster when "ubcece", "darmstadt", "ftcollins" then "" +else -%> +file=/etc/resolv.conf +<% end -%> file=/etc/localtime file=/etc/ioctl.save file=/etc/passwd.backup @@ -209,10 +208,9 @@ file=/var/log/syslog ## ## This file might be created or removed by the system sometimes. ## -<% case hoster - when "ubcece", "darmstadt", "ftcollins" then "file=/etc/resolv.conf -" - else "" +<% case hoster when "ubcece", "darmstadt", "ftcollins" then "" -%> +file=/etc/resolv.conf +<% else end -%> file=/etc/resolv.conf.pcmcia.save file=/etc/nologin