Merge pull request #20 from Dunedan/update-pre-commit-hooks

Update the pre-commit hooks

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-added-large-files
       - id: check-byte-order-marker
@@ -10,21 +10,21 @@ repos:
       - id: check-symlinks
 
   - repo: https://github.com/Lucas-C/pre-commit-hooks
-    rev: v1.4.2
+    rev: v1.5.5
     hooks:
       - id: forbid-crlf
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.33.0
+    rev: v0.39.0
     hooks:
       - id: markdownlint
 
   - repo: https://github.com/ansible/ansible-lint
-    rev: v6.14.2
+    rev: v24.2.0
     hooks:
       - id: ansible-lint
 
   - repo: https://github.com/koalaman/shellcheck-precommit
-    rev: v0.9.0
+    rev: v0.10.0
     hooks:
       - id: shellcheck

roles/borgmatic/defaults/main.yml

@@ -1,2 +1,2 @@
 ---
-borg_repo_location: /opt/backups/local.borg
+borgmatic_borg_repo_location: /opt/backups/local.borg

roles/borgmatic/tasks/main.yml

@@ -33,7 +33,7 @@
 
 - name: Create borg repository directory
   ansible.builtin.file:
-    path: "{{ borg_repo_location }}"
+    path: "{{ borgmatic_borg_repo_location }}"
     state: directory
     owner: root
     group: root
@@ -42,7 +42,7 @@
 - name: Create Borg repository
   ansible.builtin.command: borgmatic rcreate --encryption none
   args:
-    creates: "{{ borg_repo_location }}/data"
+    creates: "{{ borgmatic_borg_repo_location }}/data"
 
 - name: Create directory for borgmatic specific systemd configuration
   ansible.builtin.file:

roles/borgmatic/templates/config.yaml.j2

@@ -4,7 +4,7 @@ location:
         - /tmp/borgmatic
 
     repositories:
-        - {{ borg_repo_location }}
+        - {{ borgmatic_borg_repo_location }}
 
 retention:
     keep_daily: 7

roles/lobby_bots/defaults/main.yml

@@ -1,4 +1,4 @@
 ---
-lobby_bot_base_dir: "/opt/lobby"
-lobby_bot_group_name: "lobby-bots"
-lobby_config_dir: "/etc/lobby"
+lobby_bots_base_dir: "/opt/lobby"
+lobby_bots_group_name: "lobby-bots"
+lobby_bots_config_dir: "/etc/lobby"

roles/lobby_bots/tasks/main.yml

@@ -8,22 +8,22 @@
 
 - name: Add a common group for bots
   ansible.builtin.group:
-    name: "{{ lobby_bot_group_name }}"
+    name: "{{ lobby_bots_group_name }}"
     system: true
 
 - name: Create lobby bot base directory
   ansible.builtin.file:
-    path: "{{ lobby_bot_base_dir }}"
+    path: "{{ lobby_bots_base_dir }}"
     state: directory
     owner: "root"
-    group: "{{ lobby_bot_group_name }}"
+    group: "{{ lobby_bots_group_name }}"
     mode: 0755
 
 - name: Add users for the bots
   ansible.builtin.user:
     name: "{{ bot.name }}"
-    group: "{{ lobby_bot_group_name }}"
-    home: "{{ lobby_bot_base_dir }}/{{ bot.name }}"
+    group: "{{ lobby_bots_group_name }}"
+    home: "{{ lobby_bots_base_dir }}/{{ bot.name }}"
     create_home: true
     shell: /bin/sh
     system: true
@@ -34,7 +34,7 @@
 - name: Install lobby-bots code
   ansible.builtin.pip:
     name: "{{ bot.source }}"
-    virtualenv: "{{ lobby_bot_base_dir }}/{{ bot.name }}/code"
+    virtualenv: "{{ lobby_bots_base_dir }}/{{ bot.name }}/code"
   become: true
   become_method: community.general.sudosu
   become_user: "{{ bot.name }}"
@@ -44,17 +44,17 @@
 
 - name: Check if database for echelon exist
   ansible.builtin.stat:
-    path: "/{{ lobby_bot_base_dir }}/{{ bot.name }}/db.sqlite"
+    path: "/{{ lobby_bots_base_dir }}/{{ bot.name }}/db.sqlite"
   changed_when: false
   register: sqlite_db_exists
   loop: "{{ bots | selectattr('type', 'equalto', 'echelon') }}"
   loop_control:
     loop_var: bot
 
 - name: Create sqlite database for echelon
-  ansible.builtin.command: "{{ lobby_bot_base_dir }}/{{ item.bot.name }}/code/bin/python
+  ansible.builtin.command: "{{ lobby_bots_base_dir }}/{{ item.bot.name }}/code/bin/python
     -m xpartamupp.lobby_ranking create
-    --database-url sqlite:////{{ lobby_bot_base_dir }}/{{ item.bot.name }}/db.sqlite"
+    --database-url sqlite:////{{ lobby_bots_base_dir }}/{{ item.bot.name }}/db.sqlite"
   become: true
   become_method: community.general.sudosu
   become_user: "{{ item.bot.name }}"
@@ -64,17 +64,17 @@
 
 - name: Check if database for the moderation bot exist
   ansible.builtin.stat:
-    path: "/{{ lobby_bot_base_dir }}/{{ bot.name }}/db.sqlite"
+    path: "/{{ lobby_bots_base_dir }}/{{ bot.name }}/db.sqlite"
   changed_when: false
   register: sqlite_db_exists_moderation
   loop: "{{ bots | selectattr('type', 'equalto', 'moderation') }}"
   loop_control:
     loop_var: bot
 
 - name: Create sqlite database for the moderation bot
-  ansible.builtin.command: "{{ lobby_bot_base_dir }}/{{ item.bot.name }}/code/bin/python
+  ansible.builtin.command: "{{ lobby_bots_base_dir }}/{{ item.bot.name }}/code/bin/python
     -m xpartamupp.lobby_moderation_db create
-    --database-url sqlite:////{{ lobby_bot_base_dir }}/{{ item.bot.name }}/db.sqlite"
+    --database-url sqlite:////{{ lobby_bots_base_dir }}/{{ item.bot.name }}/db.sqlite"
   become: true
   become_method: community.general.sudosu
   become_user: "{{ item.bot.name }}"
@@ -84,7 +84,7 @@
 
 - name: Create config directory
   ansible.builtin.file:
-    path: "{{ lobby_config_dir }}"
+    path: "{{ lobby_bots_config_dir }}"
     state: directory
     owner: root
     group: root
@@ -93,7 +93,7 @@
 - name: Create config file
   ansible.builtin.template:
     src: environment-file.j2
-    dest: "{{ lobby_config_dir }}/{{ bot.name }}"
+    dest: "{{ lobby_bots_config_dir }}/{{ bot.name }}"
     owner: root
     group: root
     mode: 0600

roles/lobby_bots/templates/echelon-systemd-service.j2

@@ -6,12 +6,12 @@ After=network.target ejabberd.service
 [Service]
 Type=exec
 User={{ bot.name }}
-Environment=PATH={{ lobby_bot_base_dir }}/{{ bot.name }}/code/bin
-EnvironmentFile={{ lobby_config_dir }}/{{ bot.name }}
-ExecStart=python3 {{ lobby_bot_base_dir }}/{{ bot.name }}/code/bin/echelon \
+Environment=PATH={{ lobby_bots_base_dir }}/{{ bot.name }}/code/bin
+EnvironmentFile={{ lobby_bots_config_dir }}/{{ bot.name }}
+ExecStart=python3 {{ lobby_bots_base_dir }}/{{ bot.name }}/code/bin/echelon \
           --login ${LOGIN} --password ${PASSWORD} --nickname ${NICKNAME} --domain ${HOST} \
           --room ${ROOM} -d --no-verify \
-           --database-url sqlite:////{{ lobby_bot_base_dir }}/{{ bot.name }}/db.sqlite
+           --database-url sqlite:////{{ lobby_bots_base_dir }}/{{ bot.name }}/db.sqlite
 Restart=on-failure
 
 NoNewPrivileges=true

roles/lobby_bots/templates/moderation-systemd-service.j2

@@ -6,13 +6,13 @@ After=network.target ejabberd.service
 [Service]
 Type=exec
 User={{ bot.name }}
-Environment=PATH={{ lobby_bot_base_dir }}/{{ bot.name }}/code/bin
-EnvironmentFile={{ lobby_config_dir }}/{{ bot.name }}
-ExecStart=python3 {{ lobby_bot_base_dir }}/{{ bot.name }}/code/bin/modbot \
+Environment=PATH={{ lobby_bots_base_dir }}/{{ bot.name }}/code/bin
+EnvironmentFile={{ lobby_bots_config_dir }}/{{ bot.name }}
+ExecStart=python3 {{ lobby_bots_base_dir }}/{{ bot.name }}/code/bin/modbot \
           --login ${LOGIN} --password ${PASSWORD} --nickname ${NICKNAME} --domain ${HOST} \
           --rooms {%- for room in bot.config.ROOMS.split(" ") %} {{ room }}{%- endfor %} -d \
           --command-room ${COMMAND_ROOM} --no-verify \
-          --database-url sqlite:////{{ lobby_bot_base_dir }}/{{ bot.name }}/db.sqlite
+          --database-url sqlite:////{{ lobby_bots_base_dir }}/{{ bot.name }}/db.sqlite
 Restart=on-failure
 
 NoNewPrivileges=true

roles/lobby_bots/templates/xpartamupp-systemd-service.j2

@@ -6,9 +6,9 @@ After=network.target ejabberd.service
 [Service]
 Type=exec
 User={{ bot.name }}
-Environment=PATH={{ lobby_bot_base_dir }}/{{ bot.name }}/code/bin
-EnvironmentFile={{ lobby_config_dir }}/{{ bot.name }}
-ExecStart=python3 {{lobby_bot_base_dir }}/{{ bot.name }}/code/bin/xpartamupp \
+Environment=PATH={{ lobby_bots_base_dir }}/{{ bot.name }}/code/bin
+EnvironmentFile={{ lobby_bots_config_dir }}/{{ bot.name }}
+ExecStart=python3 {{lobby_bots_base_dir }}/{{ bot.name }}/code/bin/xpartamupp \
           --login ${LOGIN} --password ${PASSWORD} --nickname ${NICKNAME} --domain ${HOST} \
           --room ${ROOM} -d --no-verify
 Restart=on-failure

roles/users/defaults/main.yml

@@ -1,2 +1,2 @@
 ---
-lobby_admin_group_name: lobby-admins
+users_lobby_admin_group_name: lobby-admins

roles/users/tasks/main.yml

@@ -1,12 +1,12 @@
 ---
 - name: Add a group for the admins
   ansible.builtin.group:
-    name: "{{ lobby_admin_group_name }}"
+    name: "{{ users_lobby_admin_group_name }}"
 
 - name: Configure sudo permissions for lobby admins
   ansible.builtin.template:
     src: sudoers.j2
-    dest: "/etc/sudoers.d/{{ lobby_admin_group_name }}"
+    dest: "/etc/sudoers.d/{{ users_lobby_admin_group_name }}"
     owner: root
     group: root
     mode: 0440
@@ -15,7 +15,7 @@
   ansible.builtin.user:
     name: "{{ user.username }}"
     groups:
-      - "{{ lobby_admin_group_name }}"
+      - "{{ users_lobby_admin_group_name }}"
     create_home: true
     shell: /bin/bash
   loop: "{{ admins }}"

roles/users/templates/sudoers.j2

@@ -1 +1 @@
-%{{ lobby_admin_group_name }} ALL=(ALL) NOPASSWD:ALL
+%{{ users_lobby_admin_group_name }} ALL=(ALL) NOPASSWD:ALL