diff --git a/base.yml b/base.yml index 2e26b95..5aee2d2 100755 --- a/base.yml +++ b/base.yml @@ -9,5 +9,4 @@ # Plug LDAP on all servers - hosts: all,!unifi roles: - - ldap-client - + - ldap_client diff --git a/ldap_replica.yml b/ldap_replica.yml index 1686293..b921957 100755 --- 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 diff --git a/matrix.yml b/matrix.yml index b25fc0d..be54c53 100755 --- 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 diff --git a/monitoring.yml b/monitoring.yml index 616e380..c0c58c8 100755 --- a/monitoring.yml +++ b/monitoring.yml @@ -59,4 +59,4 @@ # Monitor all hosts - hosts: all,!unifi,!ovh roles: - - prometheus-node + - prometheus_node diff --git a/network.yml b/network.yml index aa42e72..6d0af03 100755 --- 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 diff --git a/nuke-radius-dbs.yml b/nuke_radius_dbs.yml similarity index 100% rename from nuke-radius-dbs.yml rename to nuke_radius_dbs.yml diff --git a/roles/ipv6-edge-router/frr-apt-key.asc b/roles/ipv6_edge_router/frr-apt-key.asc similarity index 100% rename from roles/ipv6-edge-router/frr-apt-key.asc rename to roles/ipv6_edge_router/frr-apt-key.asc diff --git a/roles/ipv6-edge-router/handlers/main.yml b/roles/ipv6_edge_router/handlers/main.yml similarity index 100% rename from roles/ipv6-edge-router/handlers/main.yml rename to roles/ipv6_edge_router/handlers/main.yml diff --git a/roles/ipv6-edge-router/tasks/main.yml b/roles/ipv6_edge_router/tasks/main.yml similarity index 100% rename from roles/ipv6-edge-router/tasks/main.yml rename to roles/ipv6_edge_router/tasks/main.yml diff --git a/roles/ipv6-edge-router/templates/daemons.j2 b/roles/ipv6_edge_router/templates/daemons.j2 similarity index 100% rename from roles/ipv6-edge-router/templates/daemons.j2 rename to roles/ipv6_edge_router/templates/daemons.j2 diff --git a/roles/ipv6-edge-router/templates/frr.conf.j2 b/roles/ipv6_edge_router/templates/frr.conf.j2 similarity index 100% rename from roles/ipv6-edge-router/templates/frr.conf.j2 rename to roles/ipv6_edge_router/templates/frr.conf.j2 diff --git a/roles/isc-dhcp-server/handlers/main.yml b/roles/isc_dhcp_server/handlers/main.yml similarity index 100% rename from roles/isc-dhcp-server/handlers/main.yml rename to roles/isc_dhcp_server/handlers/main.yml diff --git a/roles/isc-dhcp-server/tasks/main.yml b/roles/isc_dhcp_server/tasks/main.yml similarity index 100% rename from roles/isc-dhcp-server/tasks/main.yml rename to roles/isc_dhcp_server/tasks/main.yml diff --git a/roles/isc-dhcp-server/templates/default/isc-dhcp-server.j2 b/roles/isc_dhcp_server/templates/default/isc-dhcp-server.j2 similarity index 100% rename from roles/isc-dhcp-server/templates/default/isc-dhcp-server.j2 rename to roles/isc_dhcp_server/templates/default/isc-dhcp-server.j2 diff --git a/roles/isc-dhcp-server/templates/dhcp/aurore-subnets.conf.j2 b/roles/isc_dhcp_server/templates/dhcp/aurore-subnets.conf.j2 similarity index 100% rename from roles/isc-dhcp-server/templates/dhcp/aurore-subnets.conf.j2 rename to roles/isc_dhcp_server/templates/dhcp/aurore-subnets.conf.j2 diff --git a/roles/isc-dhcp-server/templates/dhcp/dhcp-failover.conf.j2 b/roles/isc_dhcp_server/templates/dhcp/dhcp-failover.conf.j2 similarity index 100% rename from roles/isc-dhcp-server/templates/dhcp/dhcp-failover.conf.j2 rename to roles/isc_dhcp_server/templates/dhcp/dhcp-failover.conf.j2 diff --git a/roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2 b/roles/isc_dhcp_server/templates/dhcp/dhcpd.conf.j2 similarity index 100% rename from roles/isc-dhcp-server/templates/dhcp/dhcpd.conf.j2 rename to roles/isc_dhcp_server/templates/dhcp/dhcpd.conf.j2 diff --git a/roles/isc-dhcp-server/templates/dhcp/regular-subnets.conf.j2 b/roles/isc_dhcp_server/templates/dhcp/regular-subnets.conf.j2 similarity index 100% rename from roles/isc-dhcp-server/templates/dhcp/regular-subnets.conf.j2 rename to roles/isc_dhcp_server/templates/dhcp/regular-subnets.conf.j2 diff --git a/roles/isc-dhcp-server/templates/logrotate.d/dhcp.j2 b/roles/isc_dhcp_server/templates/logrotate.d/dhcp.j2 similarity index 100% rename from roles/isc-dhcp-server/templates/logrotate.d/dhcp.j2 rename to roles/isc_dhcp_server/templates/logrotate.d/dhcp.j2 diff --git a/roles/isc-dhcp-server/vars/main.yml b/roles/isc_dhcp_server/vars/main.yml similarity index 100% rename from roles/isc-dhcp-server/vars/main.yml rename to roles/isc_dhcp_server/vars/main.yml diff --git a/roles/ldap-client/handlers/main.yml b/roles/ldap_client/handlers/main.yml similarity index 100% rename from roles/ldap-client/handlers/main.yml rename to roles/ldap_client/handlers/main.yml diff --git a/roles/ldap-client/tasks/1_group_security.yml b/roles/ldap_client/tasks/1_group_security.yml similarity index 100% rename from roles/ldap-client/tasks/1_group_security.yml rename to roles/ldap_client/tasks/1_group_security.yml diff --git a/roles/ldap-client/tasks/2_userland_scripts.yml b/roles/ldap_client/tasks/2_userland_scripts.yml similarity index 100% rename from roles/ldap-client/tasks/2_userland_scripts.yml rename to roles/ldap_client/tasks/2_userland_scripts.yml diff --git a/roles/ldap-client/tasks/install_ldap.yml b/roles/ldap_client/tasks/install_ldap.yml similarity index 100% rename from roles/ldap-client/tasks/install_ldap.yml rename to roles/ldap_client/tasks/install_ldap.yml diff --git a/roles/ldap-client/tasks/main.yml b/roles/ldap_client/tasks/main.yml similarity index 100% rename from roles/ldap-client/tasks/main.yml rename to roles/ldap_client/tasks/main.yml diff --git a/roles/ldap-client/templates/chsh.j2 b/roles/ldap_client/templates/chsh.j2 similarity index 100% rename from roles/ldap-client/templates/chsh.j2 rename to roles/ldap_client/templates/chsh.j2 diff --git a/roles/ldap-client/templates/nslcd.conf.j2 b/roles/ldap_client/templates/nslcd.conf.j2 similarity index 100% rename from roles/ldap-client/templates/nslcd.conf.j2 rename to roles/ldap_client/templates/nslcd.conf.j2 diff --git a/roles/ldap-client/templates/passwd.j2 b/roles/ldap_client/templates/passwd.j2 similarity index 100% rename from roles/ldap-client/templates/passwd.j2 rename to roles/ldap_client/templates/passwd.j2 diff --git a/roles/ldap-replica/tasks/main.yml b/roles/ldap_replica/tasks/main.yml similarity index 100% rename from roles/ldap-replica/tasks/main.yml rename to roles/ldap_replica/tasks/main.yml diff --git a/roles/ldap-replica/templates/schema.ldiff.j2 b/roles/ldap_replica/templates/schema.ldiff.j2 similarity index 100% rename from roles/ldap-replica/templates/schema.ldiff.j2 rename to roles/ldap_replica/templates/schema.ldiff.j2 diff --git a/roles/matrix-appservice-irc/defaults/main.yml b/roles/matrix_appservice_irc/defaults/main.yml similarity index 100% rename from roles/matrix-appservice-irc/defaults/main.yml rename to roles/matrix_appservice_irc/defaults/main.yml diff --git a/roles/matrix-appservice-irc/tasks/main.yml b/roles/matrix_appservice_irc/tasks/main.yml similarity index 100% rename from roles/matrix-appservice-irc/tasks/main.yml rename to roles/matrix_appservice_irc/tasks/main.yml diff --git a/roles/matrix-appservice-irc/tasks/service_user.yml b/roles/matrix_appservice_irc/tasks/service_user.yml similarity index 100% rename from roles/matrix-appservice-irc/tasks/service_user.yml rename to roles/matrix_appservice_irc/tasks/service_user.yml diff --git a/roles/matrix-appservice-irc/templates/config.yaml.j2 b/roles/matrix_appservice_irc/templates/config.yaml.j2 similarity index 100% rename from roles/matrix-appservice-irc/templates/config.yaml.j2 rename to roles/matrix_appservice_irc/templates/config.yaml.j2 diff --git a/roles/matrix-appservice-irc/templates/systemd/appservice.service.j2 b/roles/matrix_appservice_irc/templates/systemd/appservice.service.j2 similarity index 100% rename from roles/matrix-appservice-irc/templates/systemd/appservice.service.j2 rename to roles/matrix_appservice_irc/templates/systemd/appservice.service.j2 diff --git a/roles/matrix-appservice-webhooks/defaults/main.yml b/roles/matrix_appservice_webhooks/defaults/main.yml similarity index 100% rename from roles/matrix-appservice-webhooks/defaults/main.yml rename to roles/matrix_appservice_webhooks/defaults/main.yml diff --git a/roles/matrix-appservice-webhooks/tasks/main.yml b/roles/matrix_appservice_webhooks/tasks/main.yml similarity index 100% rename from roles/matrix-appservice-webhooks/tasks/main.yml rename to roles/matrix_appservice_webhooks/tasks/main.yml diff --git a/roles/matrix-appservice-webhooks/tasks/service_user.yml b/roles/matrix_appservice_webhooks/tasks/service_user.yml similarity index 100% rename from roles/matrix-appservice-webhooks/tasks/service_user.yml rename to roles/matrix_appservice_webhooks/tasks/service_user.yml diff --git a/roles/matrix-appservice-webhooks/templates/config.yaml.j2 b/roles/matrix_appservice_webhooks/templates/config.yaml.j2 similarity index 100% rename from roles/matrix-appservice-webhooks/templates/config.yaml.j2 rename to roles/matrix_appservice_webhooks/templates/config.yaml.j2 diff --git a/roles/matrix-appservice-webhooks/templates/systemd/appservice.service.j2 b/roles/matrix_appservice_webhooks/templates/systemd/appservice.service.j2 similarity index 100% rename from roles/matrix-appservice-webhooks/templates/systemd/appservice.service.j2 rename to roles/matrix_appservice_webhooks/templates/systemd/appservice.service.j2 diff --git a/roles/matrix-synapse/files/rest_auth_provider.py b/roles/matrix_synapse/files/rest_auth_provider.py similarity index 100% rename from roles/matrix-synapse/files/rest_auth_provider.py rename to roles/matrix_synapse/files/rest_auth_provider.py diff --git a/roles/matrix-synapse/handlers/main.yml b/roles/matrix_synapse/handlers/main.yml similarity index 100% rename from roles/matrix-synapse/handlers/main.yml rename to roles/matrix_synapse/handlers/main.yml diff --git a/roles/matrix-synapse/tasks/main.yml b/roles/matrix_synapse/tasks/main.yml similarity index 100% rename from roles/matrix-synapse/tasks/main.yml rename to roles/matrix_synapse/tasks/main.yml diff --git a/roles/matrix-synapse/templates/matrix-synapse/conf.d/database.yaml.j2 b/roles/matrix_synapse/templates/matrix-synapse/conf.d/database.yaml.j2 similarity index 100% rename from roles/matrix-synapse/templates/matrix-synapse/conf.d/database.yaml.j2 rename to roles/matrix_synapse/templates/matrix-synapse/conf.d/database.yaml.j2 diff --git 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 similarity index 100% rename from roles/matrix-synapse/templates/matrix-synapse/conf.d/enable_group_creation.yaml.j2 rename to roles/matrix_synapse/templates/matrix-synapse/conf.d/enable_group_creation.yaml.j2 diff --git a/roles/matrix-synapse/templates/matrix-synapse/conf.d/listeners.yaml.j2 b/roles/matrix_synapse/templates/matrix-synapse/conf.d/listeners.yaml.j2 similarity index 100% rename from roles/matrix-synapse/templates/matrix-synapse/conf.d/listeners.yaml.j2 rename to roles/matrix_synapse/templates/matrix-synapse/conf.d/listeners.yaml.j2 diff --git 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 similarity index 100% rename from roles/matrix-synapse/templates/matrix-synapse/conf.d/no_tls.yaml.j2 rename to roles/matrix_synapse/templates/matrix-synapse/conf.d/no_tls.yaml.j2 diff --git 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 similarity index 100% rename from roles/matrix-synapse/templates/matrix-synapse/conf.d/password_providers.yaml.j2 rename to roles/matrix_synapse/templates/matrix-synapse/conf.d/password_providers.yaml.j2 diff --git 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 similarity index 100% rename from roles/matrix-synapse/templates/matrix-synapse/conf.d/server_name.yaml.j2 rename to roles/matrix_synapse/templates/matrix-synapse/conf.d/server_name.yaml.j2 diff --git 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 similarity index 100% rename from roles/matrix-synapse/templates/matrix-synapse/conf.d/trusted_third_party_id_servers.yaml.j2 rename to roles/matrix_synapse/templates/matrix-synapse/conf.d/trusted_third_party_id_servers.yaml.j2 diff --git a/roles/nginx-reverseproxy/handlers/main.yml b/roles/nginx_reverseproxy/handlers/main.yml similarity index 100% rename from roles/nginx-reverseproxy/handlers/main.yml rename to roles/nginx_reverseproxy/handlers/main.yml diff --git a/roles/nginx-reverseproxy/tasks/main.yml b/roles/nginx_reverseproxy/tasks/main.yml similarity index 100% rename from roles/nginx-reverseproxy/tasks/main.yml rename to roles/nginx_reverseproxy/tasks/main.yml diff --git a/roles/nginx-reverseproxy/templates/letsencrypt/dhparam.j2 b/roles/nginx_reverseproxy/templates/letsencrypt/dhparam.j2 similarity index 100% rename from roles/nginx-reverseproxy/templates/letsencrypt/dhparam.j2 rename to roles/nginx_reverseproxy/templates/letsencrypt/dhparam.j2 diff --git a/roles/nginx-reverseproxy/templates/nginx/sites-available/redirect.j2 b/roles/nginx_reverseproxy/templates/nginx/sites-available/redirect.j2 similarity index 100% rename from roles/nginx-reverseproxy/templates/nginx/sites-available/redirect.j2 rename to roles/nginx_reverseproxy/templates/nginx/sites-available/redirect.j2 diff --git a/roles/nginx-reverseproxy/templates/nginx/sites-available/reverseproxy.j2 b/roles/nginx_reverseproxy/templates/nginx/sites-available/reverseproxy.j2 similarity index 100% rename from roles/nginx-reverseproxy/templates/nginx/sites-available/reverseproxy.j2 rename to roles/nginx_reverseproxy/templates/nginx/sites-available/reverseproxy.j2 diff --git a/roles/nginx-reverseproxy/templates/nginx/sites-available/reverseproxy_redirect_dname.j2 b/roles/nginx_reverseproxy/templates/nginx/sites-available/reverseproxy_redirect_dname.j2 similarity index 100% rename from roles/nginx-reverseproxy/templates/nginx/sites-available/reverseproxy_redirect_dname.j2 rename to roles/nginx_reverseproxy/templates/nginx/sites-available/reverseproxy_redirect_dname.j2 diff --git a/roles/nginx-reverseproxy/templates/nginx/snippets/options-proxypass.conf.j2 b/roles/nginx_reverseproxy/templates/nginx/snippets/options-proxypass.conf.j2 similarity index 100% rename from roles/nginx-reverseproxy/templates/nginx/snippets/options-proxypass.conf.j2 rename to roles/nginx_reverseproxy/templates/nginx/snippets/options-proxypass.conf.j2 diff --git a/roles/nginx-reverseproxy/templates/nginx/snippets/options-ssl.conf.j2 b/roles/nginx_reverseproxy/templates/nginx/snippets/options-ssl.conf.j2 similarity index 100% rename from roles/nginx-reverseproxy/templates/nginx/snippets/options-ssl.conf.j2 rename to roles/nginx_reverseproxy/templates/nginx/snippets/options-ssl.conf.j2 diff --git a/roles/nginx-reverseproxy/templates/update-motd.d/05-service.j2 b/roles/nginx_reverseproxy/templates/update-motd.d/05-service.j2 similarity index 100% rename from roles/nginx-reverseproxy/templates/update-motd.d/05-service.j2 rename to roles/nginx_reverseproxy/templates/update-motd.d/05-service.j2 diff --git a/roles/nginx-reverseproxy/templates/www/html/50x.html.j2 b/roles/nginx_reverseproxy/templates/www/html/50x.html.j2 similarity index 100% rename from roles/nginx-reverseproxy/templates/www/html/50x.html.j2 rename to roles/nginx_reverseproxy/templates/www/html/50x.html.j2 diff --git a/roles/prometheus-node/handlers/main.yml b/roles/prometheus_node/handlers/main.yml similarity index 100% rename from roles/prometheus-node/handlers/main.yml rename to roles/prometheus_node/handlers/main.yml diff --git a/roles/prometheus-node/tasks/main.yml b/roles/prometheus_node/tasks/main.yml similarity index 100% rename from roles/prometheus-node/tasks/main.yml rename to roles/prometheus_node/tasks/main.yml diff --git a/roles/re2o-service/defaults/main.yml b/roles/re2o_service/defaults/main.yml similarity index 100% rename from roles/re2o-service/defaults/main.yml rename to roles/re2o_service/defaults/main.yml diff --git a/roles/re2o-service/tasks/main.yml b/roles/re2o_service/tasks/main.yml similarity index 100% rename from roles/re2o-service/tasks/main.yml rename to roles/re2o_service/tasks/main.yml diff --git a/roles/re2o-service/tasks/service_user.yml b/roles/re2o_service/tasks/service_user.yml similarity index 100% rename from roles/re2o-service/tasks/service_user.yml rename to roles/re2o_service/tasks/service_user.yml diff --git a/roles/re2o-service/templates/update-motd.d/05-service.j2 b/roles/re2o_service/templates/update-motd.d/05-service.j2 similarity index 100% rename from roles/re2o-service/templates/update-motd.d/05-service.j2 rename to roles/re2o_service/templates/update-motd.d/05-service.j2 diff --git a/roles/unifi-controller/tasks/main.yml b/roles/unifi_controller/tasks/main.yml similarity index 100% rename from roles/unifi-controller/tasks/main.yml rename to roles/unifi_controller/tasks/main.yml diff --git a/roles/unifi-controller/templates/update-motd.d/05-service.j2 b/roles/unifi_controller/templates/update-motd.d/05-service.j2 similarity index 100% rename from roles/unifi-controller/templates/update-motd.d/05-service.j2 rename to roles/unifi_controller/templates/update-motd.d/05-service.j2 diff --git a/services_web.yml b/services_web.yml index f368d9f..5fc935e 100755 --- 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