From 96182bb06ace644f26cf51fd9dccf9fb9f4bfc3f Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Mon, 23 Nov 2020 23:03:37 +0000 Subject: [PATCH] Update core ansible role --- ansible/hosts | 3 +- ansible/roles/core.yml | 1 + ansible/roles/core/files/.bash_aliases | 20 ++++ ansible/roles/core/files/.bashrc | 119 ++++++++++++++++++++ ansible/roles/core/files/setup-vim.sh | 6 +- ansible/roles/core/tasks/configure-bash.yml | 13 +++ ansible/roles/core/tasks/configure-ssh.yml | 5 + ansible/roles/core/tasks/configure-vim.yml | 2 +- ansible/roles/core/tasks/main.yml | 5 +- 9 files changed, 168 insertions(+), 6 deletions(-) create mode 100644 ansible/roles/core/files/.bash_aliases create mode 100644 ansible/roles/core/files/.bashrc create mode 100644 ansible/roles/core/tasks/configure-bash.yml diff --git a/ansible/hosts b/ansible/hosts index d360ea8..62106a0 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -6,7 +6,8 @@ # - Blank lines are ignored # - Groups of hosts are delimited by [header] elements # - You can enter hostnames or ip addresses -# - A hostname/ip can be a member of multiple group +# - A hostname/ip can be a member of multiple groups + # Ex 1: Ungrouped hosts, specify before any group headers. [group] diff --git a/ansible/roles/core.yml b/ansible/roles/core.yml index 6e6c772..627cad7 100644 --- a/ansible/roles/core.yml +++ b/ansible/roles/core.yml @@ -3,3 +3,4 @@ become: yes roles: - core + diff --git a/ansible/roles/core/files/.bash_aliases b/ansible/roles/core/files/.bash_aliases new file mode 100644 index 0000000..ca1807e --- /dev/null +++ b/ansible/roles/core/files/.bash_aliases @@ -0,0 +1,20 @@ +alias gitkapp='git config --global user.name "Shaun Reed" && git config --global user.email "shaunrd0@gmail.com"' + +# Default .bashrc aliases stored here + +# Alias / export customizations + +# colored GCC warnings and errors +#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + +# some more ls aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' + +# Add an "alert" alias for long running commands. Use like so: +# sleep 10; alert +alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' + +export LS_COLORS="di=1;34:ln=31;47:so=32:pi=33:ex=1;32:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43" +export EDITOR=vim diff --git a/ansible/roles/core/files/.bashrc b/ansible/roles/core/files/.bashrc new file mode 100644 index 0000000..2a2c60a --- /dev/null +++ b/ansible/roles/core/files/.bashrc @@ -0,0 +1,119 @@ +# ~/.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 +case $- in + *i*) ;; + *) return;; +esac + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# 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 + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + +# 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|*-256color) 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\] \W\[\033[01;32m\]]\$\[\033[00m\]' +else + PS1='${debian_chroot:+($debian_chroot)}[\u@\h \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@\h: \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' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# Alias / export customizations + +# colored GCC warnings and errors +#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + +# some more ls aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' + +# Add an "alert" alias for long running commands. Use like so: +# sleep 10; alert +alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' + + +# Edit ~/.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 +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi + diff --git a/ansible/roles/core/files/setup-vim.sh b/ansible/roles/core/files/setup-vim.sh index e87cd31..683e107 100755 --- a/ansible/roles/core/files/setup-vim.sh +++ b/ansible/roles/core/files/setup-vim.sh @@ -16,17 +16,17 @@ mkdir -pv /etc/config-vim mv -fuv temp/README.md /etc/config-vim/ && mv -fuv temp/configs/.vimrc* /etc/config-vim/ rm -Rf temp/ printf "\n${GREEN}Klips config files updated"\ - "\nSee $PWD/etc/config-vim/README.md for more information.${NORMAL}\n\n" + "\nSee /etc/config-vim/README.md for more information.${NORMAL}\n\n" # Create backup dir for .vimrc mkdir -pv /etc/config-vim/backup/ -printf "\n${GREEN}Backup directory created - $PWD/etc/config-vim/backup/${NORMAL}\n" +printf "\n${GREEN}Backup directory created - /etc/config-vim/backup/${NORMAL}\n" # Copy cloned clonfig into user directory cp /etc/config-vim/.vimrc ~/ # Copy our cloned config into global directories -cp /etc/config-vim/.vimrc /usr/share/vim/vimfiles/vimrc +cp /etc/config-vim/.vimrc /etc/skel/.vimrc cp /etc/config-vim/.vimrc /etc/vim/vimrc printf "${GREEN}New /usr/share/vim/vimfiles configuration installed.${NORMAL}\n" diff --git a/ansible/roles/core/tasks/configure-bash.yml b/ansible/roles/core/tasks/configure-bash.yml new file mode 100644 index 0000000..a3df8c6 --- /dev/null +++ b/ansible/roles/core/tasks/configure-bash.yml @@ -0,0 +1,13 @@ +--- +- name: Copy .bashrc to new kansible user + template: src=files/.bashrc dest=/home/kansible/.bashrc + +- name: Set skeleton files for new users + template: src=files/.bashrc dest=/etc/skel/.bashrc + +- name: Copy .bash_aliases to new kansible user + template: src=files/.bash_aliases dest=/home/kansible/.bash_aliases + +- name: Set skeleton files for new users + template: src=files/.bash_aliases dest=/etc/skel/.bash_aliases + diff --git a/ansible/roles/core/tasks/configure-ssh.yml b/ansible/roles/core/tasks/configure-ssh.yml index a238552..cc94d4d 100644 --- a/ansible/roles/core/tasks/configure-ssh.yml +++ b/ansible/roles/core/tasks/configure-ssh.yml @@ -2,6 +2,11 @@ - name: Copy server MOTD template: src=files/motd dest=/etc/motd +- name: Install Yubico Authentication Module + apt: + name: libpam-yubico + state: latest + - name: Configure PAM template: src=files/sshd dest=/etc/pam.d/sshd diff --git a/ansible/roles/core/tasks/configure-vim.yml b/ansible/roles/core/tasks/configure-vim.yml index 3429a9a..6cfdbc9 100644 --- a/ansible/roles/core/tasks/configure-vim.yml +++ b/ansible/roles/core/tasks/configure-vim.yml @@ -5,6 +5,6 @@ clone: yes dest: /etc/klips/ -- name: Vim setup script +- name: Run Vim setup script script: /etc/ansible/roles/core/files/setup-vim.sh diff --git a/ansible/roles/core/tasks/main.yml b/ansible/roles/core/tasks/main.yml index b8f8595..bcb46d3 100644 --- a/ansible/roles/core/tasks/main.yml +++ b/ansible/roles/core/tasks/main.yml @@ -13,5 +13,8 @@ - import_tasks: configure-git.yml # Vim -- import_tasks: configure-vim.yml +#- import_tasks: configure-vim.yml + +# Bash +- import_tasks: configure-bash.yml