From 11ffab6dde9c03949d1cebdf5e2974ca16b5e48c Mon Sep 17 00:00:00 2001 From: DEvil0000 Date: Sat, 15 Apr 2023 21:01:35 +0200 Subject: [PATCH] using the newer batman and alfred installation roles --- .gitmodules | 6 ++ group_vars/freifunk.yml | 6 -- roles/alfred-install | 1 + roles/batman-install | 1 + roles/freifunk-backbone/tasks/main.yml | 144 ------------------------- 5 files changed, 8 insertions(+), 150 deletions(-) create mode 160000 roles/alfred-install create mode 160000 roles/batman-install diff --git a/.gitmodules b/.gitmodules index 0c12545..3716df4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -62,3 +62,9 @@ [submodule "roles/wireguard"] path = roles/wireguard url = https://github.com/githubixx/ansible-role-wireguard +[submodule "roles/batman-install"] + path = roles/batman-install + url = https://github.com/DEvil0000/ansible-role-batman-install.git +[submodule "roles/alfred-install"] + path = roles/alfred-install + url = https://github.com/DEvil0000/ansible-role-alfred-install.git diff --git a/group_vars/freifunk.yml b/group_vars/freifunk.yml index 264d797..72576d2 100644 --- a/group_vars/freifunk.yml +++ b/group_vars/freifunk.yml @@ -13,12 +13,6 @@ ipv4_dhcp_interface: 'bat0' # some more advanced informations like B.A.T.M.A.N Download Informations batman_version: '2021.4' -batman_sha256sum: 'cff7a2f160045fd0dbf1f1cd7e35e93bf489e81cb8b9501b3756daa391f3eb1b' - # https://downloads.open-mesh.org/batman/releases/batman-adv-{{ batman_version }}/batman-adv-{{ batman_version }}.tar.gz -batctl_sha256sum: 'b6d96e908e3295a1413e8ec4f0f9851f85c67c752ac45bebbbe58aad40fad8e7' - # https://downloads.open-mesh.org/batman/releases/batman-adv-{{ batman_version }}/batctl-{{ batman_version }}.tar.gz -alfred_sha256sum: '4c79b6c45de4bcc8cbfe64cba9a0f8b4ef304ca84c194622f2bfa41e01e2cb95' - # https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-{{ batman_version }}.tar.gz' fastd_libsodium_version: '1.0.18' fastd_libsodium_sha256sum: '6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1' diff --git a/roles/alfred-install b/roles/alfred-install new file mode 160000 index 0000000..874d6ba --- /dev/null +++ b/roles/alfred-install @@ -0,0 +1 @@ +Subproject commit 874d6ba9bf1ede286e3c9c7653756d5deb1f8263 diff --git a/roles/batman-install b/roles/batman-install new file mode 160000 index 0000000..3b2e0c0 --- /dev/null +++ b/roles/batman-install @@ -0,0 +1 @@ +Subproject commit 3b2e0c0ba7e54d8bff4253d68d693d82c463f46b diff --git a/roles/freifunk-backbone/tasks/main.yml b/roles/freifunk-backbone/tasks/main.yml index 6a0c782..95723b3 100644 --- a/roles/freifunk-backbone/tasks/main.yml +++ b/roles/freifunk-backbone/tasks/main.yml @@ -1,108 +1,4 @@ --- -- name: get kernel header package version - set_fact: - kernel_header_version: "{{ ('-cloud-' in ansible_kernel or '-generic' in ansible_kernel) | ternary(ansible_kernel,dpkg_arch.stdout) }}" - -- name: Install dependencies for batman-adv batctl and alfred - apt: - name: '{{ packages }}' - state: 'latest' - update_cache: yes - cache_valid_time: 86400 - vars: - packages: - - wget - - git - - build-essential - - pkg-config - - "linux-headers-{{ kernel_header_version }}" - - libnl-3-dev - - libnl-genl-3-dev - - libjson-c-dev - - libcap-dev - - libcap2-bin - - radvd - -- name: Create '/root/download/' directory - file: - path: '/root/download' - state: directory - mode: 'u=rwx,g=rx,o=rx' - -- name: Download 'B.A.T.M.A.N.' Advanced - get_url: - url: 'https://downloads.open-mesh.org/batman/releases/batman-adv-{{ batman_version }}/batman-adv-{{ batman_version }}.tar.gz' - dest: '/root/download/batman-adv.{{ batman_version }}.tar.gz' - checksum: sha256:{{ batman_sha256sum }} - register: batmanadv - -- name: Create '/tmp/batman-adv/' directory - file: - path: '/tmp/batman-adv' - state: directory - mode: 'u=rwx,g=rx,o=rx' - when: batmanadv.changed - -- name: Unpack batman-adv archive - unarchive: - src: '/root/download/batman-adv.{{ batman_version }}.tar.gz' - dest: '/tmp/batman-adv/' - remote_src: yes - when: batmanadv.changed - -- name: Make batman-adv - make: - chdir: '/tmp/batman-adv/batman-adv-{{ batman_version }}' - params: - CONFIG_BATMAN_ADV_DEBUGFS: y - NUM_THREADS: 4 - when: batmanadv.changed - -- name: Make install batman-adv - make: - chdir: '/tmp/batman-adv/batman-adv-{{ batman_version }}' - target: install - params: - CONFIG_BATMAN_ADV_DEBUGFS: y - NUM_THREADS: 4 - when: batmanadv.changed - -- name: Download batctl - get_url: - url: 'https://downloads.open-mesh.org/batman/releases/batman-adv-{{ batman_version }}/batctl-{{ batman_version }}.tar.gz' - dest: '/root/download/batctl.{{ batman_version }}.tar.gz' - checksum: sha256:{{ batctl_sha256sum }} - register: batctldl - -- name: Create '/tmp/batctl/' Directory - file: - path: '/tmp/batctl' - state: directory - mode: 'u=rwx,g=rx,o=rx' - when: batctldl.changed - -- name: Unpack batctl archive - unarchive: - src: '/root/download/batctl.{{ batman_version }}.tar.gz' - dest: '/tmp/batctl/' - remote_src: yes - when: batctldl.changed - -- name: Make batctl - make: - chdir: '/tmp/batctl/batctl-{{ batman_version }}' - params: - NUM_THREADS: 4 - when: batctldl.changed - -- name: Make install batctl - make: - chdir: '/tmp/batctl/batctl-{{ batman_version }}' - target: install - params: - NUM_THREADS: 4 - when: batctldl.changed - - name: Create alfred group group: name: alfred @@ -117,46 +13,6 @@ system: yes home: '/var/run/alfred' -- name: Download alfred - get_url: - url: 'https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-{{ batman_version }}.tar.gz' - dest: '/root/download/alfred.{{ batman_version }}.tar.gz' - checksum: sha256:{{ alfred_sha256sum }} - register: alfreddl - -- name: Create '/tmp/alfred/' Directory - file: - path: '/tmp/alfred' - state: directory - mode: 'u=rwx,g=rx,o=rx' - when: alfreddl.changed - -- name: Unpack alfred archive - unarchive: - src: '/root/download/alfred.{{ batman_version }}.tar.gz' - dest: '/tmp/alfred/' - remote_src: yes - when: alfreddl.changed - -- name: Make alfred - make: - chdir: '/tmp/alfred/alfred-{{ batman_version }}' - params: - NUM_THREADS: 4 - CONFIG_ALFRED_GPSD: n - CONFIG_ALFRED_VIS: n - when: alfreddl.changed - -- name: Make install alfred - make: - chdir: '/tmp/alfred/alfred-{{ batman_version }}' - target: install - params: - NUM_THREADS: 4 - CONFIG_ALFRED_GPSD: n - CONFIG_ALFRED_VIS: n - when: alfreddl.changed - - name: Set Linux capabilities for alfred capabilities: path: '/usr/local/sbin/alfred'