diff --git a/playbooks/setupworkstation/main.yaml b/playbooks/setupworkstation/main.yaml index 79ec677..0f0debf 100644 --- a/playbooks/setupworkstation/main.yaml +++ b/playbooks/setupworkstation/main.yaml @@ -158,33 +158,19 @@ name: myself gid: 690 system: true - - name: create group rootlessmen - become: true - group: - name: rootlessmen - system: true - name: create users - become: true - with_items: + loop: - name: kevins uid: 6901 - groups: ["myself", "rootlessmen"] + groups: ["myself"] - name: kevinsamuel uid: 6902 - groups: myself + groups: ["myself"] - name: kevinnlsamuel uid: 6903 - groups: ["myself", "rootlessmen"] - user: - state: present - name: "{{ item.name }}" - uid: "{{ item.uid }}" - groups: "{{ item.groups }}" - skeleton: /dev/null - append: true - password: $1$aBLdYKQI$iB3ZfYF.QPCwVhgnkROUX. - update_password: on_create - shell: /bin/zsh + groups: ["myself"] + ansible.builtin.include_role: + role: createworkstationuser - name: use crun as podman engine become: true @@ -203,15 +189,7 @@ path: "{{file}}" line: 'runtime = "/usr/bin/runc"' search_string: 'runtime = ' - - name: create storage for rootlessmen - become: true - file: - path: /var/lib/rootlessmen - owner: root - group: rootlessmen - mode: "0770" - state: directory - - name: setup podman to use rootlessmen for storage + - name: setup podman btrfs storage become: true vars: file: /etc/containers/storage.conf @@ -225,27 +203,11 @@ path: "{{file}}" line: "[storage]" insertbefore: BOF - - name: setup storage config to use rootlessmen - with_items: - - line: 'driver_priority = ["btrfs", "overlay", "vfs"]' - search_string: 'driver_priority = ' - - line: 'rootless_storage_path = "/var/lib/rootlessmen/$USER/storage"' - search_string: 'rootless_storage_path = ' + - name: set podman storage config to btrfs lineinfile: path: "{{file}}" - line: "{{item.line}}" - search_string: "{{item.search_string}}" - - name: set selinux fcontext for rootlessmen - become: true - with_items: - - pathspec: /var/lib/rootlessmen/[^/]+/storage/artifacts(/.*)? - type: container_ro_file_t - - pathspec: /var/lib/rootlessmen/[^/]+/storage/volumes/[^/]*/.* - type: container_file_t - sefcontext: - target: "{{item.pathspec}}" - setype: "{{item.type}}" - seuser: unconfined_u + line: 'driver_priority = ["btrfs", "overlay", "vfs"]' + search_string: 'driver_priority = ' - name: enable tpm-tss in dracut become: true diff --git a/roles/createworkstationuser/meta/main.yml b/roles/createworkstationuser/meta/main.yml new file mode 100644 index 0000000..9f28352 --- /dev/null +++ b/roles/createworkstationuser/meta/main.yml @@ -0,0 +1,6 @@ +galaxy_info: + author: kevinnlsamuel + description: sayin hello +dependencies: + # List your role dependencies here, one per line. Be sure to remove the '[]' above, + # if you add dependencies to this list. diff --git a/roles/createworkstationuser/tasks/main.yml b/roles/createworkstationuser/tasks/main.yml new file mode 100644 index 0000000..4eb3cce --- /dev/null +++ b/roles/createworkstationuser/tasks/main.yml @@ -0,0 +1,18 @@ +- become: true + user: + state: present + name: "{{ item.name }}" + uid: "{{ item.uid }}" + groups: "{{ item.groups }}" + skeleton: /dev/null + append: true + password: $1$aBLdYKQI$iB3ZfYF.QPCwVhgnkROUX. + update_password: on_create + shell: /bin/zsh +- name: "create subv for containers" + ansible.builtin.include_role: + role: createbtrfssubv + apply: + vars: + path: "/home/{{ item.name }}/.local/share/containers" + owner: "{{ item.name }}"