aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-05-11 13:19:58 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-05-11 13:19:58 -0300
commitbe6c717e98d86102f739f14e576233ad7ac1da8b (patch)
treef6332952f59c2c37e5c7002d6905b643c4b22195
parenta1f9082191405b5d5fa309bc45ad4f0f29f542dc (diff)
downloadpuppet-nodo-be6c717e98d86102f739f14e576233ad7ac1da8b.tar.gz
puppet-nodo-be6c717e98d86102f739f14e576233ad7ac1da8b.tar.bz2
Try to support locale-gen on ubuntu
-rw-r--r--manifests/subsystem/locales.pp8
1 files changed, 6 insertions, 2 deletions
diff --git a/manifests/subsystem/locales.pp b/manifests/subsystem/locales.pp
index c3a1f76..ee428a5 100644
--- a/manifests/subsystem/locales.pp
+++ b/manifests/subsystem/locales.pp
@@ -12,7 +12,11 @@ class nodo::subsystem::locales {
mode => 0644,
}
- file { "/etc/locale.gen":
+ file { 'locale-gen':
+ path => $::operatingsystem ? {
+ 'Ubuntu' => '/var/lib/locales/supported.d/local',
+ default => '/etc/locale.gen',
+ },
source => [ "puppet:///modules/site_nodo/etc/locale.gen",
"puppet:///modules/nodo/etc/locale.gen" ],
ensure => present,
@@ -23,6 +27,6 @@ class nodo::subsystem::locales {
exec { "locale-gen":
refreshonly => true,
- subscribe => File["/etc/locale.gen"],
+ subscribe => File['locale-gen'],
}
}