fix E106 'Role name <role> does not match ``^[a-z][a-z0-9_]+$`` pattern'

playbooks/accounts.archlinux.org.yml

@@ -17,4 +17,4 @@
       postgres_maintenance_work_mem: 1GB
       postgres_effective_cache_size: 1GB
     - { role: keycloak }
-    - { role: borg-client, tags: ["borg"] }
+    - { role: borg_client, tags: ["borg"] }

playbooks/all-hosts-basic.yml

@@ -11,6 +11,6 @@
     # reconfiguring sshd may break the AUR on luna (unchecked)
     #- { role: sshd, tags: ['sshd'] }
     - { role: root_ssh }
-    - { role: borg-client, tags: ["borg"], when: "'borg_clients' in group_names" }
-    - { role: zabbix-agent, tags: ["zabbix"], when: "'unmanaged' not in group_names" }
+    - { role: borg_client, tags: ["borg"], when: "'borg_clients' in group_names" }
+    - { role: zabbix_agent, tags: ["zabbix"], when: "'unmanaged' not in group_names" }
     - { role: hardening }

playbooks/apollo.yml

@@ -24,7 +24,7 @@
     - { role: tools }
     - { role: sshd }
     - { role: root_ssh }
-    - { role: borg-client, tags: ["borg"] }
+    - { role: borg_client, tags: ["borg"] }
     - { role: certbot }
     - { role: nginx }
     - { role: spampd, tags: ["mail"] }
@@ -41,7 +41,7 @@
               mariadb_innodb_file_per_table: True }
     - { role: sudo }
     - { role: uwsgi }
-    - { role: php-fpm, php_extensions: ['bcmath', 'curl', 'gd', 'iconv', 'intl', 'mysqli', 'pdo_pgsql', 'pgsql', 'sockets', 'zip'], zend_extensions: ['opcache'] }
+    - { role: php_fpm, php_extensions: ['bcmath', 'curl', 'gd', 'iconv', 'intl', 'mysqli', 'pdo_pgsql', 'pgsql', 'sockets', 'zip'], zend_extensions: ['opcache'] }
     - { role: memcached }
     - { role: archweb, archweb_planet: true }
     - role: security_tracker
@@ -51,8 +51,8 @@
     - { role: mailman, mailman_domain: "lists.archlinux.org" }
     - { role: patchwork }
     - { role: kanboard }
-    - { role: zabbix-server, tags: ["zabbix"] }
+    - { role: zabbix_server, tags: ["zabbix"] }
     - { role: grafana }
     - { role: archwiki }
-    - { role: conf.archlinux.org }
+    - { role: conf_archlinux }
     - { role: fail2ban }

playbooks/archive-mirrors.yml

@@ -11,5 +11,5 @@
     - { role: nginx }
     - { role: unbound }
     - { role: syncarchive, tags: ['nginx'] }
-    - { role: zabbix-agent, tags: ["zabbix"] }
+    - { role: zabbix_agent, tags: ["zabbix"] }
     - { role: archive, archive_nginx_only: true, archive_dir: "/srv/archive"}

playbooks/aur-dev.archlinux.org.yml

@@ -13,10 +13,10 @@
     - { role: mariadb, mariadb_innodb_buffer_pool_size: '64M', mariadb_table_open_cache: '256', mariadb_query_cache_type: '0',
               mariadb_innodb_file_per_table: True }
     - { role: sudo }
-    - { role: php-fpm, php_extensions: ['iconv', 'memcached', 'mysqli', 'pdo_mysql'], zend_extensions: ['opcache'] }
+    - { role: php_fpm, php_extensions: ['iconv', 'memcached', 'mysqli', 'pdo_mysql'], zend_extensions: ['opcache'] }
     - { role: memcached }
     - { role: uwsgi }
-    - { role: borg-client, tags: ["borg"] }
+    - { role: borg_client, tags: ["borg"] }
     - { role: postfix, postfix_relayhost: "orion.archlinux.org" }
     - { role: fail2ban }
     - { role: aurweb, aurweb_domain: 'aur-dev.archlinux.org', aurweb_version: 'pu' }

playbooks/aur.archlinux.org.yml

@@ -13,10 +13,10 @@
     - { role: mariadb, mariadb_innodb_buffer_pool_size: '64M', mariadb_table_open_cache: '256', mariadb_query_cache_type: '0',
               mariadb_innodb_file_per_table: True }
     - { role: sudo }
-    - { role: php-fpm, php_extensions: ['iconv', 'memcached', 'mysqli', 'pdo_mysql'], zend_extensions: ['opcache'] }
+    - { role: php_fpm, php_extensions: ['iconv', 'memcached', 'mysqli', 'pdo_mysql'], zend_extensions: ['opcache'] }
     - { role: memcached }
     - { role: uwsgi }
-    - { role: borg-client, tags: ["borg"] }
+    - { role: borg_client, tags: ["borg"] }
     - { role: postfix, postfix_relayhost: "orion.archlinux.org" }
     - { role: fail2ban }
     - { role: aurweb }

playbooks/bbs.archlinux.org.yml

@@ -13,8 +13,8 @@
     - { role: mariadb, mariadb_innodb_buffer_pool_size: '64M', mariadb_table_open_cache: '256', mariadb_query_cache_type: '0',
               mariadb_innodb_file_per_table: True }
     - { role: sudo }
-    - { role: php-fpm, php_extensions: ['apcu', 'iconv', 'intl', 'mysqli'], zend_extensions: ['opcache'] }
+    - { role: php_fpm, php_extensions: ['apcu', 'iconv', 'intl', 'mysqli'], zend_extensions: ['opcache'] }
     - { role: fluxbb }
-    - { role: borg-client, tags: ["borg"] }
+    - { role: borg_client, tags: ["borg"] }
     - { role: postfix, postfix_relayhost: "orion.archlinux.org" }
     - { role: fail2ban }

playbooks/bugs.archlinux.org.yml

@@ -13,8 +13,8 @@
     - { role: mariadb, mariadb_innodb_buffer_pool_size: '64M', mariadb_table_open_cache: '256', mariadb_query_cache_type: '0',
               mariadb_innodb_file_per_table: True }
     - { role: sudo }
-    - { role: php-fpm, php_extensions: ['apcu', 'iconv', 'intl', 'mysqli'], zend_extensions: ['opcache'] }
+    - { role: php_fpm, php_extensions: ['apcu', 'iconv', 'intl', 'mysqli'], zend_extensions: ['opcache'] }
     - { role: flyspray }
-    - { role: borg-client, tags: ["borg"] }
+    - { role: borg_client, tags: ["borg"] }
     - { role: postfix, postfix_relayhost: "orion.archlinux.org" }
     - { role: fail2ban }

playbooks/dragon.yml

@@ -14,5 +14,5 @@
     - { role: syncrepo }
     - { role: sogrep }
     - { role: archbuild }
-    - { role: arch-boxes }
-    - { role: docker-image }
+    - { role: arch_boxes }
+    - { role: docker_image }

playbooks/gemini.archlinux.org.yml

@@ -12,9 +12,9 @@
     - { role: firewalld }
     - { role: sshd }
     - { role: root_ssh }
-    - { role: borg-client, tags: ['borg'] }
+    - { role: borg_client, tags: ['borg'] }
     - { role: sudo, tags: ['archusers'] }
-    - { role: zabbix-agent }
+    - { role: zabbix_agent }
     - { role: certbot }
     - { role: nginx }
     - { role: dbscripts, repos_domain: "repos.archlinux.org", repos_rsync_domain: "rsync.archlinux.org", svntogit_repos: "/srv/svntogit/repos", postgres_ssl: 'on', tags: ['archusers'] }

playbooks/gitlab-runners.yml

@@ -9,4 +9,4 @@
     - { role: sshd }
     - { role: root_ssh }
     - { role: fail2ban }
-    - { role: gitlab-runner }
+    - { role: gitlab_runner }

playbooks/gitlab.archlinux.org.yml

@@ -10,4 +10,4 @@
     - { role: sshd }
     - { role: root_ssh }
     - { role: gitlab, gitlab_domain: "gitlab.archlinux.org" }
-    - { role: borg-client, tags: ["borg"] }
+    - { role: borg_client, tags: ["borg"] }

playbooks/homedir.archlinux.org.yml

@@ -12,5 +12,5 @@
     - { role: nginx }
     - { role: archusers }
     - { role: public_html, public_domain: "pkgbuild.com", tags: ['nginx'] }
-    - { role: borg-client, tags: ["borg"] }
-    - { role: zabbix-agent, tags: ["zabbix"] }
+    - { role: borg_client, tags: ["borg"] }
+    - { role: zabbix_agent, tags: ["zabbix"] }

playbooks/luna.yml

@@ -7,7 +7,7 @@
     - name: open firewall holes for services
       firewalld: service={{ item }} permanent=true state=enabled immediate=yes
       with_items:
-        - zabbix-agent
+        - zabbix_agent
         - http
         - https
         - rsyncd

playbooks/matrix.archlinux.org.yml

@@ -10,7 +10,7 @@
     - { role: sshd }
     - { role: unbound }
     - { role: root_ssh }
-    - { role: borg-client, tags: ["borg"] }
+    - { role: borg_client, tags: ["borg"] }
     - { role: certbot }
     - { role: nginx }
     - role: postgres
@@ -21,5 +21,5 @@
     - role: postfix
       postfix_relayhost: "orion.archlinux.org"
     - { role: matrix }
-    - { role: zabbix-agent, tags: ["zabbix"] }
+    - { role: zabbix_agent, tags: ["zabbix"] }
     - { role: fail2ban }

playbooks/mirrors.yml

@@ -12,5 +12,5 @@
     - { role: unbound }
     - { role: syncrepo, tags: ['nginx'] }
     - { role: archweb, archweb_site: false, archweb_services: false, archweb_mirrorcheck: true }
-    - { role: zabbix-agent, tags: ["zabbix"] }
+    - { role: zabbix_agent, tags: ["zabbix"] }
     - { role: arch32_mirror, tags: ['nginx'] }

playbooks/orion.yml

@@ -8,7 +8,7 @@
     - { role: tools }
     - { role: sshd }
     - { role: root_ssh }
-    - { role: borg-client, tags: ['borg'] }
+    - { role: borg_client, tags: ['borg'] }
     - { role: opendkim, dkim_selector: orion, tags: ['mail'] }
     - { role: dovecot }
     - { role: spampd, tags: ["mail"] }

playbooks/quassel.archlinux.org.yml

@@ -10,7 +10,7 @@
     - { role: sshd }
     - { role: unbound }
     - { role: root_ssh }
-    - { role: borg-client, tags: ["borg"] }
+    - { role: borg_client, tags: ["borg"] }
     - { role: certbot }
     - role: postgres
       postgres_max_connections: 100

playbooks/reproducible.archlinux.org.yml

@@ -10,7 +10,7 @@
     - { role: sshd }
     - { role: unbound }
     - { role: root_ssh }
-    - { role: borg-client, tags: ["borg"] }
+    - { role: borg_client, tags: ["borg"] }
     - { role: certbot }
     - { role: nginx }
     - { role: rebuilderd }

playbooks/state.archlinux.org.yml

@@ -10,8 +10,8 @@
     - { role: sshd }
     - { role: unbound }
     - { role: certbot }
-    - { role: borg-client, tags: ["borg"] }
-    - { role: zabbix-agent, tags: ["zabbix"] }
+    - { role: borg_client, tags: ["borg"] }
+    - { role: zabbix_agent, tags: ["zabbix"] }
     - { role: root_ssh }
     - role: postgres
       postgres_listen_addresses: "*"