Moved playbooks here; zsh dotfiles distro; new config logs

firewall_upgrade.yml

@@ -0,0 +1,12 @@
+---
+- name: Upgrade Arch systems
+  hosts: firewall
+  roles:
+    - arch_update
+    - dotfiles
+
+- name: Process any reboots
+  hosts: "firewall, !control"
+  roles:
+    - reboot
+

home_upgrade_all.yml

@@ -0,0 +1,29 @@
+---
+- name: Upgrade Arch systems
+  hosts: arch
+  #strategy:  free
+  roles:
+    - arch_update
+    - dotfiles
+
+- name: Upgrade Debian systems
+  hosts: debian
+  roles:
+    - debian_update
+    - dotfiles
+
+- name: Update Docker Stacks
+  hosts: docker
+  roles:
+    - docker_update
+
+- name: Update mailcow Stacks
+  hosts:  mailcow
+  roles:
+    - mailcow_update
+
+- name: Process any reboots
+  hosts: "arch, debian, !control"
+  roles:
+    - reboot
+

node_deploy.yml

@@ -0,0 +1,5 @@
+---
+- name: Deploy node_exporter
+  hosts: arch,debian,barbican
+  roles:
+    - node_exporter

roles/arch_update/defaults/main.yaml

@@ -0,0 +1,2 @@
+---
+aur_helper: pikaur

roles/arch_update/files/aur_diff_check.py

@@ -63,6 +63,20 @@ def extract_ver(content):
 def strip_volatile_fields(content):
     content = re.sub(r'^pkgver=.*$', '', content, flags=re.MULTILINE)
     content = re.sub(r'^pkgrel=.*$', '', content, flags=re.MULTILINE)
+    content = re.sub(r'^arch=\(.*?\)', '', content, flags=re.MULTILINE | re.DOTALL)
+    
+    source_vars = set()
+    source_matches = re.finditer(r'^source(?:_[a-zA-Z0-9_]+)?=\((.*?)\)', content, flags=re.MULTILINE | re.DOTALL)
+    for match in source_matches:
+        source_content = match.group(1)
+        vars_in_source = re.findall(r'\$(?:\{(_[a-zA-Z0-9_]+)\}|(_[a-zA-Z0-9_]+))', source_content)
+        for v1, v2 in vars_in_source:
+            if v1: source_vars.add(v1)
+            if v2: source_vars.add(v2)
+            
+    for var in source_vars:
+        content = re.sub(r'^' + re.escape(var) + r'=.*$', '', content, flags=re.MULTILINE)
+
     sum_patterns = [
         r'md5sums', r'sha1sums', r'sha224sums', r'sha256sums', 
         r'sha384sums', r'sha512sums', r'b2sums', r'cksums'

roles/arch_update/tasks/pacnew.yaml

@@ -5,8 +5,33 @@
     recurse: yes
   register: pacnew_files
 
+- name: Ensure pacnew.logs directory exists locally
+  ansible.builtin.file:
+    path: "{{ playbook_dir }}/pacnew.logs"
+    state: directory
+    mode: '0755'
+  delegate_to: localhost
+  run_once: true
+  become: no
+
+- name: Save .pacnew list to file
+  ansible.builtin.copy:
+    content: "{{ pacnew_files.files | map(attribute='path') | join('\n') }}\n"
+    dest: "{{ playbook_dir }}/pacnew.logs/{{ inventory_hostname }}.pacnew"
+    mode: '0644'
+  delegate_to: localhost
+  become: no
+  when: pacnew_files.matched > 0
+
+- name: Clean up old .pacnew list file if no .pacnew files exist
+  ansible.builtin.file:
+    path: "{{ playbook_dir }}/pacnew.logs/{{ inventory_hostname }}.pacnew"
+    state: absent
+  delegate_to: localhost
+  become: no
+  when: pacnew_files.matched == 0
+
 - name: Alert if .pacnew files exist
   ansible.builtin.debug:
     msg: "Warning: The following .pacnew files require merging: {{ pacnew_files.files | map(attribute='path') | list }}"
   when: pacnew_files.matched > 0
-

roles/debian_update/tasks/debnew.yaml

@@ -0,0 +1,42 @@
+---
+- name: Check for pending dpkg/ucf config files
+  ansible.builtin.find:
+    paths: /etc
+    patterns: 
+      - "*.dpkg-dist"
+      - "*.dpkg-new"
+      - "*.ucf-dist"
+      - "*.ucf-new"
+    recurse: yes
+  register: debnew_files
+
+- name: Ensure debnew.logs directory exists locally
+  ansible.builtin.file:
+    path: "{{ playbook_dir }}/debnew.logs"
+    state: directory
+    mode: '0755'
+  delegate_to: localhost
+  run_once: true
+  become: no
+
+- name: Save debnew config list to file
+  ansible.builtin.copy:
+    content: "{{ debnew_files.files | map(attribute='path') | join('\n') }}\n"
+    dest: "{{ playbook_dir }}/debnew.logs/{{ inventory_hostname }}.debnew"
+    mode: '0644'
+  delegate_to: localhost
+  become: no
+  when: debnew_files.matched > 0
+
+- name: Clean up old debnew config list file if none exist
+  ansible.builtin.file:
+    path: "{{ playbook_dir }}/debnew.logs/{{ inventory_hostname }}.debnew"
+    state: absent
+  delegate_to: localhost
+  become: no
+  when: debnew_files.matched == 0
+
+- name: Alert if debnew config files exist
+  ansible.builtin.debug:
+    msg: "Warning: The following Debian config files require merging: {{ debnew_files.files | map(attribute='path') | list }}"
+  when: debnew_files.matched > 0

roles/debian_update/tasks/main.yaml

@@ -4,3 +4,6 @@
   ansible.builtin.apt:
     update_cache: true
     upgrade: full
+
+- name: Report on any Debian config files that need to be merged
+  ansible.builtin.include_tasks: debnew.yaml

roles/docker_update/tasks/main.yaml

@@ -1,10 +1,26 @@
 ---
-- name: Pull latest images and update Docker Compose stacks
+- name: Pre-build images to ensure base images are pulled
+  become: true
+  ansible.builtin.command:
+    cmd: docker compose build --pull
+    chdir: "{{ item }}"
+  loop: "{{ docker_compose_dirs | default([]) }}"
+  changed_when: false
+  register: _build_result
+
+- name: Pull latest non-buildable service images
+  become: true
+  ansible.builtin.command:
+    cmd: docker compose pull --ignore-buildable --ignore-pull-failures
+    chdir: "{{ item }}"
+  loop: "{{ docker_compose_dirs | default([]) }}"
+  changed_when: false
+
+- name: Update Docker Compose stacks
   become: true
   community.docker.docker_compose_v2:
     project_src: "{{ item }}"
     state: present
-    pull: always
+    pull: never
     build: always
   loop: "{{ docker_compose_dirs | default([]) }}"
-

roles/dotfiles/files/colors.zsh

@@ -0,0 +1,12 @@
+# Gruvbox colors for zsh (fallback)
+export MATUGEN_PRIMARY="#83a598"
+export MATUGEN_ON_PRIMARY="#282828"
+export MATUGEN_SECONDARY="#8ec07c"
+export MATUGEN_ON_SECONDARY="#282828"
+export MATUGEN_TERTIARY="#d3869b"
+export MATUGEN_ON_TERTIARY="#282828"
+export MATUGEN_BACKGROUND="#282828"
+export MATUGEN_FOREGROUND="#ebdbb2"
+export MATUGEN_ERROR="#fb4934"
+export MATUGEN_OUTLINE="#928374"
+export MATUGEN_SURFACE_CONTAINER="#3c3836"

roles/dotfiles/files/matugen.conf

@@ -0,0 +1,20 @@
+# Tmux colors generated by Matugen (Gruvbox fallback)
+
+set -g status-justify "left"
+set -g status "on"
+set -g status-left-style "none"
+set -g message-command-style "fg=#282828,bg=#83a598"
+set -g status-right-style "none"
+set -g pane-active-border-style "fg=#83a598"
+set -g status-style "none,bg=#3c3836"
+set -g message-style "fg=#282828,bg=#83a598"
+set -g pane-border-style "fg=#504945"
+set -g status-right-length "100"
+set -g status-left-length "100"
+setw -g window-status-activity-style "none"
+setw -g window-status-separator ""
+setw -g window-status-style "none,fg=#ebdbb2,bg=#3c3836"
+set -g status-left "#[fg=#282828,bg=#83a598] #S #[fg=#83a598,bg=#3c3836,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=#504945,bg=#3c3836,nobold,nounderscore,noitalics]#[fg=#ebdbb2,bg=#504945] %Y-%m-%d  %H:%M #[fg=#83a598,bg=#504945,nobold,nounderscore,noitalics]#[fg=#282828,bg=#83a598] #h "
+setw -g window-status-format "#[fg=#ebdbb2,bg=#3c3836] #I #[fg=#ebdbb2,bg=#3c3836] #W "
+setw -g window-status-current-format "#[fg=#3c3836,bg=#504945,nobold,nounderscore,noitalics]#[fg=#ebdbb2,bg=#504945] #I #[fg=#ebdbb2,bg=#504945] #W #[fg=#504945,bg=#3c3836,nobold,nounderscore,noitalics]"

roles/dotfiles/tasks/deploy_user.yml

@@ -0,0 +1,94 @@
+---
+- name: "Ensure target config directories exist for {{ target_user.user }}"
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: directory
+    mode: '0755'
+    owner: "{{ target_user.user }}"
+  loop:
+    - "{{ target_user.home }}/.config/tmux"
+    - "{{ target_user.home }}/.config/zsh"
+    - "{{ target_user.home }}/.vim"
+  become: yes
+
+- name: "Sync tmux config directory for {{ target_user.user }}"
+  ansible.posix.synchronize:
+    src: /home/trey/.config/tmux/
+    dest: "{{ target_user.home }}/.config/tmux/"
+    archive: yes
+    delete: no
+    rsync_opts:
+      - "--exclude=matugen.conf"
+  become: yes
+  become_user: "{{ target_user.user }}"
+
+- name: "Sync zsh config directory for {{ target_user.user }}"
+  ansible.posix.synchronize:
+    src: /home/trey/.config/zsh/
+    dest: "{{ target_user.home }}/.config/zsh/"
+    archive: yes
+    delete: no
+    rsync_opts:
+      - "--exclude=colors.zsh"
+  become: yes
+  become_user: "{{ target_user.user }}"
+
+- name: "Sync vim directory for {{ target_user.user }}"
+  ansible.posix.synchronize:
+    src: /home/trey/.vim/
+    dest: "{{ target_user.home }}/.vim/"
+    archive: yes
+    delete: no
+    rsync_opts:
+      - "--exclude=.git/"
+      - "--exclude=.netrwhist"
+      - "--exclude=swap/"
+      - "--exclude=vimrc"
+  become: yes
+  become_user: "{{ target_user.user }}"
+
+- name: "Deploy static fallback gruvbox colors for zsh for {{ target_user.user }}"
+  ansible.builtin.copy:
+    src: colors.zsh
+    dest: "{{ target_user.home }}/.config/zsh/colors.zsh"
+    mode: '0644'
+    owner: "{{ target_user.user }}"
+  become: yes
+
+- name: "Deploy static fallback gruvbox colors for tmux for {{ target_user.user }}"
+  ansible.builtin.copy:
+    src: matugen.conf
+    dest: "{{ target_user.home }}/.config/tmux/matugen.conf"
+    mode: '0644'
+    owner: "{{ target_user.user }}"
+  become: yes
+
+- name: "Copy .zshrc and modify prompt for root user"
+  ansible.builtin.copy:
+    content: |
+      {% set zshrc_content = lookup('file', '/home/trey/.zshrc') %}
+      {% if target_user.user == 'root' %}
+      {{ zshrc_content | replace("export PS1='%F{$MATUGEN_PRIMARY}%n%F{$MATUGEN_SECONDARY}@%F{$MATUGEN_TERTIARY}%m%f", "export PS1='%F{red}%m%f") }}
+      {% else %}
+      {{ zshrc_content }}
+      {% endif %}
+    dest: "{{ target_user.home }}/.zshrc"
+    mode: '0644'
+    owner: "{{ target_user.user }}"
+  become: yes
+
+- name: "Copy vimrc without matugen for {{ target_user.user }}"
+  ansible.builtin.copy:
+    content: "{{ lookup('file', '/home/trey/.vim/vimrc') | regex_replace('(?m)^colorscheme matugen', 'colorscheme gruvbox') }}"
+    dest: "{{ target_user.home }}/.vim/vimrc"
+    mode: '0644'
+    owner: "{{ target_user.user }}"
+  become: yes
+
+- name: "Ensure .vimrc symlink exists for {{ target_user.user }}"
+  ansible.builtin.file:
+    src: "{{ target_user.home }}/.vim/vimrc"
+    dest: "{{ target_user.home }}/.vimrc"
+    state: link
+    owner: "{{ target_user.user }}"
+  become: yes

roles/dotfiles/tasks/main.yml

@@ -0,0 +1,10 @@
+---
+- name: Deploy dotfiles for users
+  ansible.builtin.include_tasks: deploy_user.yml
+  loop:
+    - user: "{{ 'admin' if inventory_hostname == 'bastion' else 'trey' }}"
+      home: "{{ '/home/admin' if inventory_hostname == 'bastion' else '/home/trey' }}"
+    - user: 'root'
+      home: '/root'
+  loop_control:
+    loop_var: target_user

roles/node_exporter/defaults/main.yaml

@@ -0,0 +1,15 @@
+---
+node_exporter_base_flags: >-
+  --collector.systemd
+  --collector.processes
+  --collector.tcpstat
+  --no-collector.infiniband
+  --no-collector.tapestats
+  --no-collector.zfs
+
+# Disable ARP collector by default unless this is the bastion router in barbican
+node_exporter_disable_arp: "{{ not (inventory_hostname == 'bastion' and 'barbican' in group_names) }}"
+
+node_exporter_flags: >-
+  {{ node_exporter_base_flags }}
+  {% if node_exporter_disable_arp %}--no-collector.arp{% endif %}

roles/node_exporter/handlers/main.yaml

@@ -0,0 +1,6 @@
+---
+- name: Restart node_exporter
+  ansible.builtin.systemd:
+    name: prometheus-node-exporter
+    state: restarted
+  become: true

roles/node_exporter/tasks/main.yaml

@@ -0,0 +1,59 @@
+---
+- name: Install node_exporter (Debian)
+  ansible.builtin.apt:
+    name: prometheus-node-exporter
+    state: present
+  when: ansible_facts["os_family"] == "Debian"
+  become: true
+
+- name: Install node_exporter (Arch)
+  community.general.pacman:
+    name: prometheus-node-exporter
+    state: present
+  when: ansible_facts["os_family"] == "Archlinux"
+  become: true
+
+- name: Configure node_exporter flags (Debian)
+  ansible.builtin.copy:
+    dest: /etc/default/prometheus-node-exporter
+    content: |
+      ARGS="{{ node_exporter_flags }}"
+    owner: root
+    group: root
+    mode: '0644'
+  when: ansible_facts["os_family"] == "Debian"
+  become: true
+  notify: Restart node_exporter
+
+- name: Configure node_exporter flags (Arch)
+  ansible.builtin.copy:
+    dest: /etc/conf.d/prometheus-node-exporter
+    content: |
+      NODE_EXPORTER_ARGS="{{ node_exporter_flags }}"
+    owner: root
+    group: root
+    mode: '0644'
+  when: ansible_facts["os_family"] == "Archlinux"
+  become: true
+  notify: Restart node_exporter
+
+- name: Enable and start node_exporter service
+  ansible.builtin.systemd:
+    name: prometheus-node-exporter
+    state: started
+    enabled: true
+  become: true
+
+- name: Populate service facts
+  ansible.builtin.service_facts:
+
+- name: Open port 9100 for prometheus scraping
+  ansible.posix.firewalld:
+    port: 9100/tcp
+    permanent: true
+    state: enabled
+    immediate: true
+  become: true
+  when: >
+    ansible_facts.services['firewalld.service'] is defined and
+    ansible_facts.services['firewalld.service'].state == 'running'

roles/smartctl_exporter/tasks/main.yaml

@@ -0,0 +1,21 @@
+---
+- name: Install smartctl_exporter (Debian)
+  ansible.builtin.apt:
+    name: prometheus-smartctl-exporter
+    state: present
+  when: ansible_facts["os_family"] == "Debian"
+  become: true
+
+- name: Install smartctl_exporter (Arch)
+  aur:
+    name: prometheus-smartctl-exporter
+    use: "{{ aur_helper }}"
+    state: present
+  when: ansible_facts["os_family"] == "Archlinux"
+
+- name: Enable and start smartctl_exporter service
+  ansible.builtin.systemd:
+    name: prometheus-smartctl-exporter
+    state: started
+    enabled: true
+  become: true

smartctl_deploy.yml

@@ -0,0 +1,5 @@
+---
+- name: Deploy smartctl_exporter
+  hosts: smartd
+  roles:
+    - smartctl_exporter