From 1934d62697f5395b19ae9a9e4732e72b49a4868e Mon Sep 17 00:00:00 2001 From: Teck Meng Date: Sat, 28 Sep 2024 20:49:02 +0800 Subject: [PATCH] Refactor ansible hosts.yml: Update hosts to include all servers --- .../{playbook.yaml => playbook.yml} | 10 +- .../ansible-role-oh-my-zsh/readme.md | 4 + .../{ => roles}/defaults/main.yml | 1 + .../{ => roles}/tasks/main.yml | 0 .../{ => roles}/tasks/oh-my-zsh-install.yml | 0 .../{ => roles}/tasks/oh-my-zsh-zshrc.yml | 0 .../{ => roles}/tasks/zsh-zshrc.yml | 0 .../{ => roles}/tasks/zsh.yml | 0 .../roles/templates/custom.zsh-theme.j2 | 269 ++++++++++++++++++ .../templates/zshrc.zsh-template.j2 | 0 ansible/inventory/02-virtual.yml | 8 +- 11 files changed, 284 insertions(+), 8 deletions(-) rename ansible/Playbooks/ansible-role-oh-my-zsh/{playbook.yaml => playbook.yml} (62%) rename ansible/Playbooks/ansible-role-oh-my-zsh/{ => roles}/defaults/main.yml (93%) rename ansible/Playbooks/ansible-role-oh-my-zsh/{ => roles}/tasks/main.yml (100%) rename ansible/Playbooks/ansible-role-oh-my-zsh/{ => roles}/tasks/oh-my-zsh-install.yml (100%) rename ansible/Playbooks/ansible-role-oh-my-zsh/{ => roles}/tasks/oh-my-zsh-zshrc.yml (100%) rename ansible/Playbooks/ansible-role-oh-my-zsh/{ => roles}/tasks/zsh-zshrc.yml (100%) rename ansible/Playbooks/ansible-role-oh-my-zsh/{ => roles}/tasks/zsh.yml (100%) create mode 100644 ansible/Playbooks/ansible-role-oh-my-zsh/roles/templates/custom.zsh-theme.j2 rename ansible/Playbooks/ansible-role-oh-my-zsh/{ => roles}/templates/zshrc.zsh-template.j2 (100%) diff --git a/ansible/Playbooks/ansible-role-oh-my-zsh/playbook.yaml b/ansible/Playbooks/ansible-role-oh-my-zsh/playbook.yml similarity index 62% rename from ansible/Playbooks/ansible-role-oh-my-zsh/playbook.yaml rename to ansible/Playbooks/ansible-role-oh-my-zsh/playbook.yml index beffe31..22ac8ab 100644 --- a/ansible/Playbooks/ansible-role-oh-my-zsh/playbook.yaml +++ b/ansible/Playbooks/ansible-role-oh-my-zsh/playbook.yml @@ -8,17 +8,15 @@ users: - name: "user" group: "user" - settings: | - export PATH="/usr/local/sbin:$path" - alias l="ls -lah" + settings: "" tasks: - name: Run ansible-role-oh-my-zsh. include_role: - name: "ansible-role-oh-my-zsh" + name: "ctorgalson.oh-my-zsh" vars: omz_user: "{{ item }}" - # Only create `.zshrc` for user 'lorem'; item.settings will be - # appended to `.zshrc` for the user 'ipsum'. + # Only create `.zshrc` for user 'user'; item.settings will be + # appended to `.zshrc` for the user 'user'. omz_zshrc_create: "{{ (item.name == 'user') | ternary(true, false) }}" omz_plugins: - "kubectl" diff --git a/ansible/Playbooks/ansible-role-oh-my-zsh/readme.md b/ansible/Playbooks/ansible-role-oh-my-zsh/readme.md index e6efc6d..95fe257 100644 --- a/ansible/Playbooks/ansible-role-oh-my-zsh/readme.md +++ b/ansible/Playbooks/ansible-role-oh-my-zsh/readme.md @@ -125,3 +125,7 @@ This task only runs when `omz_zshrc_create` is set to `false`. - "autojump" - "git" with_items: "{{ users }}" + +```bash +ansible-playbook -i inventory playbooks/ansible-role-oh-my-zsh/playbook.yml -l 'dev303' -K +``` \ No newline at end of file diff --git a/ansible/Playbooks/ansible-role-oh-my-zsh/defaults/main.yml b/ansible/Playbooks/ansible-role-oh-my-zsh/roles/defaults/main.yml similarity index 93% rename from ansible/Playbooks/ansible-role-oh-my-zsh/defaults/main.yml rename to ansible/Playbooks/ansible-role-oh-my-zsh/roles/defaults/main.yml index fad5118..7f9fb7a 100644 --- a/ansible/Playbooks/ansible-role-oh-my-zsh/defaults/main.yml +++ b/ansible/Playbooks/ansible-role-oh-my-zsh/roles/defaults/main.yml @@ -17,6 +17,7 @@ omz_install_directory: ".oh-my-zsh" # Oh My ZSH template vars. omz_zshrc_create: true omz_zshrc_template: "templates/zshrc.zsh-template.j2" +omz_custom_theme_template: "templates/custom.zsh-theme.j2" omz_zshrc_backup: true omz_zshrc_force: true omz_zsh_theme: "robbyrussell" diff --git a/ansible/Playbooks/ansible-role-oh-my-zsh/tasks/main.yml b/ansible/Playbooks/ansible-role-oh-my-zsh/roles/tasks/main.yml similarity index 100% rename from ansible/Playbooks/ansible-role-oh-my-zsh/tasks/main.yml rename to ansible/Playbooks/ansible-role-oh-my-zsh/roles/tasks/main.yml diff --git a/ansible/Playbooks/ansible-role-oh-my-zsh/tasks/oh-my-zsh-install.yml b/ansible/Playbooks/ansible-role-oh-my-zsh/roles/tasks/oh-my-zsh-install.yml similarity index 100% rename from ansible/Playbooks/ansible-role-oh-my-zsh/tasks/oh-my-zsh-install.yml rename to ansible/Playbooks/ansible-role-oh-my-zsh/roles/tasks/oh-my-zsh-install.yml diff --git a/ansible/Playbooks/ansible-role-oh-my-zsh/tasks/oh-my-zsh-zshrc.yml b/ansible/Playbooks/ansible-role-oh-my-zsh/roles/tasks/oh-my-zsh-zshrc.yml similarity index 100% rename from ansible/Playbooks/ansible-role-oh-my-zsh/tasks/oh-my-zsh-zshrc.yml rename to ansible/Playbooks/ansible-role-oh-my-zsh/roles/tasks/oh-my-zsh-zshrc.yml diff --git a/ansible/Playbooks/ansible-role-oh-my-zsh/tasks/zsh-zshrc.yml b/ansible/Playbooks/ansible-role-oh-my-zsh/roles/tasks/zsh-zshrc.yml similarity index 100% rename from ansible/Playbooks/ansible-role-oh-my-zsh/tasks/zsh-zshrc.yml rename to ansible/Playbooks/ansible-role-oh-my-zsh/roles/tasks/zsh-zshrc.yml diff --git a/ansible/Playbooks/ansible-role-oh-my-zsh/tasks/zsh.yml b/ansible/Playbooks/ansible-role-oh-my-zsh/roles/tasks/zsh.yml similarity index 100% rename from ansible/Playbooks/ansible-role-oh-my-zsh/tasks/zsh.yml rename to ansible/Playbooks/ansible-role-oh-my-zsh/roles/tasks/zsh.yml diff --git a/ansible/Playbooks/ansible-role-oh-my-zsh/roles/templates/custom.zsh-theme.j2 b/ansible/Playbooks/ansible-role-oh-my-zsh/roles/templates/custom.zsh-theme.j2 new file mode 100644 index 0000000..c43b038 --- /dev/null +++ b/ansible/Playbooks/ansible-role-oh-my-zsh/roles/templates/custom.zsh-theme.j2 @@ -0,0 +1,269 @@ +# vim:ft=zsh ts=2 sw=2 sts=2 +# +# agnoster's Theme - https://gist.github.com/3712874 +# A Powerline-inspired theme for ZSH +# +# # README +# +# In order for this theme to render correctly, you will need a +# [Powerline-patched font](https://github.com/Lokaltog/powerline-fonts). +# Make sure you have a recent version: the code points that Powerline +# uses changed in 2012, and older versions will display incorrectly, +# in confusing ways. +# +# In addition, I recommend the +# [Solarized theme](https://github.com/altercation/solarized/) and, if you're +# using it on Mac OS X, [iTerm 2](https://iterm2.com/) over Terminal.app - +# it has significantly better color fidelity. +# +# If using with "light" variant of the Solarized color schema, set +# SOLARIZED_THEME variable to "light". If you don't specify, we'll assume +# you're using the "dark" variant. +# +# # Goals +# +# The aim of this theme is to only show you *relevant* information. Like most +# prompts, it will only show git information when in a git working directory. +# However, it goes a step further: everything from the current user and +# hostname to whether the last call exited with an error to whether background +# jobs are running in this shell will all be displayed automatically when +# appropriate. + +### Segment drawing +# A few utility functions to make it easy and re-usable to draw segmented prompts + +CURRENT_BG='NONE' + +case ${SOLARIZED_THEME:-dark} in + light) CURRENT_FG='black';; + *) CURRENT_FG='white';; +esac + +# Special Powerline characters + +() { + local LC_ALL="" LC_CTYPE="en_US.UTF-8" + # NOTE: This segment separator character is correct. In 2012, Powerline changed + # the code points they use for their special characters. This is the new code point. + # If this is not working for you, you probably have an old version of the + # Powerline-patched fonts installed. Download and install the new version. + # Do not submit PRs to change this unless you have reviewed the Powerline code point + # history and have new information. + # This is defined using a Unicode escape sequence so it is unambiguously readable, regardless of + # what font the user is viewing this source code in. Do not replace the + # escape sequence with a single literal character. + # Do not change this! Do not make it '\u2b80'; that is the old, wrong code point. + SEGMENT_SEPARATOR=$'\ue0b0' +} + +# Begin a segment +# Takes two arguments, background and foreground. Both can be omitted, +# rendering default background/foreground. +prompt_segment() { + local bg fg + [[ -n $1 ]] && bg="%K{$1}" || bg="%k" + [[ -n $2 ]] && fg="%F{$2}" || fg="%f" + if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then + echo -n " %{$bg%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{$fg%} " + else + echo -n "%{$bg%}%{$fg%} " + fi + CURRENT_BG=$1 + [[ -n $3 ]] && echo -n $3 +} + +# End the prompt, closing any open segments +prompt_end() { + if [[ -n $CURRENT_BG ]]; then + echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR" + else + echo -n "%{%k%}" + fi + echo -n "%{%f%}" + CURRENT_BG='' +} + +### Prompt components +# Each component will draw itself, and hide itself if no information needs to be shown + +# Context: user@hostname (who am I and where am I) +prompt_context() { + if [[ "$USERNAME" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then + prompt_segment black default "%(!.%{%F{yellow}%}.)%n@%m" + fi +} + +# Git: branch/detached head, dirty status +prompt_git() { + (( $+commands[git] )) || return + if [[ "$(git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]]; then + return + fi + local PL_BRANCH_CHAR + () { + local LC_ALL="" LC_CTYPE="en_US.UTF-8" + PL_BRANCH_CHAR=$'\ue0a0' #  + } + local ref dirty mode repo_path + + if [[ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]]; then + repo_path=$(git rev-parse --git-dir 2>/dev/null) + dirty=$(parse_git_dirty) + ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git rev-parse --short HEAD 2> /dev/null)" + if [[ -n $dirty ]]; then + prompt_segment yellow black + else + prompt_segment green $CURRENT_FG + fi + + local ahead behind + ahead=$(git log --oneline @{upstream}.. 2>/dev/null) + behind=$(git log --oneline ..@{upstream} 2>/dev/null) + if [[ -n "$ahead" ]] && [[ -n "$behind" ]]; then + PL_BRANCH_CHAR=$'\u21c5' + elif [[ -n "$ahead" ]]; then + PL_BRANCH_CHAR=$'\u21b1' + elif [[ -n "$behind" ]]; then + PL_BRANCH_CHAR=$'\u21b0' + fi + + if [[ -e "${repo_path}/BISECT_LOG" ]]; then + mode=" " + elif [[ -e "${repo_path}/MERGE_HEAD" ]]; then + mode=" >M<" + elif [[ -e "${repo_path}/rebase" || -e "${repo_path}/rebase-apply" || -e "${repo_path}/rebase-merge" || -e "${repo_path}/../.dotest" ]]; then + mode=" >R>" + fi + + setopt promptsubst + autoload -Uz vcs_info + + zstyle ':vcs_info:*' enable git + zstyle ':vcs_info:*' get-revision true + zstyle ':vcs_info:*' check-for-changes true + zstyle ':vcs_info:*' stagedstr '✚' + zstyle ':vcs_info:*' unstagedstr '±' + zstyle ':vcs_info:*' formats ' %u%c' + zstyle ':vcs_info:*' actionformats ' %u%c' + vcs_info + echo -n "${${ref:gs/%/%%}/refs\/heads\//$PL_BRANCH_CHAR }${vcs_info_msg_0_%% }${mode}" + fi +} + +prompt_bzr() { + (( $+commands[bzr] )) || return + + # Test if bzr repository in directory hierarchy + local dir="$PWD" + while [[ ! -d "$dir/.bzr" ]]; do + [[ "$dir" = "/" ]] && return + dir="${dir:h}" + done + + local bzr_status status_mod status_all revision + if bzr_status=$(bzr status 2>&1); then + status_mod=$(echo -n "$bzr_status" | head -n1 | grep "modified" | wc -m) + status_all=$(echo -n "$bzr_status" | head -n1 | wc -m) + revision=${$(bzr log -r-1 --log-format line | cut -d: -f1):gs/%/%%} + if [[ $status_mod -gt 0 ]] ; then + prompt_segment yellow black "bzr@$revision ✚" + else + if [[ $status_all -gt 0 ]] ; then + prompt_segment yellow black "bzr@$revision" + else + prompt_segment green black "bzr@$revision" + fi + fi + fi +} + +prompt_hg() { + (( $+commands[hg] )) || return + local rev st branch + if $(hg id >/dev/null 2>&1); then + if $(hg prompt >/dev/null 2>&1); then + if [[ $(hg prompt "{status|unknown}") = "?" ]]; then + # if files are not added + prompt_segment red white + st='±' + elif [[ -n $(hg prompt "{status|modified}") ]]; then + # if any modification + prompt_segment yellow black + st='±' + else + # if working copy is clean + prompt_segment green $CURRENT_FG + fi + echo -n ${$(hg prompt "☿ {rev}@{branch}"):gs/%/%%} $st + else + st="" + rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g') + branch=$(hg id -b 2>/dev/null) + if `hg st | grep -q "^\?"`; then + prompt_segment red black + st='±' + elif `hg st | grep -q "^[MA]"`; then + prompt_segment yellow black + st='±' + else + prompt_segment green $CURRENT_FG + fi + echo -n "☿ ${rev:gs/%/%%}@${branch:gs/%/%%}" $st + fi + fi +} + +# Dir: current working directory +prompt_dir() { + prompt_segment blue $CURRENT_FG '%~' +} + +# Virtualenv: current working virtualenv +prompt_virtualenv() { + if [[ -n "$VIRTUAL_ENV" && -n "$VIRTUAL_ENV_DISABLE_PROMPT" ]]; then + prompt_segment blue black "(${VIRTUAL_ENV:t:gs/%/%%})" + fi +} + +# Status: +# - was there an error +# - am I root +# - are there background jobs? +prompt_status() { + local -a symbols + + [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘" + [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡" + [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙" + + [[ -n "$symbols" ]] && prompt_segment black default "$symbols" +} + +#AWS Profile: +# - display current AWS_PROFILE name +# - displays yellow on red if profile name contains 'production' or +# ends in '-prod' +# - displays black on green otherwise +prompt_aws() { + [[ -z "$AWS_PROFILE" || "$SHOW_AWS_PROMPT" = false ]] && return + case "$AWS_PROFILE" in + *-prod|*production*) prompt_segment red yellow "AWS: ${AWS_PROFILE:gs/%/%%}" ;; + *) prompt_segment green black "AWS: ${AWS_PROFILE:gs/%/%%}" ;; + esac +} + +## Main prompt +build_prompt() { + RETVAL=$? + prompt_status + prompt_virtualenv + prompt_aws + prompt_context + prompt_dir + prompt_git + prompt_bzr + prompt_hg + prompt_end +} + +PROMPT='%{%f%b%k%}$(build_prompt) ' diff --git a/ansible/Playbooks/ansible-role-oh-my-zsh/templates/zshrc.zsh-template.j2 b/ansible/Playbooks/ansible-role-oh-my-zsh/roles/templates/zshrc.zsh-template.j2 similarity index 100% rename from ansible/Playbooks/ansible-role-oh-my-zsh/templates/zshrc.zsh-template.j2 rename to ansible/Playbooks/ansible-role-oh-my-zsh/roles/templates/zshrc.zsh-template.j2 diff --git a/ansible/inventory/02-virtual.yml b/ansible/inventory/02-virtual.yml index 8e096cb..a3d792d 100644 --- a/ansible/inventory/02-virtual.yml +++ b/ansible/inventory/02-virtual.yml @@ -15,12 +15,16 @@ backend: dev: hosts: + dev301: + ansible_host: 192.168.50.71 + ansible_user: user + ansible_become_method: sudo dev302: ansible_host: 192.168.1.10 ansible_user: user ansible_become_method: sudo - dev301: - ansible_host: 192.168.50.71 + dev303: + ansible_host: 192.168.50.30 ansible_user: user ansible_become_method: sudo