From 986e7aed7f95f0b50672f9724c94bb5c6944e941 Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 29 Aug 2024 16:32:04 +0200 Subject: [PATCH] Update to latest version --- .gitmodules | 3 ++ README.md | 31 +++++++++++++++++++ .../ansible_collections/community/general | 2 +- collections/ansible_collections/l3d/users | 2 +- collections/ansible_collections/l3d/wm | 2 +- group_vars/all.yml | 9 +++--- inventory.py | 2 +- roles/hax0rbana_adam.librewolf | 1 + roles/l3d.etesync_dav | 2 +- roles/l3d.packages | 2 +- site.yml | 1 + 11 files changed, 46 insertions(+), 11 deletions(-) create mode 160000 roles/hax0rbana_adam.librewolf diff --git a/.gitmodules b/.gitmodules index 6529427..2187d6f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,3 +73,6 @@ [submodule "roles/roles-ansible.gopass"] path = roles/roles-ansible.gopass url = https://github.com/roles-ansible/ansible_role_gopass.git +[submodule "roles/hax0rbana_adam.librewolf"] + path = roles/hax0rbana_adam.librewolf + url = https://gitlab.hax0rbana.org/public-repos/ansible/librewolf.git diff --git a/README.md b/README.md index 45b358b..9af1f28 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,37 @@ To use this by yourself copy or change a existing playbook and modify the variab Or create a new git repo and be inspired by the roles L3D uses. + Add a New Device +------------------ +1. After you installed the OS and cloned this git repo with all sumodules, you have to change the inventory.py script. +* Make sure you changed the ``INIT_HOST`` boolean variable to just install gopass. +* After running the playbook create a gopass and set a few passwords +* Add new device to ``env_dict`` and restore the ``INIT_HOST`` value +* Run ansible + + Used Gopass Variables +----------------------- +For ``work`` devices: +```ini +private/ansible/hosts//users/ +├── l3d/ +│ ├── pwd +│ └── pwd_hash +├── lilian/ +│ ├── pwd +│ └── pwd_hash +└── root +``` + +For ``private`` devices: +```ini +ansible/hosts//users/ +├── l3d/ +│ ├── pwd +│ └── pwd_hash +└── root +``` + Feedback ------------ If you find this usefull please take a few secounds and say thankyou to L3D. diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general index 37c8560..96d5e6e 160000 --- a/collections/ansible_collections/community/general +++ b/collections/ansible_collections/community/general @@ -1 +1 @@ -Subproject commit 37c8560542f4dd52fe695d23ebc043e52c6a6b8c +Subproject commit 96d5e6e50e972ae1bfc61cf1fb71c0738230c213 diff --git a/collections/ansible_collections/l3d/users b/collections/ansible_collections/l3d/users index 184a808..b750665 160000 --- a/collections/ansible_collections/l3d/users +++ b/collections/ansible_collections/l3d/users @@ -1 +1 @@ -Subproject commit 184a80834808af18d6ee25131708bbbc3e0edf3c +Subproject commit b750665aae34884114b00faa149612aa78f93c53 diff --git a/collections/ansible_collections/l3d/wm b/collections/ansible_collections/l3d/wm index 71e2d93..7a230b7 160000 --- a/collections/ansible_collections/l3d/wm +++ b/collections/ansible_collections/l3d/wm @@ -1 +1 @@ -Subproject commit 71e2d93e7c1a5a1a19222315a6840d71f44d992a +Subproject commit 7a230b71aad5e27da171bb160a7516977be97184 diff --git a/group_vars/all.yml b/group_vars/all.yml index 59db3ab..301b843 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -85,11 +85,10 @@ i3_run_on_startup: - nm-applet # roles/do1jlr.base -l3d_pkgs__install_advanced: true -l3d_pkgs__install_python: true -l3d_pkgs__install_cli: true -l3d_pkgs__install_extra_packages: - - keychain +packages__install_advanced: true +packages__install_python: true +packages__install_cli: true +packages__install_desktop: true # globaly enably simple versionscheck - if available submodules_versioncheck: true diff --git a/inventory.py b/inventory.py index f09b2d0..bce317a 100755 --- a/inventory.py +++ b/inventory.py @@ -12,7 +12,7 @@ INIT_HOST=False # create a dict to match hostnames to enviroments env_dict = { 'work': - [], + ['macbook.local'], 'private': ['derpy.local', 'applejack.local', 'rarity.local', 'discord.local'] } diff --git a/roles/hax0rbana_adam.librewolf b/roles/hax0rbana_adam.librewolf new file mode 160000 index 0000000..df230cb --- /dev/null +++ b/roles/hax0rbana_adam.librewolf @@ -0,0 +1 @@ +Subproject commit df230cb887e3ecbf25dcbfa3dbc3409af3446ab1 diff --git a/roles/l3d.etesync_dav b/roles/l3d.etesync_dav index 5059bd9..7124ef6 160000 --- a/roles/l3d.etesync_dav +++ b/roles/l3d.etesync_dav @@ -1 +1 @@ -Subproject commit 5059bd985a4a410b49bd3f2baf35679e779d6fdf +Subproject commit 7124ef6103f7e4e9a6ad4a6eeebe53f29ee54c0b diff --git a/roles/l3d.packages b/roles/l3d.packages index d35207a..7694165 160000 --- a/roles/l3d.packages +++ b/roles/l3d.packages @@ -1 +1 @@ -Subproject commit d35207a72a336f41bfce5af1ced1085bce993ee5 +Subproject commit 76941650c150e5ebca9f1131be0bfb8edc776239 diff --git a/site.yml b/site.yml index b528674..f0adb1d 100644 --- a/site.yml +++ b/site.yml @@ -28,6 +28,7 @@ - {role: gantsign.bat, tags: bat} - {role: l3d.wm.i3, tags: i3wm} - {role: l3d.wm.sway, tags: sway} + - {role: hax0rbana_adam.librewolf, tags: librewolf} # - {role: amdgpu_firmware, tags: firmware} - {role: do1jlr.htop, tags: htop}