diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..d15e1ff --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "ansible.python.interpreterPath": "/opt/homebrew/anaconda3/bin/python" +} \ No newline at end of file diff --git a/inventory/hosts.ini b/inventory/hosts.ini index ee84b5b..0f7b750 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -1,11 +1,14 @@ [almalinux-root] -vps-root +; vps-root +janvoelkelde-root + [almalinux-user] -vps +; vps +janvoelkelde [all:vars] user_name="jan" domain="janvoelkel-de" -op_password_path="SSH/MyVPS jan/password" +op_password_path="SSH/VPS janvoelkel.de jan/password" dnf_text_editor="nano" \ No newline at end of file diff --git a/playbooks/add_user.yml b/playbooks/add_user.yml index 0d83289..ed64e02 100644 --- a/playbooks/add_user.yml +++ b/playbooks/add_user.yml @@ -10,7 +10,7 @@ prompt: "Please enter the password for the new user" private: yes # Das Passwort wird versteckt eingegeben - name: "ssh_public_key" - prompt: "Please enter the public key for shh of your pc" + prompt: "Please enter the public key for ssh of your pc" private: no roles: - create_user_with_root \ No newline at end of file diff --git a/roles/create_user_with_root/tasks/main.yml b/roles/create_user_with_root/tasks/main.yml index a2b55f1..ade2a7d 100644 --- a/roles/create_user_with_root/tasks/main.yml +++ b/roles/create_user_with_root/tasks/main.yml @@ -2,7 +2,7 @@ - name: Erstelle einen neuen User mit Sudo-Rechten user: name: "{{ user_name }}" - password: "{{ lookup('pipe', 'op read \"op://' + op_password_path + '\"') | password_hash('sha512') }}" + password: "{{ lookup('pipe', 'op read \"op://' + op_password_path + '\"') }}" state: present shell: /bin/bash groups: wheel diff --git a/roles/dnf_tools/tasks/main.yml b/roles/dnf_tools/tasks/main.yml index 797b557..def8f52 100644 --- a/roles/dnf_tools/tasks/main.yml +++ b/roles/dnf_tools/tasks/main.yml @@ -2,4 +2,9 @@ - name: Install DNF tools dnf: name: "{{ dnf_text_editor }}" - state: present \ No newline at end of file + state: present + +- name: Install Git + dnf: + name: git + state: present diff --git a/roles/firewalld/tasks/main.yml b/roles/firewalld/tasks/main.yml index a2d17a3..6d792af 100644 --- a/roles/firewalld/tasks/main.yml +++ b/roles/firewalld/tasks/main.yml @@ -15,4 +15,14 @@ zone: public service: ssh permanent: yes - state: enabled \ No newline at end of file + state: enabled + +- name: Add Tailscale interface to trusted zone + firewalld: + zone: trusted + interface: tailscale0 + permanent: yes + state: enabled + +- name: Reload firewalld + command: firewall-cmd --reload