From befc3207d9f36aaf957874357372a15b5a206171 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Thu, 15 Jun 2023 19:24:31 +0200 Subject: [PATCH] Fix conficting bashrc declarations --- manifests/redis_cluster.pp | 6 -- manifests/scriptreceiver.pp | 2 +- templates/redis_cluster/bashrc.erb | 58 ------------------- .../{baschrc.erb => baschrc.erb.sh} | 54 +++++++++-------- 4 files changed, 30 insertions(+), 90 deletions(-) delete mode 100644 templates/redis_cluster/bashrc.erb rename templates/scriptreceiver/{baschrc.erb => baschrc.erb.sh} (65%) diff --git a/manifests/redis_cluster.pp b/manifests/redis_cluster.pp index b0bdf06..a567830 100644 --- a/manifests/redis_cluster.pp +++ b/manifests/redis_cluster.pp @@ -17,10 +17,4 @@ class sunetdrive::redis_cluster ( content => template('sunetdrive/redis_cluster/reset_cluster.erb.sh'), mode => '0700', } - file { '/root/.bashrc': - ensure => present, - content => template('sunetdrive/redis_cluster/bashrc.erb'), - mode => '0644', - } - } diff --git a/manifests/scriptreceiver.pp b/manifests/scriptreceiver.pp index 45c41f3..568129c 100644 --- a/manifests/scriptreceiver.pp +++ b/manifests/scriptreceiver.pp @@ -57,7 +57,7 @@ class sunetdrive::scriptreceiver() } file { '/root/.bashrc': ensure => file, - content => template('sunetdrive/scriptreceiver/baschrc.erb'), + content => template('sunetdrive/scriptreceiver/baschrc.erb.sh'), mode => '0644', owner => 'root', group => 'root', diff --git a/templates/redis_cluster/bashrc.erb b/templates/redis_cluster/bashrc.erb deleted file mode 100644 index dcedc9b..0000000 --- a/templates/redis_cluster/bashrc.erb +++ /dev/null @@ -1,58 +0,0 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples - -# If not running interactively, don't do anything -[ -z "$PS1" ] && return - -# don't put duplicate lines in the history. See bash(1) for more options -# ... or force ignoredups and ignorespace -HISTCONTROL=ignoredups:ignorespace - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) -HISTSIZE=1000 -HISTFILESIZE=2000 - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# 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, unless we know we "want" color) -case "$TERM" in - xterm-color) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -#force_color_prompt=yes - -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi - -if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' -else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' -fi -unset color_prompt force_color_prompt -alias redis-cli="redis-cli -a $(grep requirepass /opt/redis/node-0/server.conf | awk '{print $2}' | sed 's/"//g') --no-auth-warning" diff --git a/templates/scriptreceiver/baschrc.erb b/templates/scriptreceiver/baschrc.erb.sh similarity index 65% rename from templates/scriptreceiver/baschrc.erb rename to templates/scriptreceiver/baschrc.erb.sh index 7f40ab6..77c21b7 100644 --- a/templates/scriptreceiver/baschrc.erb +++ b/templates/scriptreceiver/baschrc.erb.sh @@ -26,12 +26,12 @@ 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) + debian_chroot=$(cat /etc/debian_chroot) fi # set a fancy prompt (non-color, unless we know we "want" color) case "$TERM" in - xterm-color) color_prompt=yes;; +xterm-color) color_prompt=yes ;; esac # uncomment for a colored prompt, if the terminal has the capability; turned @@ -40,41 +40,41 @@ esac #force_color_prompt=yes if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi fi if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@$(hostname -f)\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@$(hostname -f)\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' else - PS1='${debian_chroot:+($debian_chroot)}\u@$(hostname -f):\w\$ ' + PS1='${debian_chroot:+($debian_chroot)}\u@$(hostname -f):\w\$ ' fi unset color_prompt force_color_prompt # If this is an xterm set the title to user@host:dir case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@$(hostname -f): \w\a\]$PS1" - ;; -*) - ;; +xterm* | rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@$(hostname -f): \w\a\]$PS1" + ;; +*) ;; + esac # enable color support of ls and also add handy aliases if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' fi # some more ls aliases @@ -82,13 +82,17 @@ alias ll='ls -alF' alias la='ls -A' alias l='ls -CF' +if [[ $(hostname) =~ redis ]]; then + alias redis-cli="redis-cli -a $(grep requirepass /opt/redis/node-0/server.conf | awk '{print $2}' | sed 's/"//g') --no-auth-warning" +fi + # Alias definitions. # You may want to put all your additions into a separate file like # ~/.bash_aliases, instead of adding them here directly. # See /usr/share/doc/bash-doc/examples in the bash-doc package. if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases + . ~/.bash_aliases fi # enable programmable completion features (you don't need to enable