refactor(luks): use system_cfg.luks directly across roles
This commit is contained in:
@@ -1,21 +1,4 @@
|
||||
---
|
||||
partitioning_luks_enabled: "{{ system_cfg.luks.enabled | bool }}"
|
||||
partitioning_luks_passphrase: "{{ system_cfg.luks.passphrase }}"
|
||||
partitioning_luks_mapper_name: "{{ system_cfg.luks.mapper }}"
|
||||
partitioning_luks_type: "{{ system_cfg.luks.type }}"
|
||||
partitioning_luks_cipher: "{{ system_cfg.luks.cipher }}"
|
||||
partitioning_luks_hash: "{{ system_cfg.luks.hash }}"
|
||||
partitioning_luks_iter_time: "{{ system_cfg.luks.iter }}"
|
||||
partitioning_luks_key_size: "{{ system_cfg.luks.bits }}"
|
||||
partitioning_luks_pbkdf: "{{ system_cfg.luks.pbkdf }}"
|
||||
partitioning_luks_use_urandom: "{{ system_cfg.luks.urandom | bool }}"
|
||||
partitioning_luks_verify_passphrase: "{{ system_cfg.luks.verify | bool }}"
|
||||
partitioning_luks_auto_decrypt: "{{ system_cfg.luks.auto | bool }}"
|
||||
partitioning_luks_auto_decrypt_method: "{{ system_cfg.luks.method }}"
|
||||
partitioning_luks_tpm2_device: "{{ system_cfg.luks.tpm2.device }}"
|
||||
partitioning_luks_tpm2_pcrs: "{{ system_cfg.luks.tpm2.pcrs }}"
|
||||
partitioning_luks_keyfile_size: "{{ system_cfg.luks.keysize }}"
|
||||
partitioning_luks_options: "{{ system_cfg.luks.options }}"
|
||||
partitioning_btrfs_compress_opt: "{{ 'compress=zstd:15' if system_cfg.features.zstd.enabled | bool else '' }}"
|
||||
partitioning_boot_partition_suffix: 1
|
||||
partitioning_main_partition_suffix: 2
|
||||
@@ -26,7 +9,7 @@ partitioning_boot_size_mib: 1024
|
||||
partitioning_use_full_disk: true
|
||||
partitioning_separate_boot: >-
|
||||
{{
|
||||
(partitioning_luks_enabled | bool)
|
||||
(system_cfg.luks.enabled | bool)
|
||||
and (os | lower not in ['archlinux'])
|
||||
}}
|
||||
partitioning_boot_fs_fstype: >-
|
||||
@@ -103,15 +86,15 @@ partitioning_layout: >-
|
||||
}}
|
||||
partitioning_grub_enable_cryptodisk: >-
|
||||
{{
|
||||
(partitioning_luks_enabled | bool)
|
||||
(system_cfg.luks.enabled | bool)
|
||||
and not (partitioning_separate_boot | bool)
|
||||
and (partitioning_efi_mountpoint == '/boot/efi')
|
||||
}}
|
||||
partitioning_luks_device: "{{ install_drive ~ (partitioning_root_partition_suffix | string) }}"
|
||||
partitioning_root_device: >-
|
||||
{{
|
||||
'/dev/mapper/' + partitioning_luks_mapper_name
|
||||
if (partitioning_luks_enabled | bool)
|
||||
'/dev/mapper/' + system_cfg.luks.mapper
|
||||
if (system_cfg.luks.enabled | bool)
|
||||
else install_drive ~ (partitioning_root_partition_suffix | string)
|
||||
}}
|
||||
partitioning_disk_size_gb: >-
|
||||
|
||||
Reference in New Issue
Block a user