这是indexloc提供的服务，不要输入任何密码
Skip to content

Do not force locales by default + doc updates #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 1, 2013
Merged

Do not force locales by default + doc updates #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d3422b
README update with another example usage
ctrlaltdel Aug 20, 2013
40315bf
Do not force a default locale by default
ctrlaltdel Aug 20, 2013
4f28f2f
Doc update
ctrlaltdel Aug 20, 2013
91b7d0e
Fix locales generation on Ubuntu
ctrlaltdel Aug 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,26 @@ By default, en and de locales will be generated.
class { 'locales': }
```

Configure a bunch of locales.

```
class { 'locales':
locales => ['en_US.UTF-8 UTF-8', 'fr_CH.UTF-8 UTF-8'],
}
```

Advanced usage allows you to select which locales will be configured as well as the default one.


```
class { 'locales':
default_locale => 'en_US.UTF-8',
locales => ['en_US.UTF-8 UTF-8', 'fr_CH.UTF-8 UTF-8'],
}
```

## Other class parameters
* locales: Name of locales to generate, default: ['en_US.UTF-8 UTF-8', 'de_DE.UTF-8 UTF-8']
* ensure: present or absent, default: present
* default_locale: string, default: 'C'. Set the default locale.
* autoupgrade: true or false, default: false. Auto-upgrade package, if there is a newer version.
Expand Down
20 changes: 11 additions & 9 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
class locales (
$locales = [ 'en_US.UTF-8 UTF-8', 'de_DE.UTF-8 UTF-8', ],
$ensure = 'present',
$default_locale = $locales::params::default_locale,
$default_locale = undef,
$autoupgrade = false,
$package = $locales::params::package,
$config_file = $locales::params::config_file,
Expand Down Expand Up @@ -95,14 +95,16 @@
notify => Exec['locale-gen'],
}

file { $default_file:
ensure => $ensure,
owner => 'root',
group => 'root',
mode => '0644',
content => template("${module_name}/locale.erb"),
require => $update_locale_require,
notify => Exec['update-locale'],
if $default_locale {
file { $default_file:
ensure => $ensure,
owner => 'root',
group => 'root',
mode => '0644',
content => template("${module_name}/locale.erb"),
require => $update_locale_require,
notify => Exec['update-locale'],
}
}

exec { 'locale-gen':
Expand Down
8 changes: 6 additions & 2 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
class locales::params {

$config_file = $::operatingsystem ? {
Debian => '/etc/locale.gen',
Ubuntu => '/var/lib/locales/supported.d/local',
}

case $::operatingsystem {
/(Ubuntu|Debian)/: {
$package = 'locales'
$default_locale = 'C'
$config_file = '/etc/locale.gen'
$default_file = '/etc/default/locale'
$locale_gen_cmd = '/usr/sbin/locale-gen'
$update_locale_cmd = '/usr/sbin/update-locale'
Expand Down