summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cfengine/cf.services.file11
-rw-r--r--dhcpd.conf.sagahus2
2 files changed, 12 insertions, 1 deletions
diff --git a/cfengine/cf.services.file b/cfengine/cf.services.file
index 549f485..a5abd28 100644
--- a/cfengine/cf.services.file
+++ b/cfengine/cf.services.file
@@ -178,6 +178,17 @@ editfiles:
BeginGroupIfNoMatch "^[[:blank:]]*preferred master[[:blank:]]*=[[:blank:]]*yes[[:blank:]]*"
InsertLine ' preferred master = yes'
EndGroup
+ #
+ # character set = ISO8859-1
+ #
+ LocateLineMatching "^[;[:blank:]]*character set[[:blank:]]*=.*"
+ BeginGroupIfNoLineMatching "^[[:blank:]]*character set[[:blank:]]*=[[:blank:]]*ISO8859-1[[:blank:]]*"
+ ReplaceLineWith ' character set = ISO8859-1'
+ EndGroup
+ CatchAbort
+ BeginGroupIfNoMatch "^[[:blank:]]*character set[[:blank:]]*=[[:blank:]]*ISO8859-1[[:blank:]]*"
+ InsertLine ' character set = ISO8859-1'
+ EndGroup
DefineClasses "samba_reload"
}
diff --git a/dhcpd.conf.sagahus b/dhcpd.conf.sagahus
index 42c4f1f..edce97d 100644
--- a/dhcpd.conf.sagahus
+++ b/dhcpd.conf.sagahus
@@ -1,6 +1,6 @@
# dhcpd.conf
#
-# DHCP configuration file for raatstof.local
+# DHCP configuration file for sagahus.local
#
default-lease-time 1200;