Adding default /etc/bash.bashrc as transition phase

diff --git a/files/etc/bash.bashrc b/files/etc/bash.bashrc
new file mode 100644 (file)
index 0000000..3f8ba6b
--- /dev/null
+++ b/files/etc/bash.bashrc
@@ -0,0 +1,47 @@
+# System-wide .bashrc file for interactive bash(1) shells.
+
+# To enable the settings / commands in this file for login shells as well,
+# this file has to be sourced in /etc/profile.
+
+# If not running interactively, don't do anything
+[ -z "$PS1" ] && return
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, overwrite the one in /etc/profile)
+PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+
+# Commented out, don't overwrite xterm -T "title" -n "icontitle" by default.
+# If this is an xterm set the title to user@host:dir
+#case "$TERM" in
+#xterm*|rxvt*)
+#    PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'
+#    ;;
+#*)
+#    ;;
+#esac
+
+# enable bash completion in interactive shells
+#if [ -f /etc/bash_completion ]; then
+#    . /etc/bash_completion
+#fi
+
+# if the command-not-found package is installed, use it
+if [ -x /usr/lib/command-not-found ]; then
+       function command_not_found_handle {
+               # check because c-n-f could've been removed in the meantime
+                if [ -x /usr/lib/command-not-found ]; then
+                  /usr/bin/python /usr/lib/command-not-found -- $1
+                   return $?
+               else
+                  return 127
+               fi
+       }
+fi

diff --git a/manifests/init.pp b/manifests/init.pp
index 541685403af1deb2570b05dc013e82a98ce9abeb..7c58cf074fb5ee08724313a9c83399313ff4cb6b 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -89,6 +89,19 @@ class nodo {
     mode    => 0644,
     ensure  => present,
   }
+
+  # Previously we used /etc/bash.bashrc but now we're planning
+  # not to manage it. As a transition procedure we'll sync all
+  # nodes with the default file.
+  #
+  # TODO: remove when after all nodes have synced.
+  file { "/etc/bash.bashrc":
+    source  => "puppet://$server/modules/nodo/etc/bash.bashrc",
+    owner   => "root",
+    group   => "root",
+    mode    => 0644,
+    ensure  => present,
+  }
 }
 
 class nodo::server inherits nodo {