Use underscore instead of dashes

2020-11-04 19:36:40 +01:00 · 2020-11-04 19:36:40 +01:00 · 4c8e05e08f
commit 4c8e05e08f
parent 9b8dee098e
69 changed files with 11 additions and 12 deletions
--- a/base.yml
+++ b/base.yml
@ -9,5 +9,4 @@
 # Plug LDAP on all servers
 - hosts: all,!unifi
  roles:
-    - ldap-client
-
+    - ldap_client
--- a/ldap_replica.yml
+++ b/ldap_replica.yml
@ -4,4 +4,4 @@
 # DON'T DO THIS AS IT RECREATES THE REPLICA
 - hosts: ldap_replica
  roles:
-    - ldap-replica
+    - ldap_replica
--- a/matrix.yml
+++ b/matrix.yml
@ -6,13 +6,13 @@
    mxisd_releases: https://github.com/kamax-matrix/mxisd/releases
    mxisd_deb: "{{ mxisd_releases }}/download/v1.3.1/mxisd_1.3.1_all.deb"
  roles:
-    - debian-backports
+    - debian_backports
    - nodejs
-    - matrix-synapse
-    - matrix-appservice-irc
-    - matrix-appservice-webhooks
+    - matrix_synapse
+    - matrix_appservice_irc
+    - matrix_appservice_webhooks

 # Install Matrix services
 - hosts: matrix-services.adm.auro.re
  roles:
-    - debian-backports
+    - debian_backports
--- a/monitoring.yml
+++ b/monitoring.yml
@ -59,4 +59,4 @@
 # Monitor all hosts
 - hosts: all,!unifi,!ovh
  roles:
-    - prometheus-node
+    - prometheus_node
--- a/network.yml
+++ b/network.yml
@ -3,7 +3,7 @@
 # Set up DHCP servers.
 - hosts: dhcp-*.adm.auro.re
  roles:
-    - isc-dhcp-server
+    - isc_dhcp_server


 # Deploy unbound DNS server (recursive).
@ -24,7 +24,7 @@
 - hosts: ~routeur-aurore.*\.adm\.auro\.re
  roles:
    - router
-    - ipv6-edge-router
+    - ipv6_edge_router

 # Radius (backup only for now)
 - hosts: radius-*.adm.auro.re
--- a/nuke_radius_dbs.yml
+++ b/nuke_radius_dbs.yml
--- a/roles/ipv6_edge_router/frr-apt-key.asc
+++ b/roles/ipv6_edge_router/frr-apt-key.asc
--- a/roles/ipv6_edge_router/handlers/main.yml
+++ b/roles/ipv6_edge_router/handlers/main.yml
--- a/roles/ipv6_edge_router/tasks/main.yml
+++ b/roles/ipv6_edge_router/tasks/main.yml
--- a/roles/ipv6_edge_router/templates/daemons.j2
+++ b/roles/ipv6_edge_router/templates/daemons.j2
--- a/roles/ipv6_edge_router/templates/frr.conf.j2
+++ b/roles/ipv6_edge_router/templates/frr.conf.j2
--- a/roles/isc_dhcp_server/handlers/main.yml
+++ b/roles/isc_dhcp_server/handlers/main.yml
--- a/roles/isc_dhcp_server/tasks/main.yml
+++ b/roles/isc_dhcp_server/tasks/main.yml
--- a/roles/isc_dhcp_server/templates/default/isc-dhcp-server.j2
+++ b/roles/isc_dhcp_server/templates/default/isc-dhcp-server.j2
--- a/roles/isc_dhcp_server/templates/dhcp/aurore-subnets.conf.j2
+++ b/roles/isc_dhcp_server/templates/dhcp/aurore-subnets.conf.j2
--- a/roles/isc_dhcp_server/templates/dhcp/dhcp-failover.conf.j2
+++ b/roles/isc_dhcp_server/templates/dhcp/dhcp-failover.conf.j2
--- a/roles/isc_dhcp_server/templates/dhcp/dhcpd.conf.j2
+++ b/roles/isc_dhcp_server/templates/dhcp/dhcpd.conf.j2
--- a/roles/isc_dhcp_server/templates/dhcp/regular-subnets.conf.j2
+++ b/roles/isc_dhcp_server/templates/dhcp/regular-subnets.conf.j2
--- a/roles/isc_dhcp_server/templates/logrotate.d/dhcp.j2
+++ b/roles/isc_dhcp_server/templates/logrotate.d/dhcp.j2
--- a/roles/isc_dhcp_server/vars/main.yml
+++ b/roles/isc_dhcp_server/vars/main.yml
--- a/roles/ldap_client/handlers/main.yml
+++ b/roles/ldap_client/handlers/main.yml
--- a/roles/ldap_client/tasks/1_group_security.yml
+++ b/roles/ldap_client/tasks/1_group_security.yml
--- a/roles/ldap_client/tasks/2_userland_scripts.yml
+++ b/roles/ldap_client/tasks/2_userland_scripts.yml
--- a/roles/ldap_client/tasks/install_ldap.yml
+++ b/roles/ldap_client/tasks/install_ldap.yml
--- a/roles/ldap_client/tasks/main.yml
+++ b/roles/ldap_client/tasks/main.yml
--- a/roles/ldap_client/templates/chsh.j2
+++ b/roles/ldap_client/templates/chsh.j2
--- a/roles/ldap_client/templates/nslcd.conf.j2
+++ b/roles/ldap_client/templates/nslcd.conf.j2
--- a/roles/ldap_client/templates/passwd.j2
+++ b/roles/ldap_client/templates/passwd.j2
--- a/roles/ldap_replica/tasks/main.yml
+++ b/roles/ldap_replica/tasks/main.yml
--- a/roles/ldap_replica/templates/schema.ldiff.j2
+++ b/roles/ldap_replica/templates/schema.ldiff.j2
--- a/roles/matrix_appservice_irc/defaults/main.yml
+++ b/roles/matrix_appservice_irc/defaults/main.yml
--- a/roles/matrix_appservice_irc/tasks/main.yml
+++ b/roles/matrix_appservice_irc/tasks/main.yml
--- a/roles/matrix_appservice_irc/tasks/service_user.yml
+++ b/roles/matrix_appservice_irc/tasks/service_user.yml
--- a/roles/matrix_appservice_irc/templates/config.yaml.j2
+++ b/roles/matrix_appservice_irc/templates/config.yaml.j2
--- a/roles/matrix_appservice_irc/templates/systemd/appservice.service.j2
+++ b/roles/matrix_appservice_irc/templates/systemd/appservice.service.j2
--- a/roles/matrix_appservice_webhooks/defaults/main.yml
+++ b/roles/matrix_appservice_webhooks/defaults/main.yml
--- a/roles/matrix_appservice_webhooks/tasks/main.yml
+++ b/roles/matrix_appservice_webhooks/tasks/main.yml
--- a/roles/matrix_appservice_webhooks/tasks/service_user.yml
+++ b/roles/matrix_appservice_webhooks/tasks/service_user.yml
--- a/roles/matrix_appservice_webhooks/templates/config.yaml.j2
+++ b/roles/matrix_appservice_webhooks/templates/config.yaml.j2
--- a/roles/matrix_appservice_webhooks/templates/systemd/appservice.service.j2
+++ b/roles/matrix_appservice_webhooks/templates/systemd/appservice.service.j2
--- a/roles/matrix_synapse/files/rest_auth_provider.py
+++ b/roles/matrix_synapse/files/rest_auth_provider.py
--- a/roles/matrix_synapse/handlers/main.yml
+++ b/roles/matrix_synapse/handlers/main.yml
--- a/roles/matrix_synapse/tasks/main.yml
+++ b/roles/matrix_synapse/tasks/main.yml
--- a/roles/matrix_synapse/templates/matrix-synapse/conf.d/database.yaml.j2
+++ b/roles/matrix_synapse/templates/matrix-synapse/conf.d/database.yaml.j2
--- a/roles/matrix_synapse/templates/matrix-synapse/conf.d/enable_group_creation.yaml.j2
+++ b/roles/matrix_synapse/templates/matrix-synapse/conf.d/enable_group_creation.yaml.j2
--- a/roles/matrix_synapse/templates/matrix-synapse/conf.d/listeners.yaml.j2
+++ b/roles/matrix_synapse/templates/matrix-synapse/conf.d/listeners.yaml.j2
--- a/roles/matrix_synapse/templates/matrix-synapse/conf.d/no_tls.yaml.j2
+++ b/roles/matrix_synapse/templates/matrix-synapse/conf.d/no_tls.yaml.j2
--- a/roles/matrix_synapse/templates/matrix-synapse/conf.d/password_providers.yaml.j2
+++ b/roles/matrix_synapse/templates/matrix-synapse/conf.d/password_providers.yaml.j2
--- a/roles/matrix_synapse/templates/matrix-synapse/conf.d/server_name.yaml.j2
+++ b/roles/matrix_synapse/templates/matrix-synapse/conf.d/server_name.yaml.j2
--- a/roles/matrix_synapse/templates/matrix-synapse/conf.d/trusted_third_party_id_servers.yaml.j2
+++ b/roles/matrix_synapse/templates/matrix-synapse/conf.d/trusted_third_party_id_servers.yaml.j2
--- a/roles/nginx_reverseproxy/handlers/main.yml
+++ b/roles/nginx_reverseproxy/handlers/main.yml
--- a/roles/nginx_reverseproxy/tasks/main.yml
+++ b/roles/nginx_reverseproxy/tasks/main.yml
--- a/roles/nginx_reverseproxy/templates/letsencrypt/dhparam.j2
+++ b/roles/nginx_reverseproxy/templates/letsencrypt/dhparam.j2
--- a/roles/nginx_reverseproxy/templates/nginx/sites-available/redirect.j2
+++ b/roles/nginx_reverseproxy/templates/nginx/sites-available/redirect.j2
--- a/roles/nginx_reverseproxy/templates/nginx/sites-available/reverseproxy.j2
+++ b/roles/nginx_reverseproxy/templates/nginx/sites-available/reverseproxy.j2
--- a/roles/nginx_reverseproxy/templates/nginx/sites-available/reverseproxy_redirect_dname.j2
+++ b/roles/nginx_reverseproxy/templates/nginx/sites-available/reverseproxy_redirect_dname.j2
--- a/roles/nginx_reverseproxy/templates/nginx/snippets/options-proxypass.conf.j2
+++ b/roles/nginx_reverseproxy/templates/nginx/snippets/options-proxypass.conf.j2
--- a/roles/nginx_reverseproxy/templates/nginx/snippets/options-ssl.conf.j2
+++ b/roles/nginx_reverseproxy/templates/nginx/snippets/options-ssl.conf.j2
--- a/roles/nginx_reverseproxy/templates/update-motd.d/05-service.j2
+++ b/roles/nginx_reverseproxy/templates/update-motd.d/05-service.j2
--- a/roles/nginx_reverseproxy/templates/www/html/50x.html.j2
+++ b/roles/nginx_reverseproxy/templates/www/html/50x.html.j2
--- a/roles/prometheus_node/handlers/main.yml
+++ b/roles/prometheus_node/handlers/main.yml
--- a/roles/prometheus_node/tasks/main.yml
+++ b/roles/prometheus_node/tasks/main.yml
--- a/roles/re2o_service/defaults/main.yml
+++ b/roles/re2o_service/defaults/main.yml
--- a/roles/re2o_service/tasks/main.yml
+++ b/roles/re2o_service/tasks/main.yml
--- a/roles/re2o_service/tasks/service_user.yml
+++ b/roles/re2o_service/tasks/service_user.yml
--- a/roles/re2o_service/templates/update-motd.d/05-service.j2
+++ b/roles/re2o_service/templates/update-motd.d/05-service.j2
--- a/roles/unifi_controller/tasks/main.yml
+++ b/roles/unifi_controller/tasks/main.yml
--- a/roles/unifi_controller/templates/update-motd.d/05-service.j2
+++ b/roles/unifi_controller/templates/update-motd.d/05-service.j2
--- a/services_web.yml
+++ b/services_web.yml
@ -54,4 +54,4 @@
        - {from: auro.re,               to: www.auro.re}
  roles:
    - certbot
-    - nginx-reverseproxy
+    - nginx_reverseproxy