From 1920783fdc4402bf7b88907af40841c963dedf99 Mon Sep 17 00:00:00 2001 From: L3D Date: Sat, 28 Feb 2026 01:42:29 +0100 Subject: [PATCH] Update uv and add avahi --- .gitmodules | 3 +++ collections/ansible_collections/l3d/avahi | 1 + collections/ansible_collections/l3d/voc | 2 +- group_vars/all/avahi.yml | 6 ++++++ group_vars/all/users.yml | 10 ++++++++++ pyproject.toml | 1 + site.yml | 8 ++++++++ uv.lock | 14 ++++++++++++++ 8 files changed, 44 insertions(+), 1 deletion(-) create mode 160000 collections/ansible_collections/l3d/avahi create mode 100644 group_vars/all/avahi.yml create mode 100644 group_vars/all/users.yml diff --git a/.gitmodules b/.gitmodules index da44b8f..cef0b3f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "collections/ansible_collections/ansible/posix"] path = collections/ansible_collections/ansible/posix url = https://github.com/ansible-collections/ansible.posix.git +[submodule "collections/ansible_collections/l3d/avahi"] + path = collections/ansible_collections/l3d/avahi + url = https://github.com/roles-ansible/ansible_collection_avahi.git diff --git a/collections/ansible_collections/l3d/avahi b/collections/ansible_collections/l3d/avahi new file mode 160000 index 0000000..841e95f --- /dev/null +++ b/collections/ansible_collections/l3d/avahi @@ -0,0 +1 @@ +Subproject commit 841e95f18ae9eb16637cb7981434e3382f38ccb6 diff --git a/collections/ansible_collections/l3d/voc b/collections/ansible_collections/l3d/voc index 1e90249..21a036f 160000 --- a/collections/ansible_collections/l3d/voc +++ b/collections/ansible_collections/l3d/voc @@ -1 +1 @@ -Subproject commit 1e902495c4cb60bc575ad334430540387a1df4f6 +Subproject commit 21a036f03757f9af3961441943eb54d857508b9c diff --git a/group_vars/all/avahi.yml b/group_vars/all/avahi.yml new file mode 100644 index 0000000..b425c6e --- /dev/null +++ b/group_vars/all/avahi.yml @@ -0,0 +1,6 @@ +--- +avahi_daemon__services: + - service: 'SSH' + port: 22 + protocol: 'any' + transport: 'tcp' diff --git a/group_vars/all/users.yml b/group_vars/all/users.yml new file mode 100644 index 0000000..535a075 --- /dev/null +++ b/group_vars/all/users.yml @@ -0,0 +1,10 @@ +--- +users__voc_users: + - name: l3d + state: 'present' + admin: true + password: '' + pubkeys: | + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPvvXN33GwkTF4ZOwPgF21Un4R2z9hWUuQt1qIfzQyhC + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAG65EdcM+JLv0gnzT9LcqVU47Pkw0SqiIg7XipXENi8 + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJz7zEvUVgJJJsIgfG3izsqYcM22IaKz4jGVUbNRL2PX diff --git a/pyproject.toml b/pyproject.toml index 6c6081d..f022b6a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,6 +5,7 @@ description = "Add your description here" readme = "README.md" requires-python = ">=3.12" dependencies = [ + "ansible>=13.4.0", "ansible-core>=2.20.2", "ansible-lint>=26.1.1", "yamllint>=1.38.0", diff --git a/site.yml b/site.yml index a7b8c43..1343d04 100644 --- a/site.yml +++ b/site.yml @@ -3,3 +3,11 @@ hosts: localhost roles: - {role: do1jlr.ansible_version, tags: [version, always]} + +- name: Setup obs + hosts: obs + roles: + - {role: l3d.voc.users, tags: [user]} + - {role: l3d.voc.dotfiles, tags: [user]} + - {role: l3d.avahi.client, tags: [avahi]} + - {role: l3d.avahi.daemon, tags: [avahi]} diff --git a/uv.lock b/uv.lock index f129907..a4119f2 100644 --- a/uv.lock +++ b/uv.lock @@ -6,6 +6,18 @@ resolution-markers = [ "python_full_version < '3.14'", ] +[[package]] +name = "ansible" +version = "13.4.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "ansible-core" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/e9/46/4f064be3a13f1239f259b3e6ebe94d52d609aac430eeaa6a0b36a5ca071d/ansible-13.4.0.tar.gz", hash = "sha256:6d741511abc1f724443aa16992fb615cc822a22da427ade925ff937ccd691eb1", size = 52775271, upload-time = "2026-02-24T17:37:24.69Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/96/62/3dff5689b6a6eb8d25d987507ab87660b76b0d87e152caf64ec045edac64/ansible-13.4.0-py3-none-any.whl", hash = "sha256:8c869fcc07954b53c5b125f1e914957cc7b541a92a7d512496207d80385a78eb", size = 55274148, upload-time = "2026-02-24T17:37:19.4Z" }, +] + [[package]] name = "ansible-compat" version = "25.12.1" @@ -71,6 +83,7 @@ name = "arch-obs-setup" version = "0.1.0" source = { virtual = "." } dependencies = [ + { name = "ansible" }, { name = "ansible-core" }, { name = "ansible-lint" }, { name = "yamllint" }, @@ -78,6 +91,7 @@ dependencies = [ [package.metadata] requires-dist = [ + { name = "ansible", specifier = ">=13.4.0" }, { name = "ansible-core", specifier = ">=2.20.2" }, { name = "ansible-lint", specifier = ">=26.1.1" }, { name = "yamllint", specifier = ">=1.38.0" },