diff options
-rw-r--r-- | man/bcfg2.conf.5 | 4 | ||||
-rw-r--r-- | src/lib/Options.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5 index 44d8beb50..786f69f9a 100644 --- a/man/bcfg2.conf.5 +++ b/man/bcfg2.conf.5 @@ -410,9 +410,7 @@ eg: bcfg2 = https://10.3.1.6:6789 .TP .B encoding -Text encoding of configuration files. Defaults to the system default -encoding. - +Text encoding of configuration files. Defaults to UTF-8. .SH LOGGING OPTIONS Specified in the [logging] section. These options control the server diff --git a/src/lib/Options.py b/src/lib/Options.py index 5c0829df7..0d978c519 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -203,8 +203,10 @@ SENDMAIL_PATH = Option('Path to sendmail', cf=('reports', 'sendmailpath'), default='/usr/lib/sendmail') INTERACTIVE = Option('Prompt the user for each change', default=False, cmd='-I', ) -ENCODING = Option('Encoding of cfg files', default=sys.getdefaultencoding(), - cmd='-E', odesc='<encoding>', +ENCODING = Option('Encoding of cfg files', + default='UTF-8', + cmd='-E', + odesc='<encoding>', cf=('components', 'encoding')) PARANOID_PATH = Option('Specify path for paranoid file backups', default='/var/cache/bcfg2', cf=('paranoid', 'path'), |