From 5bdfbe274bf6e8dd39887b6bf3880449bbe66773 Mon Sep 17 00:00:00 2001 From: L3D Date: Sun, 2 Apr 2023 22:28:43 +0200 Subject: [PATCH] update dev --- .gitignore | 1 + README.md | 9 +++++++++ inventory.py | 2 +- roles/ansible_version | 2 +- roles/bat | 2 +- roles/ntp | 2 +- site.yml | 44 ++++++++++++++++++++++--------------------- 7 files changed, 37 insertions(+), 25 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b83b53f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +ansible/ diff --git a/README.md b/README.md index f174d10..46c84ab 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,15 @@ git submodule update --init --recursive # make sure you always check out the submodules git config --global submodule.recurse true + +# Install Ansible in venv +python3 -m venv ansible + +# Activate Venv +source ansible/bin/activate + +# Install Ansible +pip3 install ansible-core ``` Which playbook? diff --git a/inventory.py b/inventory.py index bb6f34b..0487250 100755 --- a/inventory.py +++ b/inventory.py @@ -12,7 +12,7 @@ env_dict = { 'work': ['workstation.local', 'daringdoo.local'], 'private': - ['derpy.local', 'applejack.local'] + ['derpy.local', 'applejack.local', 'rarity.local'] } def fqdn(): diff --git a/roles/ansible_version b/roles/ansible_version index ef4cf76..2bf5d7c 160000 --- a/roles/ansible_version +++ b/roles/ansible_version @@ -1 +1 @@ -Subproject commit ef4cf763795d61e883b1867f4a3149568d4acb2d +Subproject commit 2bf5d7c4369a8213b42829b14f78920e9906d099 diff --git a/roles/bat b/roles/bat index 1b4d972..b263e5e 160000 --- a/roles/bat +++ b/roles/bat @@ -1 +1 @@ -Subproject commit 1b4d9721d1b6a0d1b0786fd5f46409df11b34d07 +Subproject commit b263e5e140ee3c5e868f9392b2e4a2eaa37eaf79 diff --git a/roles/ntp b/roles/ntp index 4bf1dbd..8d33019 160000 --- a/roles/ntp +++ b/roles/ntp @@ -1 +1 @@ -Subproject commit 4bf1dbdffe7b675fad8e32286d892d6c5cfe834f +Subproject commit 8d330190c4052981bdb146136dc7f41071a66289 diff --git a/site.yml b/site.yml index 6cc0d3f..ebf5567 100644 --- a/site.yml +++ b/site.yml @@ -7,26 +7,28 @@ - name: run do1jlr.base setup roles hosts: localhost roles: - - {role: do1jlr.base, tags: [default, packages, base]} - - {role: workstation_packages, tags: [default, workstation_packages, packages, setup]} + #- {role: do1jlr.base, tags: [default, packages, base]} + #- {role: workstation_packages, tags: [default, workstation_packages, packages, setup]} - {role: ntp, tags: ntp} - - {role: arch-fonts, tags: [font, fonts, arch-fonts]} + - {role: do1jlr.avahi_client, tags: avahi} + - {role: do1jlr.avahi_daemon, tags: avahi} + #- {role: arch-fonts, tags: [font, fonts, arch-fonts]} -- name: user specific setup - hosts: localhost - 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: pulseaudio, tags: pulseaudio} - - {role: networkmanager, tags: [nm, networkmanager]} - - {role: copy_files} - - {role: do1jlr.i3wm, tags: i3wm} - - {role: xrandr, tags: xrandr} - - {role: install-firefox, tags: firefox} - - {role: nextcloud, tags: nextcloud} - - {role: openvpn, tags: openvpn} - - {role: winehq, tags: [wine, winehq]} - - {role: no-sleep, tags: no_sleep} +#- name: user specific setup +# hosts: localhost +# 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: pulseaudio, tags: pulseaudio} + #- {role: networkmanager, tags: [nm, networkmanager]} + #- {role: copy_files} + #- {role: do1jlr.i3wm, tags: i3wm} + # - {role: xrandr, tags: xrandr} + #- {role: install-firefox, tags: firefox} + #- {role: nextcloud, tags: nextcloud} + #- {role: openvpn, tags: openvpn} + #- {role: winehq, tags: [wine, winehq]} + #- {role: no-sleep, tags: no_sleep}