From 0ea59b67b00d61547a1549beff3339b22bcf1c1f Mon Sep 17 00:00:00 2001 From: "flyingscorpio@clevo" Date: Mon, 4 Dec 2023 12:00:03 +0100 Subject: [PATCH] Fix inclusion of vault variables that are now defaults --- roles/deploy_certificate/defaults/{main.yml => main/plain.yml} | 0 roles/deploy_certificate/defaults/{ => main}/vault.yml | 0 roles/deploy_certificate/tasks/main.yml | 3 --- roles/deux_puissance_x/defaults/{main.yml => main/plain.yml} | 0 roles/deux_puissance_x/defaults/{ => main}/vault.yml | 0 roles/deux_puissance_x/tasks/mariadb.yml | 3 --- roles/forgejo/defaults/{main.yml => main/plain.yml} | 0 roles/forgejo/defaults/{ => main}/vault.yml | 0 roles/forgejo/tasks/main.yml | 3 --- roles/tunuifranken/defaults/{main.yml => main/plain.yml} | 0 roles/tunuifranken/defaults/{ => main}/vault.yml | 0 roles/tunuifranken/tasks/main.yml | 3 --- 12 files changed, 12 deletions(-) rename roles/deploy_certificate/defaults/{main.yml => main/plain.yml} (100%) rename roles/deploy_certificate/defaults/{ => main}/vault.yml (100%) rename roles/deux_puissance_x/defaults/{main.yml => main/plain.yml} (100%) rename roles/deux_puissance_x/defaults/{ => main}/vault.yml (100%) rename roles/forgejo/defaults/{main.yml => main/plain.yml} (100%) rename roles/forgejo/defaults/{ => main}/vault.yml (100%) rename roles/tunuifranken/defaults/{main.yml => main/plain.yml} (100%) rename roles/tunuifranken/defaults/{ => main}/vault.yml (100%) diff --git a/roles/deploy_certificate/defaults/main.yml b/roles/deploy_certificate/defaults/main/plain.yml similarity index 100% rename from roles/deploy_certificate/defaults/main.yml rename to roles/deploy_certificate/defaults/main/plain.yml diff --git a/roles/deploy_certificate/defaults/vault.yml b/roles/deploy_certificate/defaults/main/vault.yml similarity index 100% rename from roles/deploy_certificate/defaults/vault.yml rename to roles/deploy_certificate/defaults/main/vault.yml diff --git a/roles/deploy_certificate/tasks/main.yml b/roles/deploy_certificate/tasks/main.yml index 8e2cc14..02c1242 100644 --- a/roles/deploy_certificate/tasks/main.yml +++ b/roles/deploy_certificate/tasks/main.yml @@ -1,7 +1,4 @@ --- -- name: Include vault variables - ansible.builtin.include_vars: vault.yml - - name: Install needed packages become: true ansible.builtin.apt: diff --git a/roles/deux_puissance_x/defaults/main.yml b/roles/deux_puissance_x/defaults/main/plain.yml similarity index 100% rename from roles/deux_puissance_x/defaults/main.yml rename to roles/deux_puissance_x/defaults/main/plain.yml diff --git a/roles/deux_puissance_x/defaults/vault.yml b/roles/deux_puissance_x/defaults/main/vault.yml similarity index 100% rename from roles/deux_puissance_x/defaults/vault.yml rename to roles/deux_puissance_x/defaults/main/vault.yml diff --git a/roles/deux_puissance_x/tasks/mariadb.yml b/roles/deux_puissance_x/tasks/mariadb.yml index c64b0be..5fa2d0d 100644 --- a/roles/deux_puissance_x/tasks/mariadb.yml +++ b/roles/deux_puissance_x/tasks/mariadb.yml @@ -1,7 +1,4 @@ --- -- name: Include vault variables - ansible.builtin.include_vars: vault.yml - - name: Create 2px database become: true community.mysql.mysql_db: diff --git a/roles/forgejo/defaults/main.yml b/roles/forgejo/defaults/main/plain.yml similarity index 100% rename from roles/forgejo/defaults/main.yml rename to roles/forgejo/defaults/main/plain.yml diff --git a/roles/forgejo/defaults/vault.yml b/roles/forgejo/defaults/main/vault.yml similarity index 100% rename from roles/forgejo/defaults/vault.yml rename to roles/forgejo/defaults/main/vault.yml diff --git a/roles/forgejo/tasks/main.yml b/roles/forgejo/tasks/main.yml index 927cf3f..f523c04 100644 --- a/roles/forgejo/tasks/main.yml +++ b/roles/forgejo/tasks/main.yml @@ -1,7 +1,4 @@ --- -- name: Include vault variables - ansible.builtin.include_vars: vault.yml - - name: Deploy letsencrypt certificate ansible.builtin.include_role: name: deploy_certificate diff --git a/roles/tunuifranken/defaults/main.yml b/roles/tunuifranken/defaults/main/plain.yml similarity index 100% rename from roles/tunuifranken/defaults/main.yml rename to roles/tunuifranken/defaults/main/plain.yml diff --git a/roles/tunuifranken/defaults/vault.yml b/roles/tunuifranken/defaults/main/vault.yml similarity index 100% rename from roles/tunuifranken/defaults/vault.yml rename to roles/tunuifranken/defaults/main/vault.yml diff --git a/roles/tunuifranken/tasks/main.yml b/roles/tunuifranken/tasks/main.yml index db2a8ca..7197209 100644 --- a/roles/tunuifranken/tasks/main.yml +++ b/roles/tunuifranken/tasks/main.yml @@ -1,7 +1,4 @@ --- -- name: Include vault variables - ansible.builtin.include_vars: vault.yml - - name: Deploy letsencrypt certificate ansible.builtin.include_role: name: deploy_certificate