From aa68070871427ab3fd3a6258974f2a9283f8b5d0 Mon Sep 17 00:00:00 2001 From: barry Date: Fri, 9 Feb 2024 17:42:07 -0600 Subject: [PATCH] New fixups and added Zerotier config --- hosts | 3 ++ roles/config/tasks/main.yml | 10 ++++- roles/install/files/RPM-GPG-KEY-zerotier | 52 ++++++++++++++++++++++++ roles/install/tasks/main.yml | 15 +++++++ roles/install/templates/zt.repo.j2 | 5 +++ 5 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 roles/install/files/RPM-GPG-KEY-zerotier create mode 100644 roles/install/templates/zt.repo.j2 diff --git a/hosts b/hosts index b2f3ce9..87eaae1 100644 --- a/hosts +++ b/hosts @@ -9,6 +9,9 @@ ansible_user=b0xxy ansible_password=b0xxy registry_url=git.boxxy.net/b0xxer/ +registry_user= +registry_pass= bitcoin_version=26.0 bitcoin_password=rVhfmriXjB8uFekmn7sLvnUiY610JaOx +zerotier_network= diff --git a/roles/config/tasks/main.yml b/roles/config/tasks/main.yml index cc16256..8b627ce 100644 --- a/roles/config/tasks/main.yml +++ b/roles/config/tasks/main.yml @@ -36,7 +36,7 @@ permanent: yes state: enabled -- name: Modify nsswitch file for mdns lookups +- name: Modify nsswitch file for mdns lookups become: yes become_method: sudo ansible.builtin.lineinfile: @@ -60,3 +60,11 @@ name: avahi-daemon state: restarted +- name: Enable Zerotier + become: yes + become_method: sudo + ansible.builtin.systemd_service: + name: zerotier-one + state: started + enabled: yes + when: (zerotier_network is defined) and (zerotier_network|length>0) diff --git a/roles/install/files/RPM-GPG-KEY-zerotier b/roles/install/files/RPM-GPG-KEY-zerotier new file mode 100644 index 0000000..dc7d645 --- /dev/null +++ b/roles/install/files/RPM-GPG-KEY-zerotier @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: GPGTools - https://gpgtools.org + +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 +=JgAv +-----END PGP PUBLIC KEY BLOCK----- diff --git a/roles/install/tasks/main.yml b/roles/install/tasks/main.yml index bae55b8..d31322a 100644 --- a/roles/install/tasks/main.yml +++ b/roles/install/tasks/main.yml @@ -2,6 +2,20 @@ # tasks file for install # +- name: Copy Zerotier GPG Key + become: yes + become_method: sudo + ansible.builtin.copy: + src: RPM-GPG-KEY-zerotier + dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-zerotier + +- name: Copy Zerotier Repo + become: yes + become_method: sudo + ansible.builtin.template: + src: zt.repo.j2 + dest: /etc/yum.repos.d/zt.repo + - name: Install packages become: yes become_method: sudo @@ -19,6 +33,7 @@ - cockpit-networkmanager - cockpit-ostree - cockpit-podman + - zerotier-one - name: Reboot System become: yes diff --git a/roles/install/templates/zt.repo.j2 b/roles/install/templates/zt.repo.j2 new file mode 100644 index 0000000..d0c9a9d --- /dev/null +++ b/roles/install/templates/zt.repo.j2 @@ -0,0 +1,5 @@ +[zerotier] +name=ZeroTier, Inc. RPM Release Repository +baseurl=http://download.zerotier.com/redhat/fc/{{ ansible_facts['distribution_major_version'] }} +enabled=1 +gpgcheck=1