From 075ea0eaeb90ae48fd9309ee3087eff14ba8e79b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 8 Aug 2016 20:15:17 +0200 Subject: [PATCH] Fix locales module --- modules/locales/manifests/init.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/locales/manifests/init.pp b/modules/locales/manifests/init.pp index d9a71fb..6a5dc2a 100644 --- a/modules/locales/manifests/init.pp +++ b/modules/locales/manifests/init.pp @@ -1,20 +1,20 @@ class locales { file_line { '/etc/locale.gen#fr_FR.UTF-8': path => '/etc/locale.gen', - line => 'fr_FR.UTF-8 UTF-8', - match => 'fr_FR.UTF-8 UTF-8$', + line => 'fr_FR.UTF-8 UTF-8 ', + match => '#?fr_FR.UTF-8 UTF-8 +$', } file_line { '/etc/locale.gen#en_US.UTF-8': path => '/etc/locale.gen', - line => 'en_US.UTF-8 UTF-8', - match => 'en_US.UTF-8 UTF-8$', + line => 'en_US.UTF-8 UTF-8 ', + match => '#?en_US.UTF-8 UTF-8 +$', } exec { '/usr/bin/locale-gen': - subscribe => FileLine['/etc/locale.gen#fr_FR.UTF-8', '/etc/locale.gen#en_US.UTF-8'], + subscribe => File_line['/etc/locale.gen#fr_FR.UTF-8', '/etc/locale.gen#en_US.UTF-8'], refreshonly => true, } exec { '/usr/bin/localectl set-locale LANG=fr_FR.UTF-8': - subscribe => FileLine['/etc/locale.gen#fr_FR.UTF-8'], + subscribe => File_line['/etc/locale.gen#fr_FR.UTF-8'], refreshonly => true, } } -- 2.41.0