From 8b9c38da3beebf748c6e73f699da41dec82c5225 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 5 Mar 2016 16:20:27 -0300
Subject: Apply pristine bash.bashrc

---
 manifests/init.pp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index 56da9ea..23f53f4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,13 +7,13 @@ class shellprompt {
     ensure  => present,
   }
 
-  # Ideally we should not manage this file, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=675008
-  #file { "/etc/bash.bashrc":
-  #  source  => "puppet:///modules/shellprompt/bash.bashrc",
-  #  owner   => "root",
-  #  group   => "root",
-  #  mode    => 0644,
-  #  ensure  => present,
-  #  require => File['/etc/profile.d/prompt.sh'],
-  #}
+  # TODO: remove this block in the future, as we're applying back jessie's version
+  file { "/etc/bash.bashrc":
+    source  => "puppet:///modules/shellprompt/bash.bashrc",
+    owner   => "root",
+    group   => "root",
+    mode    => 0644,
+    ensure  => present,
+    require => File['/etc/profile.d/prompt'],
+  }
 }
-- 
cgit v1.2.3