diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-08-08 20:15:17 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2016-08-08 20:15:17 +0200 |
| commit | 075ea0eaeb90ae48fd9309ee3087eff14ba8e79b (patch) | |
| tree | a94381dc8ddfd6d1e0fbf1c82fc2b528ef73570b /modules | |
| parent | f756de713e30c9139ad1404f057361154dea4e34 (diff) | |
| download | Puppet-075ea0eaeb90ae48fd9309ee3087eff14ba8e79b.tar.gz Puppet-075ea0eaeb90ae48fd9309ee3087eff14ba8e79b.tar.zst Puppet-075ea0eaeb90ae48fd9309ee3087eff14ba8e79b.zip | |
Fix locales module
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/locales/manifests/init.pp | 12 |
1 files 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 @@ | |||
| 1 | class locales { | 1 | class locales { |
| 2 | file_line { '/etc/locale.gen#fr_FR.UTF-8': | 2 | file_line { '/etc/locale.gen#fr_FR.UTF-8': |
| 3 | path => '/etc/locale.gen', | 3 | path => '/etc/locale.gen', |
| 4 | line => 'fr_FR.UTF-8 UTF-8', | 4 | line => 'fr_FR.UTF-8 UTF-8 ', |
| 5 | match => 'fr_FR.UTF-8 UTF-8$', | 5 | match => '#?fr_FR.UTF-8 UTF-8 +$', |
| 6 | } | 6 | } |
| 7 | file_line { '/etc/locale.gen#en_US.UTF-8': | 7 | file_line { '/etc/locale.gen#en_US.UTF-8': |
| 8 | path => '/etc/locale.gen', | 8 | path => '/etc/locale.gen', |
| 9 | line => 'en_US.UTF-8 UTF-8', | 9 | line => 'en_US.UTF-8 UTF-8 ', |
| 10 | match => 'en_US.UTF-8 UTF-8$', | 10 | match => '#?en_US.UTF-8 UTF-8 +$', |
| 11 | } | 11 | } |
| 12 | exec { '/usr/bin/locale-gen': | 12 | exec { '/usr/bin/locale-gen': |
| 13 | subscribe => FileLine['/etc/locale.gen#fr_FR.UTF-8', '/etc/locale.gen#en_US.UTF-8'], | 13 | subscribe => File_line['/etc/locale.gen#fr_FR.UTF-8', '/etc/locale.gen#en_US.UTF-8'], |
| 14 | refreshonly => true, | 14 | refreshonly => true, |
| 15 | } | 15 | } |
| 16 | exec { '/usr/bin/localectl set-locale LANG=fr_FR.UTF-8': | 16 | exec { '/usr/bin/localectl set-locale LANG=fr_FR.UTF-8': |
| 17 | subscribe => FileLine['/etc/locale.gen#fr_FR.UTF-8'], | 17 | subscribe => File_line['/etc/locale.gen#fr_FR.UTF-8'], |
| 18 | refreshonly => true, | 18 | refreshonly => true, |
| 19 | } | 19 | } |
| 20 | } | 20 | } |