From f53a1476f299c71244df23c5f4edc1f118b41f23 Mon Sep 17 00:00:00 2001 From: Lilian Roller Date: Wed, 24 Apr 2019 09:19:13 +0200 Subject: [PATCH] Split roles to different modells --- .gitmodules | 3 -- ansible.cfg | 2 +- ansible/hosts | 2 - ansible/hosts.ini | 4 ++ files/admin_ssh_keys | 2 +- group_vars/thinkpad.yml | 2 +- roles/firefox | 1 - setup_desk_minni.yml | 75 ++++++++++++++++++++++++++++++++ setup.yml => setup_l460.yml | 18 ++++---- setup_t460p.yml | 85 +++++++++++++++++++++++++++++++++++++ 10 files changed, 176 insertions(+), 18 deletions(-) delete mode 100644 ansible/hosts create mode 100644 ansible/hosts.ini delete mode 160000 roles/firefox create mode 100644 setup_desk_minni.yml rename setup.yml => setup_l460.yml (85%) create mode 100644 setup_t460p.yml diff --git a/.gitmodules b/.gitmodules index 8d80649..f3809ba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "roles/dotfiles"] path = roles/dotfiles url = https://github.com/DO1JLR/role_dotfiles.git -[submodule "roles/firefox"] - path = roles/firefox - url = https://github.com/maxbachmann-ansible/role-firefox.git [submodule "roles/pulseaudio"] path = roles/pulseaudio url = https://github.com/DO1JLR/role_pulseaudio_archlinux.git diff --git a/ansible.cfg b/ansible.cfg index 8cbe043..3e8fb5d 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,5 +1,5 @@ [defaults] -inventory = ./ansible/hosts +inventory = ./ansible/hosts.ini retry_files_enabled = False nocows = True transport = local diff --git a/ansible/hosts b/ansible/hosts deleted file mode 100644 index 5ef2e79..0000000 --- a/ansible/hosts +++ /dev/null @@ -1,2 +0,0 @@ -[thinkpad] -t460p ansible_host="localhost" ansible_connection=local diff --git a/ansible/hosts.ini b/ansible/hosts.ini new file mode 100644 index 0000000..d66f769 --- /dev/null +++ b/ansible/hosts.ini @@ -0,0 +1,4 @@ +[thinkpad] +t460p ansible_host='localhost' ansible_connection='local' +idesk_minni ansible_host='localhost' ansible_connection='local' +l460 ansible_host='localhost' ansible_connection='local' diff --git a/files/admin_ssh_keys b/files/admin_ssh_keys index 6395142..0eb12de 160000 --- a/files/admin_ssh_keys +++ b/files/admin_ssh_keys @@ -1 +1 @@ -Subproject commit 63951429e0b64674f9fba3f4fa2d278b4a1391d5 +Subproject commit 0eb12deab6559ff2fe8c026cb3e1874b49dddedc diff --git a/group_vars/thinkpad.yml b/group_vars/thinkpad.yml index 17f4e93..6d326b9 100644 --- a/group_vars/thinkpad.yml +++ b/group_vars/thinkpad.yml @@ -1,5 +1,5 @@ --- -# flobal user config: +# local user config: user: l3d users: l3d: diff --git a/roles/firefox b/roles/firefox deleted file mode 160000 index f79d18e..0000000 --- a/roles/firefox +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f79d18e4790e7d7c3f530aeee992a4730bba4d17 diff --git a/setup_desk_minni.yml b/setup_desk_minni.yml new file mode 100644 index 0000000..ba4cfcc --- /dev/null +++ b/setup_desk_minni.yml @@ -0,0 +1,75 @@ +--- + +- name: Install useful packages + hosts: desk_minni + tags: + - packages + - updates + - setup + roles: + - workstation_packages + +- name: enable and secure sshd + hosts: desk_minni + tags: + - secure + - ssh + - setup + roles: + - authorized_keys + - sshd + +- name: Install useful dotfiles + hosts: desk_minni + tags: + - setup + roles: + - dotfiles + +- name: set akku warning + hosts: desk_minni + tags: + - setup + - akku + roles: + - akku-warning + +- name: install modules for sound and bluetooth + hosts: desk_minni + tags: + - setup + - pulseaudio + - networkmanager + roles: + - pulseaudio + - networkmanager + +- name: Install useful packages + hosts: desk_minni + tags: + - packages + - i3wm + roles: + - copy_files + - i3wm + - ntp + +- name: install nextcloud-client + hosts: desk_minni + tags: + - setup + - nextcloud + roles: + - nextcloud + +- name: install some arch fonts + hosts: desk_minni + tags: + - arch + - font + - fonts + - schrift + roles: + - arch-fonts + + diff --git a/setup.yml b/setup_l460.yml similarity index 85% rename from setup.yml rename to setup_l460.yml index 0089521..8244da1 100644 --- a/setup.yml +++ b/setup_l460.yml @@ -1,7 +1,7 @@ --- - name: Install useful packages - hosts: thinkpad + hosts: l460 tags: - packages - updates @@ -10,7 +10,7 @@ - workstation_packages - name: enable and secure sshd - hosts: thinkpad + hosts: l460 tags: - secure - ssh @@ -20,14 +20,14 @@ - sshd - name: Install useful dotfiles - hosts: thinkpad + hosts: l460 tags: - setup roles: - dotfiles - name: set akku warning - hosts: thinkpad + hosts: l460 tags: - setup - akku @@ -36,7 +36,7 @@ - name: install modules for sound and bluetooth - hosts: thinkpad + hosts: l460 tags: - setup - pulseaudio @@ -46,7 +46,7 @@ - networkmanager #- name: improve firefox configuration -# hosts: thinkpad +# hosts: l460 # tags: # - setup # - firefox @@ -55,7 +55,7 @@ - name: Install useful packages - hosts: thinkpad + hosts: l460 tags: - packages - i3wm @@ -65,7 +65,7 @@ - ntp - name: install nextcloud-client - hosts: thinkpad + hosts: l460 tags: - setup - nextcloud @@ -73,7 +73,7 @@ - nextcloud - name: install some arch fonts - hosts: thinkpad + hosts: l460 tags: - arch - font diff --git a/setup_t460p.yml b/setup_t460p.yml new file mode 100644 index 0000000..224502b --- /dev/null +++ b/setup_t460p.yml @@ -0,0 +1,85 @@ +--- + +- name: Install useful packages + hosts: t460p + tags: + - packages + - updates + - setup + roles: + - workstation_packages + +- name: enable and secure sshd + hosts: t460p + tags: + - secure + - ssh + - setup + roles: + - authorized_keys + - sshd + +- name: Install useful dotfiles + hosts: t460p + tags: + - setup + roles: + - dotfiles + +- name: set akku warning + hosts: t460p + tags: + - setup + - akku + roles: + - akku-warning + + +- name: install modules for sound and bluetooth + hosts: t460p + tags: + - setup + - pulseaudio + - networkmanager + roles: + - pulseaudio + - networkmanager + +#- name: improve firefox configuration +# hosts: t460p +# tags: +# - setup +# - firefox +# roles: +# - firefox + + +- name: Install useful packages + hosts: t460p + tags: + - packages + - i3wm + roles: + - copy_files + - i3wm + - ntp + +- name: install nextcloud-client + hosts: t460p + tags: + - setup + - nextcloud + roles: + - nextcloud + +- name: install some arch fonts + hosts: t460p + tags: + - arch + - font + - fonts + - schrift + roles: + - arch-fonts + +