From 6523ec202eae918cf0df6022fee1107a7c8736d2 Mon Sep 17 00:00:00 2001 From: SebClem Date: Sat, 15 Apr 2023 13:32:32 +0200 Subject: [PATCH] Move to new secret --- .gitea/template | 2 +- .../group_vars/{nodes.yml => all/vars.yml} | 0 .../{hostname.yml => victoria.home/vars.yml} | 0 inventories/hosts.yml | 6 ++---- inventories/secrets/hostname.yml | 17 ----------------- playbooks/install.yml | 7 ------- 6 files changed, 3 insertions(+), 29 deletions(-) rename inventories/group_vars/{nodes.yml => all/vars.yml} (100%) rename inventories/host_vars/{hostname.yml => victoria.home/vars.yml} (100%) delete mode 100644 inventories/secrets/hostname.yml diff --git a/.gitea/template b/.gitea/template index 595ce89..16976da 100644 --- a/.gitea/template +++ b/.gitea/template @@ -1,2 +1,2 @@ README.md -sites.yml \ No newline at end of file +playbooks/install.yml \ No newline at end of file diff --git a/inventories/group_vars/nodes.yml b/inventories/group_vars/all/vars.yml similarity index 100% rename from inventories/group_vars/nodes.yml rename to inventories/group_vars/all/vars.yml diff --git a/inventories/host_vars/hostname.yml b/inventories/host_vars/victoria.home/vars.yml similarity index 100% rename from inventories/host_vars/hostname.yml rename to inventories/host_vars/victoria.home/vars.yml diff --git a/inventories/hosts.yml b/inventories/hosts.yml index f31bbf5..5722552 100644 --- a/inventories/hosts.yml +++ b/inventories/hosts.yml @@ -1,6 +1,4 @@ --- all: - children: - nodes: - hosts: - victoria.home: + hosts: + victoria.home: diff --git a/inventories/secrets/hostname.yml b/inventories/secrets/hostname.yml deleted file mode 100644 index 45c35bb..0000000 --- a/inventories/secrets/hostname.yml +++ /dev/null @@ -1,17 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["config:base"], - "ignorePresets": [":prHourlyLimit2"], - "commitMessagePrefix": ":arrow_up:", - "regexManagers": - [ - { - "fileMatch": ["group_vars\\/.*\\.yml", "host_vars\\/.*\\.yml"], - "matchStrings": - [ - "datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?\\s.*?_version: \"(?.*)\"\\s", - ], - "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}", - }, - ], -} diff --git a/playbooks/install.yml b/playbooks/install.yml index 6e1070d..e14be79 100644 --- a/playbooks/install.yml +++ b/playbooks/install.yml @@ -2,11 +2,4 @@ - name: ${REPO_NAME_TITLE} hosts: nodes - pre_tasks: - - name: Load secrets - ansible.builtin.include_vars: - file: "{{ inventory_dir }}/secrets/{{ inventory_hostname }}.yml" - tags: - - always - roles: []