put /root/.profile under puppet control, too

diff --git a/modules/debian-org/files/root-dotfiles/bashrc b/modules/debian-org/files/root-dotfiles/bashrc
index 7b7ee59436274c284873a89ab15901534ead3c4a..ab93fcbafc0a0cb2461cae064f9d3f25c85bfad3 100644 (file)
--- a/modules/debian-org/files/root-dotfiles/bashrc
+++ b/modules/debian-org/files/root-dotfiles/bashrc
@@ -1,13 +1,12 @@
 # ~/.bashrc: executed by bash(1) for non-login shells.
 
-# Note: PS1 and umask are already set in /etc/profile. You should not
-# need this unless you want different defaults for root.
-# PS1='${debian_chroot:+($debian_chroot)}\h:\w\$ '
-# umask 022
+## THIS FILE IS UNDER PUPPET CONTROL.
+## LOCAL CHANGES WILL BE OVERWRITTEN.
 
-# You may uncomment the following lines if you want `ls' to be colorized:
 export LS_OPTIONS='--color=auto'
 eval "`dircolors`"
 alias ls='ls $LS_OPTIONS'
 alias ll='ls $LS_OPTIONS -l'
 alias l='ls $LS_OPTIONS -lA'
+
+# vim: set ft=sh ts=2 sw=2 et ai si:

diff --git a/modules/debian-org/files/root-dotfiles/profile b/modules/debian-org/files/root-dotfiles/profile
new file mode 100644 (file)
index 0000000..4f2c72c
--- /dev/null
+++ b/modules/debian-org/files/root-dotfiles/profile
@@ -0,0 +1,17 @@
+# ~/.profile: executed by Bourne-compatible login shells.
+
+## THIS FILE IS UNDER PUPPET CONTROL.
+## LOCAL CHANGES WILL BE OVERWRITTEN.
+
+if [ "$BASH" ]; then
+  if [ -f ~/.bashrc ]; then
+    . ~/.bashrc
+  fi
+fi
+
+mesg n
+
+LANG=C
+LANGUAGE=C
+
+# vim: set ft=sh ts=2 sw=2 et ai si:

diff --git a/modules/debian-org/files/root-dotfiles/screenrc b/modules/debian-org/files/root-dotfiles/screenrc
index 0fd9712d0c4e4e6389c537b962ed590463fa79af..ecdb0b755c5307f8dc16b8c1205123a947f1e208 100644 (file)
--- a/modules/debian-org/files/root-dotfiles/screenrc
+++ b/modules/debian-org/files/root-dotfiles/screenrc
@@ -1,3 +1,8 @@
+# ~/.screenrc - ViM configuration file
+
+## THIS FILE IS UNDER PUPPET CONTROL.
+## LOCAL CHANGES WILL BE OVERWRITTEN.
+
 startup_message off
 deflogin on
 #vbell off

diff --git a/modules/debian-org/files/root-dotfiles/vimrc b/modules/debian-org/files/root-dotfiles/vimrc
index baeffd940c4bfdbe06f6621d5e0fd3c87b4bbf78..e8089b602f78cd6434c225b4a8c38dcc24022c60 100644 (file)
--- a/modules/debian-org/files/root-dotfiles/vimrc
+++ b/modules/debian-org/files/root-dotfiles/vimrc
@@ -1,3 +1,8 @@
+" ~/.vimrc - ViM configuration file
+
+" THIS FILE IS UNDER PUPPET CONTROL.
+" LOCAL CHANGES WILL BE OVERWRITTEN.
+
 runtime! debian.vim
 filetype plugin on
 set ai

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index a6270d8b3d20368a6b149c389cd06fb28db6a7d7..a8e50bcedaf35359639b67f23cfd775bc5fcd8a2 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -310,6 +310,9 @@ class debian-org {
        file { '/root/.bashrc':
                source => 'puppet:///modules/debian-org/root-dotfiles/bashrc',
        }
+       file { '/root/.profile':
+               source => 'puppet:///modules/debian-org/root-dotfiles/profile',
+       }
        file { '/root/.screenrc':
                source => 'puppet:///modules/debian-org/root-dotfiles/screenrc',
        }