diff options
| -rw-r--r-- | files/etc/bash.bashrc | 86 | ||||
| -rw-r--r-- | files/etc/profile | 55 | ||||
| -rw-r--r-- | manifests/init.pp | 4 |
3 files changed, 57 insertions, 88 deletions
diff --git a/files/etc/bash.bashrc b/files/etc/bash.bashrc deleted file mode 100644 index 3877bb5..0000000 --- a/files/etc/bash.bashrc +++ /dev/null @@ -1,86 +0,0 @@ -# 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 (overwrite the one in /etc/profile) -#PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' -function command_prompt() { - exit_status="$?" -# # colors - COLOR_RED="\[\033[31m\]" - COLOR_GREEN="\[\033[32;40m\]" - COLOR_YELLOW="\[\033[33;40m\]" - COLOR_BLUE="\[\033[34;40m\]" - COLOR_MAGENTA="\[\033[35;40m\]" - COLOR_CYAN="\[\033[36;40m\]" - - COLOR_RED_BOLD="\[\033[31;1m\]" - COLOR_GREEN_BOLD="\[\033[32;1m\]" - COLOR_YELLOW_BOLD="\[\033[33;1m\]" - COLOR_BLUE_BOLD="\[\033[34;1m\]" - COLOR_MAGENTA_BOLD="\[\033[35;1m\]" - COLOR_CYAN_BOLD="\[\033[36;1m\]" - - COLOR_NONE="\[\033[0m\]" - BOLD="\[\033[1m\]" - - if [ "$exit_status" == "0" ]; then - status_color="${COLOR_GREEN}" - else - status_color="${COLOR_RED_BOLD}" - fi - - PS1="\n${COLOR_RED}\D{%A - %d/%m/%Y - %H:%M:%S} - ${COLOR_YELLOW}Exit status: ${status_color}${exit_status}${COLOR_NONE}\n${COLOR_GREEN}\u@\h${COLOR_NONE}:${COLOR_CYAN}\w${COLOR_NONE} \$ " - PS2="${BOLD}>${OFF} " -} - - - -PROMPT_COMMAND=command_prompt - -# 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 - -# aliases -alias l='ls -h' -alias la='l -a' -alias ll='l -l' -alias lla='ll -a' diff --git a/files/etc/profile b/files/etc/profile new file mode 100644 index 0000000..512e871 --- /dev/null +++ b/files/etc/profile @@ -0,0 +1,55 @@ +# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) +# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). + +if [ "`id -u`" -eq 0 ]; then + PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" +else + PATH="/usr/local/bin:/usr/bin:/bin:/usr/games" +fi + +function command_prompt() { + exit_status="$?" +# # colors + COLOR_RED="\[\033[31m\]" + COLOR_GREEN="\[\033[32;40m\]" + COLOR_YELLOW="\[\033[33;40m\]" + COLOR_BLUE="\[\033[34;40m\]" + COLOR_MAGENTA="\[\033[35;40m\]" + COLOR_CYAN="\[\033[36;40m\]" + + COLOR_RED_BOLD="\[\033[31;1m\]" + COLOR_GREEN_BOLD="\[\033[32;1m\]" + COLOR_YELLOW_BOLD="\[\033[33;1m\]" + COLOR_BLUE_BOLD="\[\033[34;1m\]" + COLOR_MAGENTA_BOLD="\[\033[35;1m\]" + COLOR_CYAN_BOLD="\[\033[36;1m\]" + + COLOR_NONE="\[\033[0m\]" + BOLD="\[\033[1m\]" + + if [ "$exit_status" == "0" ]; then + status_color="${COLOR_GREEN}" + else + status_color="${COLOR_RED_BOLD}" + fi + + PS1="\n${COLOR_RED}\D{%A - %d/%m/%Y - %H:%M:%S} - ${COLOR_YELLOW}Exit status: ${status_color}${exit_status}${COLOR_NONE}\n${COLOR_GREEN}\u@\h${COLOR_NONE}:${COLOR_CYAN}\w${COLOR_NONE} \$ " + PS2="${BOLD}>${OFF} " +} + +if [ "$PS1" ]; then + if [ "$BASH" ]; then + PS1='\u@\h:\w\$ ' + PROMPT_COMMAND=command_prompt + else + if [ "`id -u`" -eq 0 ]; then + PS1='# ' + else + PS1='$ ' + fi + fi +fi + +export PATH + +umask 022 diff --git a/manifests/init.pp b/manifests/init.pp index e55f506..5416854 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -82,8 +82,8 @@ class nodo { ensure => present, } - file { "/etc/bash.bashrc": - source => "puppet://$server/modules/nodo/etc/bash.bashrc", + file { "/etc/profile": + source => "puppet://$server/modules/nodo/etc/profile", owner => "root", group => "root", mode => 0644, |