diff --git a/borgbackup.yml b/borgbackup.yml index 5e98e23..d724049 100644 --- a/borgbackup.yml +++ b/borgbackup.yml @@ -7,8 +7,8 @@ - hosts: borg_client diff: true roles: - - borg-client + - borg_client - hosts: borg_server diff: true roles: - - borg-server + - borg_server diff --git a/munin.yml b/munin.yml index f93688d..85184c7 100644 --- a/munin.yml +++ b/munin.yml @@ -3,9 +3,9 @@ - hosts: all:!disabled_munin diff: true roles: - - munin-client + - munin_client - hosts: muninservers diff: true roles: - - munin-server + - munin_server diff --git a/nut.yml b/nut.yml index 64d45a1..69429a2 100644 --- a/nut.yml +++ b/nut.yml @@ -3,8 +3,8 @@ - hosts: nut_server diff: true roles: - - nut-server + - nut_server - hosts: nut_client diff: true roles: - - nut-client + - nut_client diff --git a/roles/borg-client/defaults/main.yml b/roles/borg_client/defaults/main.yml similarity index 100% rename from roles/borg-client/defaults/main.yml rename to roles/borg_client/defaults/main.yml diff --git a/roles/borg-client/tasks/main.yml b/roles/borg_client/tasks/main.yml similarity index 100% rename from roles/borg-client/tasks/main.yml rename to roles/borg_client/tasks/main.yml diff --git a/roles/borg-client/templates/borgbackup.sh.j2 b/roles/borg_client/templates/borgbackup.sh.j2 similarity index 100% rename from roles/borg-client/templates/borgbackup.sh.j2 rename to roles/borg_client/templates/borgbackup.sh.j2 diff --git a/roles/borg-server/tasks/main.yml b/roles/borg_server/tasks/main.yml similarity index 100% rename from roles/borg-server/tasks/main.yml rename to roles/borg_server/tasks/main.yml diff --git a/roles/munin-client/files/mikrotikcpu_ b/roles/munin_client/files/mikrotikcpu_ similarity index 100% rename from roles/munin-client/files/mikrotikcpu_ rename to roles/munin_client/files/mikrotikcpu_ diff --git a/roles/munin-client/files/mikrotikifrate_ b/roles/munin_client/files/mikrotikifrate_ similarity index 100% rename from roles/munin-client/files/mikrotikifrate_ rename to roles/munin_client/files/mikrotikifrate_ diff --git a/roles/munin-client/files/mikrotikmemory_ b/roles/munin_client/files/mikrotikmemory_ similarity index 100% rename from roles/munin-client/files/mikrotikmemory_ rename to roles/munin_client/files/mikrotikmemory_ diff --git a/roles/munin-client/handlers/main.yml b/roles/munin_client/handlers/main.yml similarity index 100% rename from roles/munin-client/handlers/main.yml rename to roles/munin_client/handlers/main.yml diff --git a/roles/munin-client/tasks/hypervisors.yml b/roles/munin_client/tasks/hypervisors.yml similarity index 100% rename from roles/munin-client/tasks/hypervisors.yml rename to roles/munin_client/tasks/hypervisors.yml diff --git a/roles/munin-client/tasks/main.yml b/roles/munin_client/tasks/main.yml similarity index 100% rename from roles/munin-client/tasks/main.yml rename to roles/munin_client/tasks/main.yml diff --git a/roles/munin-client/tasks/mikrotik.yml b/roles/munin_client/tasks/mikrotik.yml similarity index 100% rename from roles/munin-client/tasks/mikrotik.yml rename to roles/munin_client/tasks/mikrotik.yml diff --git a/roles/munin-client/tasks/physical_servers.yml b/roles/munin_client/tasks/physical_servers.yml similarity index 100% rename from roles/munin-client/tasks/physical_servers.yml rename to roles/munin_client/tasks/physical_servers.yml diff --git a/roles/munin-client/templates/munin-node.conf.j2 b/roles/munin_client/templates/munin-node.conf.j2 similarity index 100% rename from roles/munin-client/templates/munin-node.conf.j2 rename to roles/munin_client/templates/munin-node.conf.j2 diff --git a/roles/munin-server/tasks/main.yml b/roles/munin_server/tasks/main.yml similarity index 100% rename from roles/munin-server/tasks/main.yml rename to roles/munin_server/tasks/main.yml diff --git a/roles/munin-server/templates/munin.conf.j2 b/roles/munin_server/templates/munin.conf.j2 similarity index 100% rename from roles/munin-server/templates/munin.conf.j2 rename to roles/munin_server/templates/munin.conf.j2 diff --git a/roles/nut-client/files/nut.conf b/roles/nut_client/files/nut.conf similarity index 100% rename from roles/nut-client/files/nut.conf rename to roles/nut_client/files/nut.conf diff --git a/roles/nut-client/handlers/main.yml b/roles/nut_client/handlers/main.yml similarity index 100% rename from roles/nut-client/handlers/main.yml rename to roles/nut_client/handlers/main.yml diff --git a/roles/nut-client/tasks/main.yml b/roles/nut_client/tasks/main.yml similarity index 100% rename from roles/nut-client/tasks/main.yml rename to roles/nut_client/tasks/main.yml diff --git a/roles/nut-client/templates/upsmon.conf.j2 b/roles/nut_client/templates/upsmon.conf.j2 similarity index 100% rename from roles/nut-client/templates/upsmon.conf.j2 rename to roles/nut_client/templates/upsmon.conf.j2 diff --git a/roles/nut-server/files/90-nut-ups.rules b/roles/nut_server/files/90-nut-ups.rules similarity index 100% rename from roles/nut-server/files/90-nut-ups.rules rename to roles/nut_server/files/90-nut-ups.rules diff --git a/roles/nut-server/files/nut.conf b/roles/nut_server/files/nut.conf similarity index 100% rename from roles/nut-server/files/nut.conf rename to roles/nut_server/files/nut.conf diff --git a/roles/nut-server/files/ups.conf b/roles/nut_server/files/ups.conf similarity index 100% rename from roles/nut-server/files/ups.conf rename to roles/nut_server/files/ups.conf diff --git a/roles/nut-server/files/upsd.conf b/roles/nut_server/files/upsd.conf similarity index 100% rename from roles/nut-server/files/upsd.conf rename to roles/nut_server/files/upsd.conf diff --git a/roles/nut-server/handlers/main.yml b/roles/nut_server/handlers/main.yml similarity index 100% rename from roles/nut-server/handlers/main.yml rename to roles/nut_server/handlers/main.yml diff --git a/roles/nut-server/tasks/main.yml b/roles/nut_server/tasks/main.yml similarity index 100% rename from roles/nut-server/tasks/main.yml rename to roles/nut_server/tasks/main.yml diff --git a/roles/nut-server/templates/upsd.users.j2 b/roles/nut_server/templates/upsd.users.j2 similarity index 100% rename from roles/nut-server/templates/upsd.users.j2 rename to roles/nut_server/templates/upsd.users.j2