1
0
Fork 0
mirror of https://github.com/DO1JLR/ansible_linux_desktop_setup.git synced 2024-09-14 19:54:51 +02:00

Merge branch 'main' into lnt

This commit is contained in:
L3D 2024-04-10 15:35:47 +02:00 committed by GitHub
commit 89a9544ce3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 62 additions and 21 deletions

3
.gitmodules vendored
View file

@ -71,3 +71,6 @@
[submodule "collections/ansible_collections/l3d/time"] [submodule "collections/ansible_collections/l3d/time"]
path = collections/ansible_collections/l3d/time path = collections/ansible_collections/l3d/time
url = https://github.com/roles-ansible/ansible_collection_time.git url = https://github.com/roles-ansible/ansible_collection_time.git
[submodule "collections/ansible_collections/l3d/users"]
path = collections/ansible_collections/l3d/users
url = https://github.com/roles-ansible/ansible_collection_users.git

@ -1 +1 @@
Subproject commit cd77d67efb7d2f1f79d48d5a03f427d4445cd59e Subproject commit 9307b76e744661ef8d62bf829f02393100e8ba91

@ -1 +1 @@
Subproject commit e3c7dd6cd8f9f0b41b18d526ef3c97856701dd63 Subproject commit d2929df23e12f1ec56f56f346ef412ec9b73cf7a

@ -1 +1 @@
Subproject commit 1a200d3fb93c0ee1745e5a62f93ac0e27f63482a Subproject commit 9d0e8ffc6382c44e5ae26edbb21484294341698c

@ -0,0 +1 @@
Subproject commit 406e3cf339a07c7933e98b88d49e74e88671d26b

View file

@ -1,9 +1,27 @@
--- ---
# #
# roles/dotfiles # l3d.users
# l3d.users.user
# -> define users
l3d_users__default_users:
- name: 'l3d'
state: 'present'
shell: '/bin/bash'
create_home: true
pubkeys: "{{ lookup('url', 'https://github.com/do1jlr.keys', split_lines=False) }}"
exklusive_pubkeys: true
admin: true
admin_commands: 'ALL'
admin_nopassword: false
admin_ansible_login: true
- name: 'alice'
state: 'absent'
# #
# enable keychain as ssh agent # l3d.users
dotfiles__additional_user_bashrc_lines: # l3d.users.user
# -> enable keychain as ssh agent
l3d_users__dotfiles__additional_user_bashrc_lines:
- '[[ $- == *i* ]] && eval $(keychain --eval --quiet id_ed25519)' - '[[ $- == *i* ]] && eval $(keychain --eval --quiet id_ed25519)'
- '_gopass_bash_autocomplete() {' - '_gopass_bash_autocomplete() {'
- ' local cur opts base' - ' local cur opts base'

15
group_vars/work.yml Normal file
View file

@ -0,0 +1,15 @@
---
#
# l3d.users
# l3d.users.user
l3d_users__local_users:
- name: 'lilian'
state: 'present'
shell: '/bin/bash'
create_home: true
pubkeys: "{{ lookup('url', 'https://github.com/do1jlr.keys', split_lines=False) }}"
exklusive_pubkeys: true
admin: true
admin_commands: 'ALL'
admin_nopassword: false
admin_ansible_login: true

@ -1 +1 @@
Subproject commit a8b5881aa7939e18eadb9c324a6653f22c2e9064 Subproject commit 43d9f1776e575ffe91cf3602ac6f0877c0933794

@ -1 +1 @@
Subproject commit a50791cf09a0c67903cee4e9a04f464d667e720e Subproject commit fa3a60f5107f945f761e48d6cfebb8c6682443f9

@ -1 +1 @@
Subproject commit a0e1442ce37af5d3395a40332a73b8be970a2e76 Subproject commit d4fe10a8a535b42232fb214d75c61e95d74bcdf8

@ -1 +1 @@
Subproject commit 4c8b9fc9a933471dc867415d06f212823a947a3f Subproject commit ed08078c367b986a0409c2e6ab49f553d123c3cf

@ -1 +1 @@
Subproject commit 6fb8ebd6645f8f518d27acd7834184e50f9163b1 Subproject commit 348ea9a127fe5133d2f3dee9e9050ba5cd5732c3

@ -1 +1 @@
Subproject commit b263e5e140ee3c5e868f9392b2e4a2eaa37eaf79 Subproject commit dae043fe28360b16b86645b0eecca80c489ac5c6

@ -1 +1 @@
Subproject commit 242529420b856b5923529e50652a9b2e553e1aca Subproject commit 5059bd985a4a410b49bd3f2baf35679e779d6fdf

@ -1 +1 @@
Subproject commit dee7dc268691ade0c384efa9fe1daa2b805e7cf8 Subproject commit bf76fcc81e5687009d6897b1a80e8f5d19b9ab47

@ -1 +1 @@
Subproject commit 09864d03a24a4ba3049e4825c3e045295ed2a670 Subproject commit c3fabc5fc6f5f56818cee53d85b249ef26cd12dd

@ -1 +1 @@
Subproject commit 152db3c48833176f3bca746b0e556c158e6bc523 Subproject commit 43229cf0d9561248625ada346c86e03f6fee4b71

@ -1 +1 @@
Subproject commit 04b2945454d98e6e917a5e1fcdb7d6d7158840e1 Subproject commit 7ab63e19e065c9dd55504a6d89fe006c13eed9df

View file

@ -4,6 +4,14 @@
roles: roles:
- {role: ansible_version, tags: always} - {role: ansible_version, tags: always}
- name: Generic Workstation Preperation
hosts: all
roles:
- {role: l3d.users.user, tags: user}
- {role: l3d.users.admin, tags: admin}
- {role: l3d.users.sshd, tags: sshd}
- {role: l3d.users.dotfiles, tags: dotfiles}
- name: Generic Workstation Preperation - name: Generic Workstation Preperation
hosts: all hosts: all
roles: roles:
@ -21,10 +29,6 @@
# - name: user specific setup # - name: user specific setup
# hosts: private # hosts: private
# roles: # roles:
# - {role: dotfiles, tags: [default, dotfiles, fancy]}
# - {role: manage_users, tags: [ssh, manage, manage_users]}
# - {role: authorized_keys, tags: [ssh, auth, authorized_keys]}
# - {role: sshd, tags: [ssh, sshd]}
# - {role: akku-warning, tags: [akku, akku_warning, akku-warning]} # - {role: akku-warning, tags: [akku, akku_warning, akku-warning]}
# - {role: no-sleep, tags: no_sleep} # - {role: no-sleep, tags: no_sleep}