Moving profile configuration to its own class

1 files changed, 1 insertions, 56 deletions

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index 5094352..b7efb96 100644
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -10,6 +10,7 @@ class nodo {
   include hosts
   include locales
   include tunnel
+  include profile
 
   # Set timezone and ntp config
   #
@@ -58,60 +59,4 @@ class nodo {
     mode    => 0755,
     ensure  => present,
   }
-
-  file { "/etc/screenrc":
-    source  => "puppet://$server/modules/nodo/etc/screenrc",
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-  }
-
-  # As of squeeze, custom configuration can be placed directly at
-  # /etc/profile.d, so in the future this file won't need to be
-  # managed by puppet anymore.
-  file { "/etc/profile":
-    source  => [ "puppet://$server/modules/nodo/etc/profile.$lsbdistcodename",
-                 "puppet://$server/modules/nodo/etc/profile",
-               ],
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    require => File['/etc/profile.d/prompt.sh'],
-  }
-
-  file { "/etc/bash.bashrc":
-    source  => "puppet://$server/modules/nodo/etc/bash.bashrc",
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    require => File['/etc/profile.d/prompt.sh'],
-  }
-
-  # As of squeeze, custom configuration can be placed directly at
-  # /etc/profile.d, so in the future this file has to stay there.
-  #
-  # This change has been backported to lenny via puppet so this
-  # file is not needed anymore.
-  file { "/usr/local/bin/prompt.sh":
-    ensure => absent,
-  }
-
-  file { "/etc/profile.d":
-    ensure => directory,
-    owner  => "root",
-    group  => "root",
-  }
-
-  file { "/etc/profile.d/prompt.sh":
-    ensure  => present,
-    source  => "puppet://$server/modules/nodo/etc/profile.d/prompt.sh",
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    require => File['/etc/profile.d'],
-  }
 }