diff --git a/playbooks/dbservers.yml b/playbooks/dbservers.yml index 4e09f5b..734fb3b 100644 --- a/playbooks/dbservers.yml +++ b/playbooks/dbservers.yml @@ -2,7 +2,7 @@ # vim:ft=ansible: - hosts: psql1.9iron.club roles: - - role: backups + - role: base-backups tags: [ backups ] - role: postgresql tags: [ db, psql ] diff --git a/playbooks/gameservers.yml b/playbooks/gameservers.yml index 3b09ed6..8323227 100644 --- a/playbooks/gameservers.yml +++ b/playbooks/gameservers.yml @@ -3,11 +3,11 @@ --- - hosts: gameservers roles: - - role: backups + - role: base-backups tags: [ backups ] #- hosts: game1.9iron.club # roles: -# - role: backups +# - role: base-backups # tags: [ backups ] # - role: minecraft # vars: @@ -70,7 +70,7 @@ # tags: [ dns ] #- hosts: game2 # roles: -# - role: backups +# - role: base-backups # tags: [ backups ] # - role: minecraft # vars: diff --git a/playbooks/home.yml b/playbooks/home.yml index 5feacd6..339bc2e 100644 --- a/playbooks/home.yml +++ b/playbooks/home.yml @@ -3,11 +3,11 @@ --- - hosts: home roles: - - role: backups + - role: base-backups tags: [ backups ] - - role: zerotier + - role: desktop-zerotier tags: [ zerotier ] - - role: desktop + - role: desktop-common vars: mopidy_spotify_username: !vault | $ANSIBLE_VAULT;1.1;AES256 @@ -40,7 +40,7 @@ 38306234316364306134396138376230626630633733306432626637616239373838646433343761 3436643661633766616564663937346232353666386531363438 tags: [ desktop ] - - role: sddm + - role: desktop-sddm vars: sddm_theme_name: "breeze" tags: [ sddm, desktop ] diff --git a/roles/backups/defaults/main.yml b/roles/base-backups/defaults/main.yml similarity index 100% rename from roles/backups/defaults/main.yml rename to roles/base-backups/defaults/main.yml diff --git a/roles/backups/handlers/main.yml b/roles/base-backups/handlers/main.yml similarity index 100% rename from roles/backups/handlers/main.yml rename to roles/base-backups/handlers/main.yml diff --git a/roles/backups/meta/main.yml b/roles/base-backups/meta/main.yml similarity index 100% rename from roles/backups/meta/main.yml rename to roles/base-backups/meta/main.yml diff --git a/roles/backups/tasks/main.yml b/roles/base-backups/tasks/main.yml similarity index 100% rename from roles/backups/tasks/main.yml rename to roles/base-backups/tasks/main.yml diff --git a/roles/backups/templates/9iron-backup.service b/roles/base-backups/templates/9iron-backup.service similarity index 100% rename from roles/backups/templates/9iron-backup.service rename to roles/base-backups/templates/9iron-backup.service diff --git a/roles/backups/templates/9iron-backup.timer b/roles/base-backups/templates/9iron-backup.timer similarity index 100% rename from roles/backups/templates/9iron-backup.timer rename to roles/base-backups/templates/9iron-backup.timer diff --git a/roles/backups/templates/backup.sh b/roles/base-backups/templates/backup.sh similarity index 100% rename from roles/backups/templates/backup.sh rename to roles/base-backups/templates/backup.sh diff --git a/roles/snmpd/handlers/main.yml b/roles/base-snmpd/handlers/main.yml similarity index 100% rename from roles/snmpd/handlers/main.yml rename to roles/base-snmpd/handlers/main.yml diff --git a/roles/snmpd/tasks/main.yml b/roles/base-snmpd/tasks/main.yml similarity index 100% rename from roles/snmpd/tasks/main.yml rename to roles/base-snmpd/tasks/main.yml diff --git a/roles/snmpd/templates/snmpd.conf b/roles/base-snmpd/templates/snmpd.conf similarity index 100% rename from roles/snmpd/templates/snmpd.conf rename to roles/base-snmpd/templates/snmpd.conf diff --git a/roles/user/defaults/main.yml b/roles/base-user/defaults/main.yml similarity index 100% rename from roles/user/defaults/main.yml rename to roles/base-user/defaults/main.yml diff --git a/roles/sddm/meta/main.yml b/roles/base-user/meta/main.yml similarity index 100% rename from roles/sddm/meta/main.yml rename to roles/base-user/meta/main.yml diff --git a/roles/user/tasks/main.yml b/roles/base-user/tasks/main.yml similarity index 100% rename from roles/user/tasks/main.yml rename to roles/base-user/tasks/main.yml diff --git a/roles/desktop/handlers/main.yml b/roles/desktop-common/handlers/main.yml similarity index 100% rename from roles/desktop/handlers/main.yml rename to roles/desktop-common/handlers/main.yml diff --git a/roles/desktop/meta/main.yml b/roles/desktop-common/meta/main.yml similarity index 100% rename from roles/desktop/meta/main.yml rename to roles/desktop-common/meta/main.yml diff --git a/roles/desktop/tasks/apache.yml b/roles/desktop-common/tasks/apache.yml similarity index 100% rename from roles/desktop/tasks/apache.yml rename to roles/desktop-common/tasks/apache.yml diff --git a/roles/desktop/tasks/dkms.yml b/roles/desktop-common/tasks/dkms.yml similarity index 100% rename from roles/desktop/tasks/dkms.yml rename to roles/desktop-common/tasks/dkms.yml diff --git a/roles/desktop/tasks/main.yml b/roles/desktop-common/tasks/main.yml similarity index 100% rename from roles/desktop/tasks/main.yml rename to roles/desktop-common/tasks/main.yml diff --git a/roles/desktop/tasks/mopidy.yml b/roles/desktop-common/tasks/mopidy.yml similarity index 100% rename from roles/desktop/tasks/mopidy.yml rename to roles/desktop-common/tasks/mopidy.yml diff --git a/roles/desktop/tasks/packages.yml b/roles/desktop-common/tasks/packages.yml similarity index 100% rename from roles/desktop/tasks/packages.yml rename to roles/desktop-common/tasks/packages.yml diff --git a/roles/desktop/tasks/sshd.yml b/roles/desktop-common/tasks/sshd.yml similarity index 100% rename from roles/desktop/tasks/sshd.yml rename to roles/desktop-common/tasks/sshd.yml diff --git a/roles/desktop/templates/apache2-vhost.conf b/roles/desktop-common/templates/apache2-vhost.conf similarity index 100% rename from roles/desktop/templates/apache2-vhost.conf rename to roles/desktop-common/templates/apache2-vhost.conf diff --git a/roles/desktop/templates/backup.sh b/roles/desktop-common/templates/backup.sh similarity index 100% rename from roles/desktop/templates/backup.sh rename to roles/desktop-common/templates/backup.sh diff --git a/roles/desktop/templates/g810-led.rules b/roles/desktop-common/templates/g810-led.rules similarity index 100% rename from roles/desktop/templates/g810-led.rules rename to roles/desktop-common/templates/g810-led.rules diff --git a/roles/desktop/templates/i3.desktop b/roles/desktop-common/templates/i3.desktop similarity index 100% rename from roles/desktop/templates/i3.desktop rename to roles/desktop-common/templates/i3.desktop diff --git a/roles/desktop/templates/mopidy.conf b/roles/desktop-common/templates/mopidy.conf similarity index 100% rename from roles/desktop/templates/mopidy.conf rename to roles/desktop-common/templates/mopidy.conf diff --git a/roles/desktop/templates/nomouseaccel.conf b/roles/desktop-common/templates/nomouseaccel.conf similarity index 100% rename from roles/desktop/templates/nomouseaccel.conf rename to roles/desktop-common/templates/nomouseaccel.conf diff --git a/roles/desktop/templates/sshd_config b/roles/desktop-common/templates/sshd_config similarity index 100% rename from roles/desktop/templates/sshd_config rename to roles/desktop-common/templates/sshd_config diff --git a/roles/desktop/templates/startx.desktop b/roles/desktop-common/templates/startx.desktop similarity index 100% rename from roles/desktop/templates/startx.desktop rename to roles/desktop-common/templates/startx.desktop diff --git a/roles/desktop/templates/switch-rcm.rules b/roles/desktop-common/templates/switch-rcm.rules similarity index 100% rename from roles/desktop/templates/switch-rcm.rules rename to roles/desktop-common/templates/switch-rcm.rules diff --git a/roles/user/meta/main.yml b/roles/desktop-sddm/meta/main.yml similarity index 100% rename from roles/user/meta/main.yml rename to roles/desktop-sddm/meta/main.yml diff --git a/roles/sddm/tasks/main.yml b/roles/desktop-sddm/tasks/main.yml similarity index 100% rename from roles/sddm/tasks/main.yml rename to roles/desktop-sddm/tasks/main.yml diff --git a/roles/sddm/templates/main.conf b/roles/desktop-sddm/templates/main.conf similarity index 100% rename from roles/sddm/templates/main.conf rename to roles/desktop-sddm/templates/main.conf diff --git a/roles/sddm/templates/theme.conf b/roles/desktop-sddm/templates/theme.conf similarity index 100% rename from roles/sddm/templates/theme.conf rename to roles/desktop-sddm/templates/theme.conf diff --git a/roles/zerotier/meta/main.yml b/roles/desktop-zerotier/meta/main.yml similarity index 100% rename from roles/zerotier/meta/main.yml rename to roles/desktop-zerotier/meta/main.yml diff --git a/roles/zerotier/tasks/main.yml b/roles/desktop-zerotier/tasks/main.yml similarity index 100% rename from roles/zerotier/tasks/main.yml rename to roles/desktop-zerotier/tasks/main.yml diff --git a/site.yml b/site.yml index 8e0cb9c..221f43b 100755 --- a/site.yml +++ b/site.yml @@ -12,7 +12,7 @@ tags: [ common, dns ] - role: influxdb tags: [ common, influxdb ] - - role: user + - role: base-user vars: user_username: salt user_password: !vault | @@ -29,7 +29,7 @@ tags: [ common, user ] - hosts: 9iron.club roles: - - role: snmpd + - role: base-snmpd tags: [ common, snmpd ] - import_playbook: playbooks/dns.yml - import_playbook: playbooks/dbservers.yml