From 2d55a67ad021d4cb708b5344669ff4098dc5a2f6 Mon Sep 17 00:00:00 2001 From: Bertrand Lanson Date: Mon, 5 Feb 2024 21:59:56 +0100 Subject: [PATCH] feat(core): change namespace, upgrade gh-actions --- .github/workflows/publish.yml | 4 +++- README.md | 6 ++--- meta/main.yml | 22 +++++++++---------- molecule/default/converge.yml | 4 ++-- molecule/default_vagrant/converge.yml | 4 ++-- molecule/with_extra_sidecars/converge.yml | 4 ++-- .../with_extra_sidecars_vagrant/converge.yml | 4 ++-- 7 files changed, 25 insertions(+), 23 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 784f2c9..70227de 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,6 +13,8 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Publish - uses: ednxzu/galaxy-import-role@v1 + uses: ednz_cloud/galaxy-import-role@v2 with: galaxy-api-key: ${{ secrets.GALAXY_API_TOKEN }} + repository-owner: ednz_cloud + repository-name: deploy_adguard diff --git a/README.md b/README.md index 0a3e359..230c55f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This role install and configure adguard, with optionally virtual IP, metrics, an Requirements ------------ -This role assumes you have `docker`, `docker-compose`, and eventually `consul` installed if using the consul integration. The role will not install these components, but you can install them using the [install_docker](https://github.com/ednxzu/install_docker) and [hashicorp_consul](https://github.com/ednxzu/hashicorp_consul) roles. +This role assumes you have `docker`, `docker-compose`, and eventually `consul` installed if using the consul integration. The role will not install these components, but you can install them using the [install_docker](https://github.com/ednz_cloud/install_docker) and [hashicorp_consul](https://github.com/ednz_cloud/hashicorp_consul) roles. Role Variables -------------- @@ -93,7 +93,7 @@ deploy_adguard_consul: # by default, set to the following connect: sidecar_service: {} ``` -This variable handles registering adguard as a [consul](https://developer.hashicorp.com/consul) service, for healthchecking and other features. Note that this role will not install consul, envoy, or any other binary necessary for this feature to work. You can check the [hashicorp_consul](https://github.com/ednxzu/hashicorp_consul) ansible role, to deploy a consul agent on the same node. +This variable handles registering adguard as a [consul](https://developer.hashicorp.com/consul) service, for healthchecking and other features. Note that this role will not install consul, envoy, or any other binary necessary for this feature to work. You can check the [hashicorp_consul](https://github.com/ednz_cloud/hashicorp_consul) ansible role, to deploy a consul agent on the same node. ```yaml deploy_adguard_config: {} # by default, set to {} @@ -112,7 +112,7 @@ Example Playbook # calling the role inside a playbook with either the default or group_vars/host_vars - hosts: servers roles: - - ednxzu.deploy_adguard + - ednz_cloud.deploy_adguard ``` License diff --git a/meta/main.yml b/meta/main.yml index 59044b4..57b49d3 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,12 +1,12 @@ --- # meta file for deploy_adguard galaxy_info: - namespace: 'ednxzu' - role_name: 'deploy_adguard' - author: 'Bertrand Lanson' - description: 'Install and configure adguard using docker for debian-based distros.' - license: 'license (BSD, MIT)' - min_ansible_version: '2.10' + namespace: "ednz_cloud" + role_name: "deploy_adguard" + author: "Bertrand Lanson" + description: "Install and configure adguard using docker on debian-based distributions" + license: "license (BSD, MIT)" + min_ansible_version: "2.10" platforms: - name: Ubuntu versions: @@ -17,10 +17,10 @@ galaxy_info: - bullseye - bookworm galaxy_tags: - - 'ubuntu' - - 'debian' - - 'adguard' - - 'adblock' - - 'docker' + - "ubuntu" + - "debian" + - "adguard" + - "adblock" + - "docker" dependencies: [] diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 9774fd3..2fa8338 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -3,6 +3,6 @@ hosts: all become: true tasks: - - name: "Include ednxzu.deploy_adguard" + - name: "Include ednz_cloud.deploy_adguard" ansible.builtin.include_role: - name: "ednxzu.deploy_adguard" + name: "ednz_cloud.deploy_adguard" diff --git a/molecule/default_vagrant/converge.yml b/molecule/default_vagrant/converge.yml index 9774fd3..2fa8338 100644 --- a/molecule/default_vagrant/converge.yml +++ b/molecule/default_vagrant/converge.yml @@ -3,6 +3,6 @@ hosts: all become: true tasks: - - name: "Include ednxzu.deploy_adguard" + - name: "Include ednz_cloud.deploy_adguard" ansible.builtin.include_role: - name: "ednxzu.deploy_adguard" + name: "ednz_cloud.deploy_adguard" diff --git a/molecule/with_extra_sidecars/converge.yml b/molecule/with_extra_sidecars/converge.yml index 9774fd3..2fa8338 100644 --- a/molecule/with_extra_sidecars/converge.yml +++ b/molecule/with_extra_sidecars/converge.yml @@ -3,6 +3,6 @@ hosts: all become: true tasks: - - name: "Include ednxzu.deploy_adguard" + - name: "Include ednz_cloud.deploy_adguard" ansible.builtin.include_role: - name: "ednxzu.deploy_adguard" + name: "ednz_cloud.deploy_adguard" diff --git a/molecule/with_extra_sidecars_vagrant/converge.yml b/molecule/with_extra_sidecars_vagrant/converge.yml index 9774fd3..2fa8338 100644 --- a/molecule/with_extra_sidecars_vagrant/converge.yml +++ b/molecule/with_extra_sidecars_vagrant/converge.yml @@ -3,6 +3,6 @@ hosts: all become: true tasks: - - name: "Include ednxzu.deploy_adguard" + - name: "Include ednz_cloud.deploy_adguard" ansible.builtin.include_role: - name: "ednxzu.deploy_adguard" + name: "ednz_cloud.deploy_adguard"