From ed54c4c9499e2b5d45427f6cd2978de2b3bd9784 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 21 Aug 2023 02:05:00 +0200 Subject: add input variables to role's defaults/ --- roles/apt_repo/defaults/main.yml | 7 +++++-- roles/apt_repo/tasks/main.yml | 6 +++--- roles/digitalocean_volume/defaults/main.yml | 2 ++ roles/letsencrypt/defaults/main.yml | 2 ++ roles/my_workspace/defaults/main.yml | 1 + roles/ppa/defaults/main.yml | 4 ++++ roles/systemd_edit/defaults/main.yml | 4 ++++ roles/systemd_requires_mounts_for/defaults/main.yml | 1 + roles/wireguard/defaults/main.yml | 4 ++++ 9 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 roles/ppa/defaults/main.yml create mode 100644 roles/systemd_edit/defaults/main.yml create mode 100644 roles/systemd_requires_mounts_for/defaults/main.yml diff --git a/roles/apt_repo/defaults/main.yml b/roles/apt_repo/defaults/main.yml index f4755e5..51847eb 100644 --- a/roles/apt_repo/defaults/main.yml +++ b/roles/apt_repo/defaults/main.yml @@ -1,4 +1,7 @@ -apt_repo_keys_dir: /etc/apt/keyrings +#apt_repo_name: +#apt_repo_key_url: apt_repo_key_dearmor: false - +#apt_repo_distro: apt_repo_component: main + +apt_repo_keys_dir: /etc/apt/keyrings diff --git a/roles/apt_repo/tasks/main.yml b/roles/apt_repo/tasks/main.yml index bf9e3ea..f382f6a 100644 --- a/roles/apt_repo/tasks/main.yml +++ b/roles/apt_repo/tasks/main.yml @@ -5,7 +5,7 @@ # running `gpg --dearmor`, you must save it with the .gpg extension # instead of .asc. You can then completely skip the gpg step. Source: # https://stackoverflow.com/q/71585303/514684 - apt_repo_key_path: '{{ apt_repo_keys_dir }}/{{ apt_repo_name }}{{ apt_repo_key_dearmor | ternary(".gpg", ".asc") }}' + key_path: '{{ apt_repo_keys_dir }}/{{ apt_repo_name }}{{ apt_repo_key_dearmor | ternary(".gpg", ".asc") }}' block: - name: Create keys directory ansible.builtin.file: @@ -16,7 +16,7 @@ - name: 'Add key: {{ apt_repo_name }}' ansible.builtin.get_url: url: '{{ apt_repo_key_url }}' - dest: '{{ apt_repo_key_path }}' + dest: '{{ key_path }}' mode: '644' - name: Get host distro @@ -25,7 +25,7 @@ - name: 'Add repository: {{ apt_repo_name }}' ansible.builtin.apt_repository: - repo: 'deb [signed-by={{ apt_repo_key_path }}] {{ apt_repo_url }} {{ distro }} {{ apt_repo_component }}' + repo: 'deb [signed-by={{ key_path }}] {{ apt_repo_url }} {{ distro }} {{ apt_repo_component }}' filename: '{{ apt_repo_name }}' vars: distro: '{{ apt_repo_distro | default(ansible_distribution_release) }}' diff --git a/roles/digitalocean_volume/defaults/main.yml b/roles/digitalocean_volume/defaults/main.yml index dceb85d..ebacd1d 100644 --- a/roles/digitalocean_volume/defaults/main.yml +++ b/roles/digitalocean_volume/defaults/main.yml @@ -1 +1,3 @@ +#volume_name: +#volume_dir: volume_fs: ext4 diff --git a/roles/letsencrypt/defaults/main.yml b/roles/letsencrypt/defaults/main.yml index e555534..51ef3c6 100644 --- a/roles/letsencrypt/defaults/main.yml +++ b/roles/letsencrypt/defaults/main.yml @@ -1,2 +1,4 @@ +letsencrypt_domains: [] + certbot_email: Egor.Tensin@gmail.com certbot_ini: /root/.certbot.ini diff --git a/roles/my_workspace/defaults/main.yml b/roles/my_workspace/defaults/main.yml index b517f2c..3b49b29 100644 --- a/roles/my_workspace/defaults/main.yml +++ b/roles/my_workspace/defaults/main.yml @@ -2,3 +2,4 @@ git_name: Egor Tensin git_email: Egor.Tensin@gmail.com workspace_dir: /srv/workspace +workspace_projects: [] diff --git a/roles/ppa/defaults/main.yml b/roles/ppa/defaults/main.yml new file mode 100644 index 0000000..c5b9e09 --- /dev/null +++ b/roles/ppa/defaults/main.yml @@ -0,0 +1,4 @@ +#ppa_name: +#ppa_key: +#ppa_owner: +#ppa_distro: diff --git a/roles/systemd_edit/defaults/main.yml b/roles/systemd_edit/defaults/main.yml new file mode 100644 index 0000000..ced03e5 --- /dev/null +++ b/roles/systemd_edit/defaults/main.yml @@ -0,0 +1,4 @@ +#service_name: +#service_section: +#service_option: +#service_values: diff --git a/roles/systemd_requires_mounts_for/defaults/main.yml b/roles/systemd_requires_mounts_for/defaults/main.yml new file mode 100644 index 0000000..6ae56f1 --- /dev/null +++ b/roles/systemd_requires_mounts_for/defaults/main.yml @@ -0,0 +1 @@ +#mount_dir: diff --git a/roles/wireguard/defaults/main.yml b/roles/wireguard/defaults/main.yml index 9f7733a..b351a4b 100644 --- a/roles/wireguard/defaults/main.yml +++ b/roles/wireguard/defaults/main.yml @@ -1,3 +1,7 @@ wg_name: wg0 wg_listen_port: 51280 +#wg_private_key: +#wg_addr4: +#wg_addr6: +#wg_peers: wg_firewall: false -- cgit v1.2.3