From 0fe6e9b42ff37a8ce15d33c2e511233f88e89e1c Mon Sep 17 00:00:00 2001 From: L3D Date: Fri, 14 Jul 2023 12:40:53 +0200 Subject: [PATCH 1/5] update gitmodules --- .gitmodules | 2 +- collections/ansible_collections/community/general | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index b01ccef..bf0e106 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,7 +16,7 @@ branch = main [submodule "files/admin_ssh_keys"] path = files/admin_ssh_keys - url = https://backwesen.de/ansible/ssh_public_keys.git + url = https://git.l3d.ch/ansible/ssh_public_keys.git branch = main [submodule "roles/sshd"] path = roles/do1jlr.sshd diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general index 3fd4cdb..4b382ed 160000 --- a/collections/ansible_collections/community/general +++ b/collections/ansible_collections/community/general @@ -1 +1 @@ -Subproject commit 3fd4cdb119b030004267478e0ff43e5da5eb079c +Subproject commit 4b382ed1df8d3e8f9add8cb474acb625321301b9 From e4bdc73c4c9116c06bdf9ca903654c72dab71044 Mon Sep 17 00:00:00 2001 From: L3D Date: Mon, 31 Jul 2023 23:12:00 +0200 Subject: [PATCH 2/5] New role l3d.packages --- .gitmodules | 7 +++---- collections/ansible_collections/community/general | 2 +- group_vars/all.yml | 7 +++++++ roles/do1jlr.base | 1 - roles/l3d.packages | 1 + site.yml | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) delete mode 160000 roles/do1jlr.base create mode 160000 roles/l3d.packages diff --git a/.gitmodules b/.gitmodules index bf0e106..996bf3a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -62,10 +62,6 @@ path = roles/ansible_version url = https://github.com/chaos-bodensee/role-ansible_version.git branch = main -[submodule "roles/base"] - path = roles/do1jlr.base - url = https://github.com/roles-ansible/ansible_role_base.git - branch = main [submodule "roles/amdgpu_firmware"] path = roles/amdgpu_firmware url = https://github.com/DO1JLR/ansible_role_amdgpu_firmware.git @@ -91,3 +87,6 @@ [submodule "collections/ansible_collections/l3d/avahi"] path = collections/ansible_collections/l3d/avahi url = https://github.com/roles-ansible/ansible_collection_avahi.git +[submodule "roles/l3d.packages"] + path = roles/l3d.packages + url = https://github.com/roles-ansible/ansible_role_packages.git diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general index 4b382ed..a942545 160000 --- a/collections/ansible_collections/community/general +++ b/collections/ansible_collections/community/general @@ -1 +1 @@ -Subproject commit 4b382ed1df8d3e8f9add8cb474acb625321301b9 +Subproject commit a942545dd2ec718993f95db35ac3e988d24e73a5 diff --git a/group_vars/all.yml b/group_vars/all.yml index 29d1e9d..635aa9c 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -70,5 +70,12 @@ i3_run_on_startup: htop__compile: true +# roles/do1jlr.base +l3d_pkgs__install_advanced: true +l3d_pkgs__install_python: true +l3d_pkgs__install_cli: true +l3d_pkgs__install_extra_packages: + - keychain + # globaly enably simple versionscheck - if available submodules_versioncheck: true diff --git a/roles/do1jlr.base b/roles/do1jlr.base deleted file mode 160000 index b0c817c..0000000 --- a/roles/do1jlr.base +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b0c817c68105a5e4ca12a695e18e117918ba8e42 diff --git a/roles/l3d.packages b/roles/l3d.packages new file mode 160000 index 0000000..aa14284 --- /dev/null +++ b/roles/l3d.packages @@ -0,0 +1 @@ +Subproject commit aa14284301b5a24cd4e0e1ed6ef95d62c7c567db diff --git a/site.yml b/site.yml index 3f5cfe5..dc9d7b6 100644 --- a/site.yml +++ b/site.yml @@ -7,7 +7,7 @@ - name: Generic Workstation Preperation hosts: all roles: - # - {role: do1jlr.base, tags: [default, packages, base]} + - {role: l3d.packages, tags: [packages, apt]} # - {role: workstation_packages, tags: [default, workstation_packages, packages, setup]} - {role: l3d.ntp, tags: ntp} - {role: l3d.avahi.client, tags: avahi} From 6aee36606e66e24825620039871bb3c96fc8c74e Mon Sep 17 00:00:00 2001 From: L3D Date: Mon, 31 Jul 2023 18:53:00 +0200 Subject: [PATCH 3/5] wrong indentation: expected 1 but found 2 --- group_vars/all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index 635aa9c..87c4fc0 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -75,7 +75,7 @@ l3d_pkgs__install_advanced: true l3d_pkgs__install_python: true l3d_pkgs__install_cli: true l3d_pkgs__install_extra_packages: - - keychain + - keychain # globaly enably simple versionscheck - if available submodules_versioncheck: true From 1441eb59f1aa053fd4e85ec8ffc1b72b68c8f408 Mon Sep 17 00:00:00 2001 From: L3D Date: Tue, 1 Aug 2023 18:59:41 +0200 Subject: [PATCH 4/5] Update i3wm --- group_vars/thinkpad.yml | 2 +- host_vars/daringdoo.local.yml | 7 +++++++ roles/do1jlr.i3wm | 2 +- roles/l3d.packages | 2 +- site.yml | 1 + 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 host_vars/daringdoo.local.yml diff --git a/group_vars/thinkpad.yml b/group_vars/thinkpad.yml index 9b50a45..9888c30 100644 --- a/group_vars/thinkpad.yml +++ b/group_vars/thinkpad.yml @@ -18,7 +18,7 @@ i3_packages_extra: - evince - speedtest-cli -i3_font_size: 11 +i3_font_size: 13 i3_focus_follows_mouse: true i3_desktop_background: "/home/{{ user }}/.config/background.png" diff --git a/host_vars/daringdoo.local.yml b/host_vars/daringdoo.local.yml new file mode 100644 index 0000000..703735c --- /dev/null +++ b/host_vars/daringdoo.local.yml @@ -0,0 +1,7 @@ +--- +# l3d.i3wm +i3wm_user_list: + - user: "l3d" + home: "/home/l3d" + - user: "lilian" + home: "/home/lilian" diff --git a/roles/do1jlr.i3wm b/roles/do1jlr.i3wm index b47b7e2..abf9460 160000 --- a/roles/do1jlr.i3wm +++ b/roles/do1jlr.i3wm @@ -1 +1 @@ -Subproject commit b47b7e2c416be05bbe0b33c099b529ebcb199f1f +Subproject commit abf94600b22977fcba30ac83f417bc5a2d22e8ff diff --git a/roles/l3d.packages b/roles/l3d.packages index aa14284..5666c1a 160000 --- a/roles/l3d.packages +++ b/roles/l3d.packages @@ -1 +1 @@ -Subproject commit aa14284301b5a24cd4e0e1ed6ef95d62c7c567db +Subproject commit 5666c1af2323de82ed17449953162d7727c696fe diff --git a/site.yml b/site.yml index dc9d7b6..deb40b8 100644 --- a/site.yml +++ b/site.yml @@ -14,6 +14,7 @@ - {role: l3d.avahi.daemon, tags: avahi} - {role: gantsign.bat, tags: bat} # - {role: arch-fonts, tags: [font, fonts, arch-fonts]} + - {role: do1jlr.i3wm, tags: i3wm} # - name: user specific setup # hosts: private From 7a5e60dcd1d2fa4db63b67af2afcf620ac018c41 Mon Sep 17 00:00:00 2001 From: L3D Date: Tue, 1 Aug 2023 19:07:39 +0200 Subject: [PATCH 5/5] dependabot and action cleanup --- .github/dependabot.yml | 9 +++++++++ .github/workflows/ansible-linting-check.yml | 14 +++++--------- .github/workflows/pylint.yml | 3 ++- .github/workflows/yamllint.yaml | 9 ++++----- 4 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..dde6f4a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,9 @@ +--- +# See https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml index 5ed3e8a..d304ab8 100644 --- a/.github/workflows/ansible-linting-check.yml +++ b/.github/workflows/ansible-linting-check.yml @@ -2,26 +2,22 @@ name: Ansible Lint check # yamllint disable-line rule:truthy -on: - push: - branches: '*' - pull_request: - branches: '*' +on: [push, pull_request] jobs: build: - + name: Ansible Lint runs-on: ubuntu-latest steps: - name: 'checkout git repo' - uses: actions/checkout@v3 + uses: actions/checkout@v3.5.3 with: lfs: true submodules: true fetch-depth: 0 - name: 'Lint Ansible Playbook' - uses: ansible/ansible-lint-action@v6 + uses: ansible/ansible-lint-action@v6.17.0 with: - path: "." + path: "site.yml" diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 876c6ad..e960e07 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -10,6 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout' - uses: actions/checkout@master + uses: actions/checkout@v3.5.3 + - name: GitHub Action for pylint uses: cclauss/GitHub-Action-for-pylint@0.7.0 diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml index c4894bd..b23bd13 100644 --- a/.github/workflows/yamllint.yaml +++ b/.github/workflows/yamllint.yaml @@ -9,12 +9,11 @@ jobs: name: 'Yamllint' runs-on: ubuntu-latest steps: - - name: 'Checkout' - uses: actions/checkout@master + - name: 'checkout git repo' + uses: actions/checkout@v3.5.3 + - name: 'Yamllint' - uses: karancode/yamllint-github-action@master + uses: karancode/yamllint-github-action@v2.1.1 with: yamllint_file_or_dir: '.' yamllint_config_filepath: './.yamllint' - yamllint_strict: false - yamllint_comment: true