diff --git a/roles/configuration/tasks/main.yml b/roles/configuration/tasks/main.yml index b8eb841..d4c066b 100644 --- a/roles/configuration/tasks/main.yml +++ b/roles/configuration/tasks/main.yml @@ -101,7 +101,7 @@ - name: Append lines to vimrc ignore_errors: true lineinfile: - path: "{{ '/mnt/etc/vim/vimrc' if os|lower in ['debian11' ,'debian12', 'ubuntu', 'ubuntu-lts'] else '/mnt/etc/vimrc' }}" + path: "{{ '/mnt/etc/vim/vimrc' if os | lower in ['debian11', 'debian12', 'ubuntu', 'ubuntu-lts'] else '/mnt/etc/vimrc' }}" line: "{{ item }}" insertafter: EOF with_items: @@ -144,7 +144,7 @@ - name: Create user account command: '{{ item }}' with_items: - - arch-chroot /mnt /usr/sbin/useradd --create-home --user-group --groups {{ "sudo" if os|lower in ["debian11", "debian12", "ubuntu", "ubuntu-lts"] else "wheel" }} {{ user_name }} --password {{ user_password | password_hash('sha512') }} --shell /bin/bash + - arch-chroot /mnt /usr/sbin/useradd --create-home --user-group --groups {{ "sudo" if os | lower in ["debian11", "debian12", "ubuntu", "ubuntu-lts"] else "wheel" }} {{ user_name }} --password {{ user_password | password_hash('sha512') }} --shell /bin/bash - arch-chroot /mnt /usr/sbin/usermod --password '{{ root_password | password_hash('sha512') }}' root --shell /bin/bash - name: Add SSH public key to authorized_keys @@ -159,7 +159,7 @@ - name: Give sudo access to wheel group copy: - content: "{{ '%sudo ALL=(ALL) ALL' if os|lower in ['debian11', 'debian12', 'ubuntu', 'ubuntu-lts'] else '%wheel ALL=(ALL) ALL' }}" + content: "{{ '%sudo ALL=(ALL) ALL' if os | lower in ['debian11', 'debian12', 'ubuntu', 'ubuntu-lts'] else '%wheel ALL=(ALL) ALL' }}" dest: /mnt/etc/sudoers.d/01-wheel mode: 0440 validate: /usr/sbin/visudo --check --file=%s @@ -175,4 +175,4 @@ lineinfile: path: /mnt/etc/selinux/config regexp: '^SELINUX=' - line: 'SELINUX=permissive' \ No newline at end of file + line: 'SELINUX=permissive' diff --git a/roles/partitioning/tasks/main.yml b/roles/partitioning/tasks/main.yml index 8c5a125..274b487 100644 --- a/roles/partitioning/tasks/main.yml +++ b/roles/partitioning/tasks/main.yml @@ -96,7 +96,7 @@ mount: path: "/mnt{{ item.path }}" src: "{{ 'UUID=' + (main_uuid.stdout if filesystem == 'btrfs' else item.uuid) }}" - fstype: "{{ filesystem }}" + fstype: "{{ filesystem }}" opts: "{{ item.opts }}" state: mounted loop: @@ -122,4 +122,4 @@ path: "{{ '/mnt/boot/efi' if os | lower in ['ubuntu', 'ubuntu-lts'] else '/mnt/boot' }}" src: UUID={{ boot_uuid.stdout }} fstype: vfat - state: mounted \ No newline at end of file + state: mounted