feat: activate Rocky server profile for prometheus

ansible/inventory/group_vars/platform_rocky.yml

@@ -32,6 +32,7 @@ enabled_services:
 rocky_common_packages:
   - bash-completion
   - bat
+  - entr
   - fzf
   - git
   - jq

ansible/inventory/group_vars/rocky_server.yml

@@ -49,9 +49,11 @@ server_firewall_backend: firewalld
 server_firewalld_zone: public
 server_firewalld_services:
   - ssh
-server_firewalld_ports:
+server_firewalld_ports: []
+server_firewalld_absent_ports:
   - 22000/tcp
   - 22000/udp
   - 21027/udp
 server_sshd_service_name: sshd
 server_compose_selinux_mount_option: Z
+server_syncthing_enabled: false

ansible/inventory/group_vars/server.yml

@@ -25,6 +25,9 @@ profile_packages:
   - rsync
 
 server_dotfiles:
+  - src: .bashrc.d/20-editor-server.sh
+    dest: .bashrc.d/20-editor-server.sh
+    mode: "0644"
   - src: .gnupg/gpg-agent.conf
     dest: .gnupg/gpg-agent.conf
     mode: "0600"
@@ -50,6 +53,10 @@ server_templates:
     no_log: true
 
 server_directories:
+  - path: "{{ server_user_home }}/.bashrc.d"
+    owner: "{{ server_username }}"
+    group: "{{ server_user_group }}"
+    mode: "0755"
   - path: "{{ server_user_home }}/.gnupg"
     owner: "{{ server_username }}"
     group: "{{ server_user_group }}"
@@ -82,6 +89,17 @@ server_directories:
     owner: root
     group: root
     mode: "0755"
+  - path: /srv/nextcloud
+    owner: root
+    group: root
+    mode: "0755"
+  - path: /srv/nextcloud/data
+    owner: root
+    group: root
+    mode: "0755"
+
+server_syncthing_enabled: true
+server_syncthing_directories:
   - path: /opt/syncthing/config
     owner: root
     group: root
@@ -94,30 +112,6 @@ server_directories:
     owner: "1000"
     group: "1000"
     mode: "0755"
-  - path: /srv/nextcloud
-    owner: root
-    group: root
-    mode: "0755"
-  - path: /srv/nextcloud/data
-    owner: root
-    group: root
-    mode: "0755"
-
-server_ufw_rules:
-  - rule: allow
-    name: OpenSSH
-  - rule: allow
-    port: "22000"
-    proto: tcp
-    comment: Syncthing sync traffic
-  - rule: allow
-    port: "22000"
-    proto: udp
-    comment: Syncthing QUIC sync traffic
-  - rule: allow
-    port: "21027"
-    proto: udp
-    comment: Syncthing local discovery
 
 server_sshd_settings:
   PermitRootLogin: "no"

ansible/inventory/group_vars/ubuntu.yml

@@ -1,41 +0,0 @@
----
-ubuntu_packages_base:
-  - curl
-  - ufw
-  - htop
-  - build-essential
-  - nodejs
-  - git-delta
-  - jq
-  - ripgrep
-
-ubuntu_manage_docker_repo: true
-
-ubuntu_emacs_packages:
-  - emacs
-  - pandoc
-  - latexmk
-  - texlive-luatex
-  - texlive-latex-base
-  - texlive-latex-recommended
-  - texlive-fonts-recommended
-
-ubuntu_docker_packages:
-  - docker-ce
-  - docker-ce-cli
-  - containerd.io
-  - docker-buildx-plugin
-  - docker-compose-plugin
-
-enabled_services:
-  - ufw
-  - docker
-
-server_firewall_backend: ufw
-server_sshd_service_name: ssh
-server_compose_selinux_mount_option: ""
-
-ubuntu_dotfiles:
-  - src: .bashrc.d/
-    dest: .bashrc.d/
-    mode: preserve

ansible/inventory/host_vars/prometheus.yml

@@ -1,5 +1,8 @@
 ---
 hostname: prometheus
+ansible_host: 179.237.102.172
+ansible_user: rocky
+ansible_port: 22
+ansible_ssh_private_key_file: /home/fscotto/.ssh/id_ed25519
 
-host_packages: []
-host_enabled_services: []
+server_username: rocky

ansible/inventory/hosts.yml

@@ -63,10 +63,6 @@ all:
         nymph:
           ansible_connection: local
 
-    ubuntu:
-      children:
-        ubuntu_server:
-
     workstation:
       children:
         workstation_dev:
@@ -79,7 +75,6 @@ all:
     server:
       children:
         rocky_server:
-        ubuntu_server:
 
     workstation_dev_fedora:
       hosts:
@@ -91,10 +86,6 @@ all:
         deadalus:
           ansible_connection: local
 
-    ubuntu_server:
+    rocky_server:
       hosts:
         prometheus:
-          ansible_connection: local
-
-    rocky_server:
-      hosts: {}

ansible/roles/packages_ubuntu/tasks/main.yml

@@ -1,82 +0,0 @@
----
-- name: Copy Ubuntu dotfiles
-  tags: [dotfiles, dotfiles:common]
-  ansible.builtin.copy:
-    src: "{{ playbook_dir }}/../dotfiles/ubuntu/{{ item.src }}"
-    dest: "{{ effective_user_home }}/{{ item.dest }}"
-    owner: "{{ effective_username }}"
-    group: "{{ effective_user_group }}"
-    mode: "{{ item.mode }}"
-  loop: "{{ ubuntu_dotfiles | default([]) }}"
-  loop_control:
-    label: "{{ item.dest }}"
-
-- name: Ensure Docker apt keyrings directory exists
-  tags: [packages]
-  ansible.builtin.file:
-    path: /etc/apt/keyrings
-    state: directory
-    owner: root
-    group: root
-    mode: "0755"
-  when: ubuntu_manage_docker_repo | default(false)
-
-- name: Download Docker apt repository signing key
-  tags: [packages]
-  ansible.builtin.get_url:
-    url: https://download.docker.com/linux/ubuntu/gpg
-    dest: /etc/apt/keyrings/docker.asc
-    owner: root
-    group: root
-    mode: "0644"
-  when: ubuntu_manage_docker_repo | default(false)
-
-- name: Configure Docker apt repository
-  tags: [packages]
-  ansible.builtin.apt_repository:
-    repo: >-
-      deb [arch={{ 'amd64' if ansible_facts['architecture'] == 'x86_64'
-      else 'arm64' if ansible_facts['architecture'] in ['aarch64', 'arm64']
-      else ansible_facts['architecture'] }}
-      signed-by=/etc/apt/keyrings/docker.asc]
-      https://download.docker.com/linux/ubuntu
-      {{ ansible_facts['distribution_release'] }} stable
-    filename: docker
-    state: present
-    update_cache: true
-  when: ubuntu_manage_docker_repo | default(false)
-
-- name: Refresh apt package cache
-  tags: [packages]
-  ansible.builtin.apt:
-    update_cache: true
-    cache_valid_time: 3600
-
-- name: Install packages on Ubuntu
-  tags: [packages]
-  ansible.builtin.apt:
-    name: >-
-      {{
-        (
-          (common_packages | default([]))
-        + (ubuntu_packages_base | default([]))
-        + (ubuntu_docker_packages | default([]))
-        + (profile_packages | default([]))
-        + (
-            (ubuntu_emacs_packages | default([]))
-            if (emacs_enabled | default(false) | bool)
-            else []
-          )
-        + (host_packages | default([]))
-        )
-        | unique
-      }}
-    state: present
-
-- name: Add user to docker group
-  tags: [packages]
-  ansible.builtin.user:
-    name: "{{ effective_username }}"
-    groups: docker
-    append: true
-  when: (ubuntu_docker_packages | default([])) | length > 0

ansible/roles/profile_server/tasks/main.yml

@@ -4,9 +4,9 @@
   tags: [services, packages]
   ansible.builtin.assert:
     that:
-      - server_firewall_backend in ['ufw', 'firewalld']
+      - server_firewall_backend == 'firewalld'
     fail_msg: >-
-      server_firewall_backend must be either ufw or firewalld for the server profile.
+      server_firewall_backend must be firewalld for the Rocky server profile.
 
 - name: Copy server dotfiles
   tags: [dotfiles, dotfiles:server]
@@ -38,7 +38,15 @@
     owner: "{{ item.owner }}"
     group: "{{ item.group }}"
     mode: "{{ item.mode }}"
-  loop: "{{ server_directories | default([]) }}"
+  loop: >-
+    {{
+      (server_directories | default([]))
+      + (
+          server_syncthing_directories | default([])
+          if server_syncthing_enabled | default(true) | bool
+          else []
+        )
+    }}
   loop_control:
     label: "{{ item.path }}"
 
@@ -76,41 +84,6 @@
   notify: Reload SSH service
   when: (server_sshd_allow_users | default([])) | length > 0
 
-- name: Define effective server UFW rules
-  tags: [services, packages]
-  ansible.builtin.set_fact:
-    server_ufw_rules_effective: "{{ server_ufw_rules | default([]) }}"
-  when: server_firewall_backend == 'ufw'
-
-- name: Apply server UFW rules
-  tags: [services, packages]
-  community.general.ufw:
-    rule: "{{ item.rule }}"
-    name: "{{ item.name | default(omit) }}"
-    port: "{{ item.port | default(omit) }}"
-    proto: "{{ item.proto | default(omit) }}"
-    from_ip: "{{ item.src | default(omit) }}"
-    to_ip: "{{ item.dest | default(omit) }}"
-    from_port: "{{ item.from_port | default(omit) }}"
-    direction: "{{ item.direction | default(omit) }}"
-    interface: "{{ item.interface | default(omit) }}"
-    interface_in: "{{ item.interface_in | default(omit) }}"
-    interface_out: "{{ item.interface_out | default(omit) }}"
-    route: "{{ item.route | default(omit) }}"
-    comment: "{{ item.comment | default(omit) }}"
-  loop: "{{ server_ufw_rules_effective | default([]) }}"
-  loop_control:
-    label: "{{ item.name | default(item.port) }}"
-  when: server_firewall_backend == 'ufw'
-
-- name: Enable UFW firewall on server
-  tags: [services, packages]
-  community.general.ufw:
-    state: enabled
-  when:
-    - server_firewall_backend == 'ufw'
-    - (server_ufw_rules_effective | default([])) | length > 0
-
 - name: Allow server services through firewalld
   tags: [services, packages]
   ansible.posix.firewalld:
@@ -136,3 +109,16 @@
   loop_control:
     label: "{{ item }}"
   when: server_firewall_backend == 'firewalld'
+
+- name: Remove disabled server ports from firewalld
+  tags: [services, packages]
+  ansible.posix.firewalld:
+    port: "{{ item }}"
+    zone: "{{ server_firewalld_zone }}"
+    state: disabled
+    permanent: true
+    immediate: true
+  loop: "{{ server_firewalld_absent_ports | default([]) }}"
+  loop_control:
+    label: "{{ item }}"
+  when: server_firewall_backend == 'firewalld'

ansible/site.yml

@@ -119,12 +119,3 @@
 
   roles:
     - profile_workstation_dev_wsl
-
-- name: Configure Ubuntu server
-  hosts: ubuntu_server
-  become: true
-
-  roles:
-    - packages_ubuntu
-    - services_systemd
-    - profile_server

ansible/templates/server/docker-compose.yml.j2

@@ -88,6 +88,7 @@ services:
       - "3000:3000"
       - "127.0.0.1:222:22"
 
+{% if server_syncthing_enabled | default(true) | bool %}
   syncthing:
     image: syncthing/syncthing:2
     container_name: syncthing
@@ -104,6 +105,7 @@ services:
       - "21027:21027/udp"
     networks:
       - web
+{% endif %}
 
 networks:
   web: