Factorize locales functions

[perso/Immae/Projets/Puppet.git] / modules / locales / manifests / init.pp

diff --git a/modules/locales/manifests/init.pp b/modules/locales/manifests/init.pp
index d9a71fbfb45699e75c3d2cc602b54af88894b849..982b48e07fddf8f09da29a8e7a717f0072b674a6 100644 (file)
--- a/modules/locales/manifests/init.pp
+++ b/modules/locales/manifests/init.pp
@@ -1,20 +1,16 @@
 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$',
+  locales::locale { '/etc/locale.gen#fr_FR.UTF-8':
+    locale => 'fr_FR.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$',
+  locales::locale { '/etc/locale.gen#en_US.UTF-8':
+    locale => 'en_US.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,
   }
 }