From 362e00818561d07f93dfd0a948f332005208eab9 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 18 Apr 2010 19:20:41 -0300
Subject: Renaming class locales

---
 manifests/init.pp               |  2 +-
 manifests/nodo.pp               |  2 +-
 manifests/subsystems/locale.pp  | 28 ----------------------------
 manifests/subsystems/locales.pp | 28 ++++++++++++++++++++++++++++
 4 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 manifests/subsystems/locale.pp
 create mode 100644 manifests/subsystems/locales.pp

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index ec22304..be3bc96 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -19,7 +19,7 @@ import "subsystems/pam.pp"
 import "subsystems/xorg.pp"
 import "subsystems/modprobe.pp"
 import "subsystems/hosts.pp"
-import "subsystems/locale.pp"
+import "subsystems/locales.pp"
 
 # Import nodo classes
 import "nodo.pp"
diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index 56f1797..b0f2c82 100644
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -9,7 +9,7 @@ class nodo {
   include utils
   include cron
   include hosts
-  include locale
+  include locales
 
   # Set timezone and ntp config
   #
diff --git a/manifests/subsystems/locale.pp b/manifests/subsystems/locale.pp
deleted file mode 100644
index 60ba4a3..0000000
--- a/manifests/subsystems/locale.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-class locale {
-  package { "locales":
-    ensure => installed,
-  }
-
-  file { "/etc/default/locale":
-    source  => [ "puppet://$server/files/etc/default/locale",
-                 "puppet://$server/modules/nodo/etc/default/locale" ],
-    ensure => present,
-    owner  => root,
-    group  => root,
-    mode   => 0644,
-  }
-
-  file { "/etc/locale.gen":
-    source  => [ "puppet://$server/files/etc/locale.gen",
-                 "puppet://$server/modules/nodo/etc/locale.gen" ],
-    ensure => present,
-    owner  => root,
-    group  => root,
-    mode   => 0644,
-  }
-
-  exec { "locale-gen":
-    refreshonly => true,
-    subscribe   =>    File["/etc/locale.gen"], 
-  }
-}
diff --git a/manifests/subsystems/locales.pp b/manifests/subsystems/locales.pp
new file mode 100644
index 0000000..3bed96f
--- /dev/null
+++ b/manifests/subsystems/locales.pp
@@ -0,0 +1,28 @@
+class locales {
+  package { "locales":
+    ensure => installed,
+  }
+
+  file { "/etc/default/locale":
+    source  => [ "puppet://$server/files/etc/default/locale",
+                 "puppet://$server/modules/nodo/etc/default/locale" ],
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => 0644,
+  }
+
+  file { "/etc/locale.gen":
+    source  => [ "puppet://$server/files/etc/locale.gen",
+                 "puppet://$server/modules/nodo/etc/locale.gen" ],
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => 0644,
+  }
+
+  exec { "locale-gen":
+    refreshonly => true,
+    subscribe   =>    File["/etc/locale.gen"], 
+  }
+}
-- 
cgit v1.2.3