From 1db0b6ec318b2d66f6bbb198069ea99b183bad67 Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" <andi@debian.org>
Date: Sun, 12 Jun 2022 14:27:44 +0200
Subject: [PATCH] Rename some roles to make ansible-lint happy.
---
cloudbox.yml | 12 ++++++------
edubox.yml | 4 ++--
installbox.yml | 8 ++++----
kerberox-client.yml | 4 ++--
kerberox.yml | 12 ++++++------
kiosk.yml | 2 +-
roles/{apt-cacher => aptcacher}/files/apt.conf | 0
roles/{apt-cacher => aptcacher}/handlers/main.yml | 0
roles/{apt-cacher => aptcacher}/tasks/main.yml | 0
roles/{ddns-update => ddnsupdate}/files/ddns-update | 0
.../files/ddns-update.service | 0
.../files/ddns-update.timer | 0
roles/{ddns-update => ddnsupdate}/handlers/main.yml | 0
roles/{ddns-update => ddnsupdate}/tasks/main.yml | 0
.../templates/ddns-update.conf.j2 | 0
.../{dns-dhcp-tftp => dnsdhcptftp}/defaults/main.yml | 0
.../{dns-dhcp-tftp => dnsdhcptftp}/handlers/main.yml | 0
roles/{dns-dhcp-tftp => dnsdhcptftp}/tasks/main.yml | 0
.../templates/db.intern.j2 | 0
.../templates/db.lan.j2 | 0
.../templates/dhcpd.conf.j2 | 0
.../templates/localzones.j2 | 0
.../templates/resolv.conf.j2 | 0
.../handlers/main.yml | 0
.../tasks/main.yml | 0
.../templates/interfaces-static.j2 | 0
.../{krb5-kdc-ldap => krb5kdcldap}/defaults/main.yml | 0
.../{krb5-kdc-ldap => krb5kdcldap}/handlers/main.yml | 0
roles/{krb5-kdc-ldap => krb5kdcldap}/meta/main.yml | 0
roles/{krb5-kdc-ldap => krb5kdcldap}/tasks/main.yml | 0
.../templates/kadm5.acl.j2 | 0
.../templates/kdc.conf.j2 | 0
.../templates/krb5.conf.j2 | 0
roles/{lan-client => lanclient}/defaults/main.yml | 0
roles/{lan-client => lanclient}/handlers/main.yml | 0
roles/{lan-client => lanclient}/tasks/main.yml | 0
.../{lan-client => lanclient}/templates/sssd.conf.j2 | 0
roles/{low-power => lowpower}/files/powertop.service | 0
roles/{low-power => lowpower}/files/powertop.timer | 0
roles/{low-power => lowpower}/handlers/main.yml | 0
roles/{low-power => lowpower}/tasks/main.yml | 0
.../defaults/main.yml | 0
.../handlers/main.yml | 0
.../tasks/main.yml | 0
.../files/all-eth.network | 0
.../handlers/main.yml | 0
.../tasks/main.yml | 0
.../templates/20-static.network.j2 | 0
.../handlers/main.yml | 0
.../tasks/main.yml | 0
roles/{nfs-server => nfsserver}/defaults/main.yml | 0
roles/{nfs-server => nfsserver}/handlers/main.yml | 0
roles/{nfs-server => nfsserver}/tasks/main.yml | 0
.../templates/dhcp-send-domain.j2 | 0
.../{nfs-server => nfsserver}/templates/sssd.conf.j2 | 0
roles/{samba-ldap => sambaldap}/defaults/main.yml | 0
roles/{samba-ldap => sambaldap}/handlers/main.yml | 0
roles/{samba-ldap => sambaldap}/meta/main.yml | 0
roles/{samba-ldap => sambaldap}/tasks/main.yml | 0
.../{samba-ldap => sambaldap}/templates/sssd.conf.j2 | 0
.../handlers/main.yml | 0
.../tasks/main.yml | 0
.../templates/interfaces-static.j2 | 0
.../defaults/main.yml | 0
.../handlers/main.yml | 0
.../tasks/main.yml | 0
.../templates/sssd.conf.j2 | 0
.../files/store_id_regex.conf | 0
.../handlers/main.yml | 0
.../tasks/main.yml | 0
.../defaults/main.yml | 0
.../tasks/main.yml | 0
roles/{web-server => webserver}/tasks/main.yml | 0
sambox-client.yml | 4 ++--
sambox.yml | 12 ++++++------
75 files changed, 29 insertions(+), 29 deletions(-)
rename roles/{apt-cacher => aptcacher}/files/apt.conf (100%)
rename roles/{apt-cacher => aptcacher}/handlers/main.yml (100%)
rename roles/{apt-cacher => aptcacher}/tasks/main.yml (100%)
rename roles/{ddns-update => ddnsupdate}/files/ddns-update (100%)
rename roles/{ddns-update => ddnsupdate}/files/ddns-update.service (100%)
rename roles/{ddns-update => ddnsupdate}/files/ddns-update.timer (100%)
rename roles/{ddns-update => ddnsupdate}/handlers/main.yml (100%)
rename roles/{ddns-update => ddnsupdate}/tasks/main.yml (100%)
rename roles/{ddns-update => ddnsupdate}/templates/ddns-update.conf.j2 (100%)
rename roles/{dns-dhcp-tftp => dnsdhcptftp}/defaults/main.yml (100%)
rename roles/{dns-dhcp-tftp => dnsdhcptftp}/handlers/main.yml (100%)
rename roles/{dns-dhcp-tftp => dnsdhcptftp}/tasks/main.yml (100%)
rename roles/{dns-dhcp-tftp => dnsdhcptftp}/templates/db.intern.j2 (100%)
rename roles/{dns-dhcp-tftp => dnsdhcptftp}/templates/db.lan.j2 (100%)
rename roles/{dns-dhcp-tftp => dnsdhcptftp}/templates/dhcpd.conf.j2 (100%)
rename roles/{dns-dhcp-tftp => dnsdhcptftp}/templates/localzones.j2 (100%)
rename roles/{dns-dhcp-tftp => dnsdhcptftp}/templates/resolv.conf.j2 (100%)
rename roles/{two-interface-firewalld => firewalld2if}/handlers/main.yml (100%)
rename roles/{two-interface-firewalld => firewalld2if}/tasks/main.yml (100%)
rename roles/{two-interface-firewalld => firewalld2if}/templates/interfaces-static.j2 (100%)
rename roles/{krb5-kdc-ldap => krb5kdcldap}/defaults/main.yml (100%)
rename roles/{krb5-kdc-ldap => krb5kdcldap}/handlers/main.yml (100%)
rename roles/{krb5-kdc-ldap => krb5kdcldap}/meta/main.yml (100%)
rename roles/{krb5-kdc-ldap => krb5kdcldap}/tasks/main.yml (100%)
rename roles/{krb5-kdc-ldap => krb5kdcldap}/templates/kadm5.acl.j2 (100%)
rename roles/{krb5-kdc-ldap => krb5kdcldap}/templates/kdc.conf.j2 (100%)
rename roles/{krb5-kdc-ldap => krb5kdcldap}/templates/krb5.conf.j2 (100%)
rename roles/{lan-client => lanclient}/defaults/main.yml (100%)
rename roles/{lan-client => lanclient}/handlers/main.yml (100%)
rename roles/{lan-client => lanclient}/tasks/main.yml (100%)
rename roles/{lan-client => lanclient}/templates/sssd.conf.j2 (100%)
rename roles/{low-power => lowpower}/files/powertop.service (100%)
rename roles/{low-power => lowpower}/files/powertop.timer (100%)
rename roles/{low-power => lowpower}/handlers/main.yml (100%)
rename roles/{low-power => lowpower}/tasks/main.yml (100%)
rename roles/{netboot-installer => netbootinstaller}/defaults/main.yml (100%)
rename roles/{netboot-installer => netbootinstaller}/handlers/main.yml (100%)
rename roles/{netboot-installer => netbootinstaller}/tasks/main.yml (100%)
rename roles/{systemd-networkd-resolved => networkdresolved}/files/all-eth.network (100%)
rename roles/{systemd-networkd-resolved => networkdresolved}/handlers/main.yml (100%)
rename roles/{systemd-networkd-resolved => networkdresolved}/tasks/main.yml (100%)
rename roles/{systemd-networkd-resolved => networkdresolved}/templates/20-static.network.j2 (100%)
rename roles/{nextcloud-upgrade => nextcloudupgrade}/handlers/main.yml (100%)
rename roles/{nextcloud-upgrade => nextcloudupgrade}/tasks/main.yml (100%)
rename roles/{nfs-server => nfsserver}/defaults/main.yml (100%)
rename roles/{nfs-server => nfsserver}/handlers/main.yml (100%)
rename roles/{nfs-server => nfsserver}/tasks/main.yml (100%)
rename roles/{nfs-server => nfsserver}/templates/dhcp-send-domain.j2 (100%)
rename roles/{nfs-server => nfsserver}/templates/sssd.conf.j2 (100%)
rename roles/{samba-ldap => sambaldap}/defaults/main.yml (100%)
rename roles/{samba-ldap => sambaldap}/handlers/main.yml (100%)
rename roles/{samba-ldap => sambaldap}/meta/main.yml (100%)
rename roles/{samba-ldap => sambaldap}/tasks/main.yml (100%)
rename roles/{samba-ldap => sambaldap}/templates/sssd.conf.j2 (100%)
rename roles/{two-interface-shorewall => shorewall2if}/handlers/main.yml (100%)
rename roles/{two-interface-shorewall => shorewall2if}/tasks/main.yml (100%)
rename roles/{two-interface-shorewall => shorewall2if}/templates/interfaces-static.j2 (100%)
rename roles/{smb-sshfs-client => smbsshfsclient}/defaults/main.yml (100%)
rename roles/{smb-sshfs-client => smbsshfsclient}/handlers/main.yml (100%)
rename roles/{smb-sshfs-client => smbsshfsclient}/tasks/main.yml (100%)
rename roles/{smb-sshfs-client => smbsshfsclient}/templates/sssd.conf.j2 (100%)
rename roles/{transparent-squid => transparentsquid}/files/store_id_regex.conf (100%)
rename roles/{transparent-squid => transparentsquid}/handlers/main.yml (100%)
rename roles/{transparent-squid => transparentsquid}/tasks/main.yml (100%)
rename roles/{up2date-debian => up2date_debian}/defaults/main.yml (100%)
rename roles/{up2date-debian => up2date_debian}/tasks/main.yml (100%)
rename roles/{web-server => webserver}/tasks/main.yml (100%)
diff --git a/cloudbox.yml b/cloudbox.yml
index 0a78efc..de52ea5 100644
--- a/cloudbox.yml
+++ b/cloudbox.yml
@@ -27,11 +27,11 @@
ansible_python_interpreter: "/usr/bin/python3"
roles:
- - up2date-debian
-# - ddns-update
-# - low-power
+ - up2date_debian
+# - ddnsupdate
+# - lowpower
- nextcloud
- - nextcloud-upgrade
+ - nextcloudupgrade
# - backup
## Hosts in the the 'only_nextcloud'-group are only upgraded:
@@ -48,5 +48,5 @@
ansible_python_interpreter: "/usr/bin/python3"
roles:
- - up2date-debian
- - nextcloud-upgrade
+ - up2date_debian
+ - nextcloudupgrade
diff --git a/edubox.yml b/edubox.yml
index 06ca4fe..5bcea15 100644
--- a/edubox.yml
+++ b/edubox.yml
@@ -67,6 +67,6 @@
enabled: true
roles:
- - up2date-debian
+ - up2date_debian
- educontainer
- - systemd-networkd-resolved
+ - networkdresolved
diff --git a/installbox.yml b/installbox.yml
index a87f8b7..e4155f2 100644
--- a/installbox.yml
+++ b/installbox.yml
@@ -38,9 +38,9 @@
roles:
- - up2date-debian
- - two-interface-firewalld
+ - up2date_debian
+ - firewalld2if
- dnsmasq
- - netboot-installer
- - apt-cacher
+ - netbootinstaller
+ - aptcacher
- prepare4clients
diff --git a/kerberox-client.yml b/kerberox-client.yml
index 695c3a1..567676e 100644
--- a/kerberox-client.yml
+++ b/kerberox-client.yml
@@ -19,8 +19,8 @@
private: true
roles:
- - up2date-debian
- - lan-client
+ - up2date_debian
+ - lanclient
- kerberize
## Choose either gnome or KDE:
# - gnome
diff --git a/kerberox.yml b/kerberox.yml
index 976db14..e2194b0 100644
--- a/kerberox.yml
+++ b/kerberox.yml
@@ -45,14 +45,14 @@
roles:
- - up2date-debian
- - two-interface-firewalld
- - netboot-installer
+ - up2date_debian
+ - firewalld2if
+ - netbootinstaller
- dnsmasq
- - apt-cacher
- - role: krb5-kdc-ldap
+ - aptcacher
+ - role: krb5kdcldap
when: not run_in_installer|default(false)|bool
- - role: nfs-server
+ - role: nfsserver
when: not run_in_installer|default(false)|bool
- prepare4clients
- kerberize
diff --git a/kiosk.yml b/kiosk.yml
index 076e42d..4e2126f 100644
--- a/kiosk.yml
+++ b/kiosk.yml
@@ -15,7 +15,7 @@
extra_pkgs_bpo: [] # [ libreoffice ]
roles:
- - up2date-debian
+ - up2date_debian
## Choose either gnome or KDE:
- gnome
# - kde
diff --git a/roles/apt-cacher/files/apt.conf b/roles/aptcacher/files/apt.conf
similarity index 100%
rename from roles/apt-cacher/files/apt.conf
rename to roles/aptcacher/files/apt.conf
diff --git a/roles/apt-cacher/handlers/main.yml b/roles/aptcacher/handlers/main.yml
similarity index 100%
rename from roles/apt-cacher/handlers/main.yml
rename to roles/aptcacher/handlers/main.yml
diff --git a/roles/apt-cacher/tasks/main.yml b/roles/aptcacher/tasks/main.yml
similarity index 100%
rename from roles/apt-cacher/tasks/main.yml
rename to roles/aptcacher/tasks/main.yml
diff --git a/roles/ddns-update/files/ddns-update b/roles/ddnsupdate/files/ddns-update
similarity index 100%
rename from roles/ddns-update/files/ddns-update
rename to roles/ddnsupdate/files/ddns-update
diff --git a/roles/ddns-update/files/ddns-update.service b/roles/ddnsupdate/files/ddns-update.service
similarity index 100%
rename from roles/ddns-update/files/ddns-update.service
rename to roles/ddnsupdate/files/ddns-update.service
diff --git a/roles/ddns-update/files/ddns-update.timer b/roles/ddnsupdate/files/ddns-update.timer
similarity index 100%
rename from roles/ddns-update/files/ddns-update.timer
rename to roles/ddnsupdate/files/ddns-update.timer
diff --git a/roles/ddns-update/handlers/main.yml b/roles/ddnsupdate/handlers/main.yml
similarity index 100%
rename from roles/ddns-update/handlers/main.yml
rename to roles/ddnsupdate/handlers/main.yml
diff --git a/roles/ddns-update/tasks/main.yml b/roles/ddnsupdate/tasks/main.yml
similarity index 100%
rename from roles/ddns-update/tasks/main.yml
rename to roles/ddnsupdate/tasks/main.yml
diff --git a/roles/ddns-update/templates/ddns-update.conf.j2 b/roles/ddnsupdate/templates/ddns-update.conf.j2
similarity index 100%
rename from roles/ddns-update/templates/ddns-update.conf.j2
rename to roles/ddnsupdate/templates/ddns-update.conf.j2
diff --git a/roles/dns-dhcp-tftp/defaults/main.yml b/roles/dnsdhcptftp/defaults/main.yml
similarity index 100%
rename from roles/dns-dhcp-tftp/defaults/main.yml
rename to roles/dnsdhcptftp/defaults/main.yml
diff --git a/roles/dns-dhcp-tftp/handlers/main.yml b/roles/dnsdhcptftp/handlers/main.yml
similarity index 100%
rename from roles/dns-dhcp-tftp/handlers/main.yml
rename to roles/dnsdhcptftp/handlers/main.yml
diff --git a/roles/dns-dhcp-tftp/tasks/main.yml b/roles/dnsdhcptftp/tasks/main.yml
similarity index 100%
rename from roles/dns-dhcp-tftp/tasks/main.yml
rename to roles/dnsdhcptftp/tasks/main.yml
diff --git a/roles/dns-dhcp-tftp/templates/db.intern.j2 b/roles/dnsdhcptftp/templates/db.intern.j2
similarity index 100%
rename from roles/dns-dhcp-tftp/templates/db.intern.j2
rename to roles/dnsdhcptftp/templates/db.intern.j2
diff --git a/roles/dns-dhcp-tftp/templates/db.lan.j2 b/roles/dnsdhcptftp/templates/db.lan.j2
similarity index 100%
rename from roles/dns-dhcp-tftp/templates/db.lan.j2
rename to roles/dnsdhcptftp/templates/db.lan.j2
diff --git a/roles/dns-dhcp-tftp/templates/dhcpd.conf.j2 b/roles/dnsdhcptftp/templates/dhcpd.conf.j2
similarity index 100%
rename from roles/dns-dhcp-tftp/templates/dhcpd.conf.j2
rename to roles/dnsdhcptftp/templates/dhcpd.conf.j2
diff --git a/roles/dns-dhcp-tftp/templates/localzones.j2 b/roles/dnsdhcptftp/templates/localzones.j2
similarity index 100%
rename from roles/dns-dhcp-tftp/templates/localzones.j2
rename to roles/dnsdhcptftp/templates/localzones.j2
diff --git a/roles/dns-dhcp-tftp/templates/resolv.conf.j2 b/roles/dnsdhcptftp/templates/resolv.conf.j2
similarity index 100%
rename from roles/dns-dhcp-tftp/templates/resolv.conf.j2
rename to roles/dnsdhcptftp/templates/resolv.conf.j2
diff --git a/roles/two-interface-firewalld/handlers/main.yml b/roles/firewalld2if/handlers/main.yml
similarity index 100%
rename from roles/two-interface-firewalld/handlers/main.yml
rename to roles/firewalld2if/handlers/main.yml
diff --git a/roles/two-interface-firewalld/tasks/main.yml b/roles/firewalld2if/tasks/main.yml
similarity index 100%
rename from roles/two-interface-firewalld/tasks/main.yml
rename to roles/firewalld2if/tasks/main.yml
diff --git a/roles/two-interface-firewalld/templates/interfaces-static.j2 b/roles/firewalld2if/templates/interfaces-static.j2
similarity index 100%
rename from roles/two-interface-firewalld/templates/interfaces-static.j2
rename to roles/firewalld2if/templates/interfaces-static.j2
diff --git a/roles/krb5-kdc-ldap/defaults/main.yml b/roles/krb5kdcldap/defaults/main.yml
similarity index 100%
rename from roles/krb5-kdc-ldap/defaults/main.yml
rename to roles/krb5kdcldap/defaults/main.yml
diff --git a/roles/krb5-kdc-ldap/handlers/main.yml b/roles/krb5kdcldap/handlers/main.yml
similarity index 100%
rename from roles/krb5-kdc-ldap/handlers/main.yml
rename to roles/krb5kdcldap/handlers/main.yml
diff --git a/roles/krb5-kdc-ldap/meta/main.yml b/roles/krb5kdcldap/meta/main.yml
similarity index 100%
rename from roles/krb5-kdc-ldap/meta/main.yml
rename to roles/krb5kdcldap/meta/main.yml
diff --git a/roles/krb5-kdc-ldap/tasks/main.yml b/roles/krb5kdcldap/tasks/main.yml
similarity index 100%
rename from roles/krb5-kdc-ldap/tasks/main.yml
rename to roles/krb5kdcldap/tasks/main.yml
diff --git a/roles/krb5-kdc-ldap/templates/kadm5.acl.j2 b/roles/krb5kdcldap/templates/kadm5.acl.j2
similarity index 100%
rename from roles/krb5-kdc-ldap/templates/kadm5.acl.j2
rename to roles/krb5kdcldap/templates/kadm5.acl.j2
diff --git a/roles/krb5-kdc-ldap/templates/kdc.conf.j2 b/roles/krb5kdcldap/templates/kdc.conf.j2
similarity index 100%
rename from roles/krb5-kdc-ldap/templates/kdc.conf.j2
rename to roles/krb5kdcldap/templates/kdc.conf.j2
diff --git a/roles/krb5-kdc-ldap/templates/krb5.conf.j2 b/roles/krb5kdcldap/templates/krb5.conf.j2
similarity index 100%
rename from roles/krb5-kdc-ldap/templates/krb5.conf.j2
rename to roles/krb5kdcldap/templates/krb5.conf.j2
diff --git a/roles/lan-client/defaults/main.yml b/roles/lanclient/defaults/main.yml
similarity index 100%
rename from roles/lan-client/defaults/main.yml
rename to roles/lanclient/defaults/main.yml
diff --git a/roles/lan-client/handlers/main.yml b/roles/lanclient/handlers/main.yml
similarity index 100%
rename from roles/lan-client/handlers/main.yml
rename to roles/lanclient/handlers/main.yml
diff --git a/roles/lan-client/tasks/main.yml b/roles/lanclient/tasks/main.yml
similarity index 100%
rename from roles/lan-client/tasks/main.yml
rename to roles/lanclient/tasks/main.yml
diff --git a/roles/lan-client/templates/sssd.conf.j2 b/roles/lanclient/templates/sssd.conf.j2
similarity index 100%
rename from roles/lan-client/templates/sssd.conf.j2
rename to roles/lanclient/templates/sssd.conf.j2
diff --git a/roles/low-power/files/powertop.service b/roles/lowpower/files/powertop.service
similarity index 100%
rename from roles/low-power/files/powertop.service
rename to roles/lowpower/files/powertop.service
diff --git a/roles/low-power/files/powertop.timer b/roles/lowpower/files/powertop.timer
similarity index 100%
rename from roles/low-power/files/powertop.timer
rename to roles/lowpower/files/powertop.timer
diff --git a/roles/low-power/handlers/main.yml b/roles/lowpower/handlers/main.yml
similarity index 100%
rename from roles/low-power/handlers/main.yml
rename to roles/lowpower/handlers/main.yml
diff --git a/roles/low-power/tasks/main.yml b/roles/lowpower/tasks/main.yml
similarity index 100%
rename from roles/low-power/tasks/main.yml
rename to roles/lowpower/tasks/main.yml
diff --git a/roles/netboot-installer/defaults/main.yml b/roles/netbootinstaller/defaults/main.yml
similarity index 100%
rename from roles/netboot-installer/defaults/main.yml
rename to roles/netbootinstaller/defaults/main.yml
diff --git a/roles/netboot-installer/handlers/main.yml b/roles/netbootinstaller/handlers/main.yml
similarity index 100%
rename from roles/netboot-installer/handlers/main.yml
rename to roles/netbootinstaller/handlers/main.yml
diff --git a/roles/netboot-installer/tasks/main.yml b/roles/netbootinstaller/tasks/main.yml
similarity index 100%
rename from roles/netboot-installer/tasks/main.yml
rename to roles/netbootinstaller/tasks/main.yml
diff --git a/roles/systemd-networkd-resolved/files/all-eth.network b/roles/networkdresolved/files/all-eth.network
similarity index 100%
rename from roles/systemd-networkd-resolved/files/all-eth.network
rename to roles/networkdresolved/files/all-eth.network
diff --git a/roles/systemd-networkd-resolved/handlers/main.yml b/roles/networkdresolved/handlers/main.yml
similarity index 100%
rename from roles/systemd-networkd-resolved/handlers/main.yml
rename to roles/networkdresolved/handlers/main.yml
diff --git a/roles/systemd-networkd-resolved/tasks/main.yml b/roles/networkdresolved/tasks/main.yml
similarity index 100%
rename from roles/systemd-networkd-resolved/tasks/main.yml
rename to roles/networkdresolved/tasks/main.yml
diff --git a/roles/systemd-networkd-resolved/templates/20-static.network.j2 b/roles/networkdresolved/templates/20-static.network.j2
similarity index 100%
rename from roles/systemd-networkd-resolved/templates/20-static.network.j2
rename to roles/networkdresolved/templates/20-static.network.j2
diff --git a/roles/nextcloud-upgrade/handlers/main.yml b/roles/nextcloudupgrade/handlers/main.yml
similarity index 100%
rename from roles/nextcloud-upgrade/handlers/main.yml
rename to roles/nextcloudupgrade/handlers/main.yml
diff --git a/roles/nextcloud-upgrade/tasks/main.yml b/roles/nextcloudupgrade/tasks/main.yml
similarity index 100%
rename from roles/nextcloud-upgrade/tasks/main.yml
rename to roles/nextcloudupgrade/tasks/main.yml
diff --git a/roles/nfs-server/defaults/main.yml b/roles/nfsserver/defaults/main.yml
similarity index 100%
rename from roles/nfs-server/defaults/main.yml
rename to roles/nfsserver/defaults/main.yml
diff --git a/roles/nfs-server/handlers/main.yml b/roles/nfsserver/handlers/main.yml
similarity index 100%
rename from roles/nfs-server/handlers/main.yml
rename to roles/nfsserver/handlers/main.yml
diff --git a/roles/nfs-server/tasks/main.yml b/roles/nfsserver/tasks/main.yml
similarity index 100%
rename from roles/nfs-server/tasks/main.yml
rename to roles/nfsserver/tasks/main.yml
diff --git a/roles/nfs-server/templates/dhcp-send-domain.j2 b/roles/nfsserver/templates/dhcp-send-domain.j2
similarity index 100%
rename from roles/nfs-server/templates/dhcp-send-domain.j2
rename to roles/nfsserver/templates/dhcp-send-domain.j2
diff --git a/roles/nfs-server/templates/sssd.conf.j2 b/roles/nfsserver/templates/sssd.conf.j2
similarity index 100%
rename from roles/nfs-server/templates/sssd.conf.j2
rename to roles/nfsserver/templates/sssd.conf.j2
diff --git a/roles/samba-ldap/defaults/main.yml b/roles/sambaldap/defaults/main.yml
similarity index 100%
rename from roles/samba-ldap/defaults/main.yml
rename to roles/sambaldap/defaults/main.yml
diff --git a/roles/samba-ldap/handlers/main.yml b/roles/sambaldap/handlers/main.yml
similarity index 100%
rename from roles/samba-ldap/handlers/main.yml
rename to roles/sambaldap/handlers/main.yml
diff --git a/roles/samba-ldap/meta/main.yml b/roles/sambaldap/meta/main.yml
similarity index 100%
rename from roles/samba-ldap/meta/main.yml
rename to roles/sambaldap/meta/main.yml
diff --git a/roles/samba-ldap/tasks/main.yml b/roles/sambaldap/tasks/main.yml
similarity index 100%
rename from roles/samba-ldap/tasks/main.yml
rename to roles/sambaldap/tasks/main.yml
diff --git a/roles/samba-ldap/templates/sssd.conf.j2 b/roles/sambaldap/templates/sssd.conf.j2
similarity index 100%
rename from roles/samba-ldap/templates/sssd.conf.j2
rename to roles/sambaldap/templates/sssd.conf.j2
diff --git a/roles/two-interface-shorewall/handlers/main.yml b/roles/shorewall2if/handlers/main.yml
similarity index 100%
rename from roles/two-interface-shorewall/handlers/main.yml
rename to roles/shorewall2if/handlers/main.yml
diff --git a/roles/two-interface-shorewall/tasks/main.yml b/roles/shorewall2if/tasks/main.yml
similarity index 100%
rename from roles/two-interface-shorewall/tasks/main.yml
rename to roles/shorewall2if/tasks/main.yml
diff --git a/roles/two-interface-shorewall/templates/interfaces-static.j2 b/roles/shorewall2if/templates/interfaces-static.j2
similarity index 100%
rename from roles/two-interface-shorewall/templates/interfaces-static.j2
rename to roles/shorewall2if/templates/interfaces-static.j2
diff --git a/roles/smb-sshfs-client/defaults/main.yml b/roles/smbsshfsclient/defaults/main.yml
similarity index 100%
rename from roles/smb-sshfs-client/defaults/main.yml
rename to roles/smbsshfsclient/defaults/main.yml
diff --git a/roles/smb-sshfs-client/handlers/main.yml b/roles/smbsshfsclient/handlers/main.yml
similarity index 100%
rename from roles/smb-sshfs-client/handlers/main.yml
rename to roles/smbsshfsclient/handlers/main.yml
diff --git a/roles/smb-sshfs-client/tasks/main.yml b/roles/smbsshfsclient/tasks/main.yml
similarity index 100%
rename from roles/smb-sshfs-client/tasks/main.yml
rename to roles/smbsshfsclient/tasks/main.yml
diff --git a/roles/smb-sshfs-client/templates/sssd.conf.j2 b/roles/smbsshfsclient/templates/sssd.conf.j2
similarity index 100%
rename from roles/smb-sshfs-client/templates/sssd.conf.j2
rename to roles/smbsshfsclient/templates/sssd.conf.j2
diff --git a/roles/transparent-squid/files/store_id_regex.conf b/roles/transparentsquid/files/store_id_regex.conf
similarity index 100%
rename from roles/transparent-squid/files/store_id_regex.conf
rename to roles/transparentsquid/files/store_id_regex.conf
diff --git a/roles/transparent-squid/handlers/main.yml b/roles/transparentsquid/handlers/main.yml
similarity index 100%
rename from roles/transparent-squid/handlers/main.yml
rename to roles/transparentsquid/handlers/main.yml
diff --git a/roles/transparent-squid/tasks/main.yml b/roles/transparentsquid/tasks/main.yml
similarity index 100%
rename from roles/transparent-squid/tasks/main.yml
rename to roles/transparentsquid/tasks/main.yml
diff --git a/roles/up2date-debian/defaults/main.yml b/roles/up2date_debian/defaults/main.yml
similarity index 100%
rename from roles/up2date-debian/defaults/main.yml
rename to roles/up2date_debian/defaults/main.yml
diff --git a/roles/up2date-debian/tasks/main.yml b/roles/up2date_debian/tasks/main.yml
similarity index 100%
rename from roles/up2date-debian/tasks/main.yml
rename to roles/up2date_debian/tasks/main.yml
diff --git a/roles/web-server/tasks/main.yml b/roles/webserver/tasks/main.yml
similarity index 100%
rename from roles/web-server/tasks/main.yml
rename to roles/webserver/tasks/main.yml
diff --git a/sambox-client.yml b/sambox-client.yml
index 305f81c..5588c82 100644
--- a/sambox-client.yml
+++ b/sambox-client.yml
@@ -13,8 +13,8 @@
ansible_python_interpreter: "/usr/bin/python3"
roles:
- - up2date-debian
- - smb-sshfs-client
+ - up2date_debian
+ - smbsshfsclient
## Choose either gnome or KDE:
# - gnome
# - kde
diff --git a/sambox.yml b/sambox.yml
index 465a5d8..9954225 100644
--- a/sambox.yml
+++ b/sambox.yml
@@ -51,10 +51,10 @@
roles:
- - up2date-debian
- - two-interface-firewalld
- - netboot-installer
- - dns-dhcp-tftp
- - apt-cacher
- - samba-ldap
+ - up2date_debian
+ - firewalld2if
+ - netbootinstaller
+ - dnsdhcptftp
+ - aptcacher
+ - sambaldap
- prepare4clients