Unterschiede

Hier werden die Unterschiede zwischen zwei Versionen angezeigt.

--- linux:ansible:ffmuc-rpb4-ol [27.09.2022 15:17. ] – [Templates] django
+++ linux:ansible:ffmuc-rpb4-ol [27.09.2022 15:43. ] – [Tasks] django
@@ Zeile 1264: / Zeile 1264: @@
 === Rolle "ext-respondd" ===
 == Tasks ==
-<file java ~/ansible/roles/ext-respondd/tasks/main.yml>--- # Installation und Konfiguration des ext-respondd (Statistiken für https://map.ffmuc.net)
+<file c++ ~/ansible/roles/ext-respondd/tasks/main.yml>--- # Installation und Konfiguration des ext-respondd (Statistiken für https://map.ffmuc.net)
 - include: gitinstall.yml               # Installation der Pakete git und python3-netifaces
 - include: gitclone.yml                 # Repo ext-respondd klonen
@@ Zeile 1273: / Zeile 1273: @@
 </file>
-<file java ~/ansible/roles/ext-respondd/tasks/aliasgenerate.yml>---
-  - name: "Erstellen der resondd Konfigurationsdatei alias.json"
-    # https://docs.ansible.com/ansible/latest/modules/template_module.html
-    template:
-      src: templates/ext-respondd_alias.json.j2
-      dest: /opt/ext-respondd/alias.json
-</file>
-<file java ~/ansible/roles/ext-respondd/tasks/configgenerate.yml>---
+<file c++ ~/ansible/roles/ext-respondd/tasks/gitinstall.yml>---
-  - name: "Erstellen der resondd Konfigurationsdatei config.json"
-    # https://docs.ansible.com/ansible/latest/modules/template_module.html
-    template:
-      src: templates/ext-respondd_config.json.j2
-      dest: /opt/ext-respondd/config.json
-</file>
-<file java ~/ansible/roles/ext-respondd/tasks/copyconfig.yml>---
+- name: "Installation der Pakete git und python3-netifaces"
-  - name: "Systemd Startdatei für respondd kopieren"
+  ansible.builtin.apt:
-    # https://docs.ansible.com/ansible/latest/modules/shell_module.html
+    update_cache: true
-    shell:
+    pkg:
-      cmd: cp /opt/ext-respondd/ext-respondd.service.example /etc/systemd/system/ext-respondd.service
+      - git
-</file>
+      - python3-netifaces
+    state: present
-<file java ~/ansible/roles/ext-respondd/tasks/gitclone.yml>---
+...</file>
-  - name: "Repo ext-respondd klonen"
-    # https://docs.ansible.com/ansible/latest/modules/git_module.html
-    git:
-      repo: https://github.com/freifunkMUC/ext-respondd
-      dest: /opt/ext-respondd/
-</file>
-<file java ~/ansible/roles/ext-respondd/tasks/gitinstall.yml>---
-  - name: "Installation der Pakete git und python3-netifaces"
-    # https://docs.ansible.com/ansible/latest/modules/apt_module.html
-    apt:
-      update_cache: yes
-      pkg:
-        - git
-        - python3-netifaces
-      state: present
-</file>
-<file java ~/ansible/roles/ext-respondd/tasks/servicestartup.yml>---
-  - name: "Service ext-respondd beim Booten starten"
+<file c++ ~/ansible/roles/ext-respondd/tasks/gitclone.yml>---
-    # https://docs.ansible.com/ansible/latest/modules/systemd_module.html
-    systemd:
+- name: "ggf. bestehende Altlast bereinigen"
-      name: ext-respondd
+  ansible.builtin.file:
-      daemon_reload: yes
+    path: /opt/ext-respondd
-      state: started
+    state: absent
-      enabled: yes
-</file>
+- name: "Repo ext-respondd klonen"
+  ansible.builtin.git:
+    repo: https://github.com/freifunkMUC/ext-respondd
+    dest: /opt/ext-respondd/
+    version: master
+    clone: true
+    update: true
+...</file>
+<file c++ ~/ansible/roles/ext-respondd/tasks/copyconfig.yml>---
+- name: "Systemd Startdatei für respondd kopieren"
+  ansible.builtin.copy:
+    src: /opt/ext-respondd/ext-respondd.service.example
+    dest: /etc/systemd/system/ext-respondd.service
+    remote_src: true
+     # cmd: cp /opt/ext-respondd/ext-respondd.service.example /etc/systemd/system/ext-respondd.service
+...</file>
+<file c++ ~/ansible/roles/ext-respondd/tasks/aliasgenerate.yml>---
+- name: "Erstellen der resondd Konfigurationsdatei alias.json"
+  ansible.builtin.template:
+    src: templates/ext-respondd_alias.json.j2
+    dest: /opt/ext-respondd/alias.json
+    owner: root
+    group: root
+    mode: '0644'
+...</file>
+<file c++ ~/ansible/roles/ext-respondd/tasks/configgenerate.yml>---
+- name: "Erstellen der resondd Konfigurationsdatei config.json"
+  ansible.builtin.template:
+    src: templates/ext-respondd_config.json.j2
+    dest: /opt/ext-respondd/config.json
+    owner: root
+    group: root
+    mode: '0644'
+...</file>
+<file c++ ~/ansible/roles/ext-respondd/tasks/bugfixing.yml>---
+- name: "Typo in der /opt/ext-respondd/lib/nodeinfo.py korrigieren"
+  ansible.builtin.replace:
+    path: /opt/ext-respondd/lib/nodeinfo.py
+    # zu ersetzende/korrigierende Zeile
+    regexp: 'Processor'
+    # wird ersetzt durch
+    replace: 'processor'
+...</file>
+<file c++ ~/ansible/roles/ext-respondd/tasks/servicestartup.yml>---
+- name: "Service ext-respondd beim Booten starten"
+  systemd:
+    name: ext-respondd
+    daemon_reload: true
+    state: started
+    enabled: true
+...</file>
 == Templates ==
-<file java ~/ansible/roles/ext-respondd/templates/ext-respondd_alias.json.j2>{
+<file c++ ~/ansible/roles/ext-respondd/templates/ext-respondd_alias.json.j2>{
   "nodeinfo": {
     "hostname": "{{ raspberry_hostname }}",
@@ Zeile 1345: / Zeile 1386: @@
   },
   "firstseen": "2019-08-14T12:34:56"
-}
+}</file>
-</file>
 <file java ~/ansible/roles/ext-respondd/templates/ext-respondd_config.json.j2>{
@@ Zeile 1355: / Zeile 1395: @@
   "rate_limit": 30,
   "rate_limit_burst": 10
-}
+}</file>
-</file>
 === Rolle "hostapd" ===
 == Tasks ==
-<file java ~/ansible/roles/hostapd/tasks/main.yml>--- # Installation und Konfiguration des hostap Treibers für den WiFi-Support
+<file c++ ~/ansible/roles/hostapd/tasks/main.yml>--- # Installation und Konfiguration des hostap Treibers für den WiFi-Support
 - include: install.yml                  # Paket hostapd für WLAN installieren
 - include: configure.yml                # hostapd konfigurieren
 - include: genconfig.yml                # hostapd Konfigurationsdatei anlegen
 - include: wlanbridging.yml             # wlan0 in Bridge packen
-- include: servicestartup.yml           # Service hostapd beim Booten und jetzt starten und das Laden der Unit Datei vom Service hostapd ermöglichen
+- include: servicestartup.yml           # Service hostapd beim Booten und jetzt starten
-</file>
+                                        # und so das Laden der Unit Datei vom Service
+                                        # hostapd ermöglichen
+... # YML Ende</file>
-<file java ~/ansible/roles/hostapd/tasks/configure.yml>---
-  - name: "hostapd konfigurieren"
-    # https://docs.ansible.com/ansible/latest/modules/shell_module.html
-    shell: echo 'DAEMON_OPTS="-d"' >> /etc/default/hostapd
-    when: ( raspberry_wifi == "ja" )
-</file>
-<file java ~/ansible/roles/hostapd/tasks/genconfig.yml>---
+<file c++ ~/ansible/roles/hostapd/tasks/install.yml>---
-  - name: "hostapd Konfigurationsdatei anlegen"
-    # https://docs.ansible.com/ansible/latest/modules/template_module.html
-    template:
-      src: templates/hostapd.j2
-      dest: /etc/hostapd/hostapd.conf
-    when: ( raspberry_wifi == "ja" )
-</file>
-<file java ~/ansible/roles/hostapd/tasks/install.yml>---
+- name: "Paket hostapd für WLAN installieren"
-  - name: "Paket hostapd für WLAN installieren"
+  ansible.builtin.apt:
-    # https://docs.ansible.com/ansible/latest/modules/apt_module.html
+    update_cache: true
-    apt:
+    pkg:
-      update_cache: yes
+      - hostapd
-      pkg:
+    state: present
-        - hostapd
-      state: present
+...</file>
-    when: ( raspberry_wifi == "ja" )
-</file>
+<file c++ ~/ansible/roles/hostapd/tasks/configure.yml>---
+- name: "hostapd konfigurieren"
+  ansible.builtin.command: |
+    echo 'DAEMON_OPTS="-d"' >> /etc/default/hostapd
+  changed_when: false
+...</file>
+<file c++ ~/ansible/roles/hostapd/tasks/genconfig.yml>---
+- name: "hostapd Konfigurationsdatei anlegen"
+  ansible.builtin.template:
+    src: templates/hostapd.j2
+    dest: /etc/hostapd/hostapd.conf
+    owner: root
+    group: root
+    mode: '0644'
+...</file>
+<file c++ ~/ansible/roles/hostapd/tasks/wlanbridging.yml>---
+- name: "wlan0 in Bridge packen"
+  template:
+    src: templates/rclocal_wifi.j2
+    dest: /etc/rc.local
+    owner: root
+    group: root
+    mode: '0750'
+...</file>
+<file c++ ~/ansible/roles/hostapd/tasks/servicestartup.yml>---
+- name: "Service hostapd beim Booten und jetzt starten und das Laden der Unit Datei vom Service hostapd ermöglichen"
+  ansible.builtin.systemd:
+    name: hostapd
+    enabled: true
+    masked: false
+    state: started
+...</file>
-<file java ~/ansible/roles/hostapd/tasks/servicestartup.yml>---
-  - name: "Service hostapd beim Booten und jetzt starten und das Laden der Unit Datei vom Service hostapd ermöglichen"
-    # https://docs.ansible.com/ansible/latest/modules/systemd_module.html
-    systemd:
-      name: hostapd
-      enabled: yes
-      masked: no
-      state: started
-    when: ( raspberry_wifi == "ja" )
-</file>
-<file java ~/ansible/roles/hostapd/tasks/wlanbridging.yml>---
-  - name: "wlan0 in Bridge packen"
-    # https://docs.ansible.com/ansible/latest/modules/template_module.html
-    template:
-      src: templates/rclocal_wifi.j2
-      dest: /etc/rc.local
-    when: ( raspberry_wifi == "ja" )
-</file>
 == Templates ==
-<file java ~/ansible/roles/hostapd/templates/hostapd.j2>ssid=muenchen.freifunk.net/{{ ffmuc_segment }}
+<file c++ ~/ansible/roles/hostapd/templates/hostapd.j2>ssid=muenchen.freifunk.net/{{ ffmuc_segment }}
 country_code=US
@@ Zeile 1447: / Zeile 1502: @@
 vht_oper_chwidth=1
 channel=36
-vht_oper_centr_freq_seg0_idx=42
+vht_oper_centr_freq_seg0_idx=42</file>
-</file>
 <file java ~/ansible/roles/hostapd/templates/rclocal_wifi.j2>#!/bin/sh -e
+# Generated by Ansible on {{ ansible_date_time.date }}, do not edit manually!
 #
 # rc.local
@@ Zeile 1469: / Zeile 1525: @@
 fi
 sleep 10; /sbin/brctl addif br-{{ ffmuc_segment }} wlan0
-exit 0
+exit 0</file>
-</file>
 === Rolle "client-mesh" ===
 == Tasks ==
-<file java ~/ansible/roles/client-mesh/tasks/main.yml>--- # Grundkonfiguration von Client und/oder Meshing (V)LANs
+<file c++ ~/ansible/roles/client-mesh/tasks/main.yml>--- # Grundkonfiguration von Client und/oder Meshing (V)LANs
 - include: clientohnemesh.yml           # Konfiguration des Client-VLAN ohne Mesh-Netz
 - include: getvxlanid.yml               # vxlan_id für ausgewähltes Segment ermitteln
@@ Zeile 1482: / Zeile 1537: @@
 - include: batmanohnewifi.yml           # Konfiguration des bevorzugte Meshingpoint in BATMAN_V ohne Wifi-Nutzung
 - include: batmanmitwifi.yml            # Konfiguration des bevorzugte Meshingpoint in BATMAN_V mit Wifi-Nutzung
-</file>
+... # YML Ende</file>
-<file java ~/ansible/roles/client-mesh/tasks/batmanmitwifi.yml>---
-  - name: "Konfiguration des bevorzugte Meshingpoint in BATMAN_V mit Wifi-Nutzung"
-    # https://docs.ansible.com/ansible/latest/modules/template_module.html
-    template:
-      src: templates/rclocal_both.j2
-      dest: /etc/rc.local
-    when: ( raspberry_meshvlan|length > 0 ) and ( raspberry_wifi == "ja" )
-</file>
-<file java  ~/ansible/roles/client-mesh/tasks/batmanohnewifi.yml>---
+<file c++ ~/ansible/roles/client-mesh/tasks/clientohnemesh.yml>---
-  - name: "Konfiguration des bevorzugte Meshingpoint in BATMAN_V ohne Wifi-Nutzung"
-    # https://docs.ansible.com/ansible/latest/modules/template_module.html
-    template:
-      src: templates/rclocal_vxlan.j2
-      dest: /etc/rc.local
-    when: ( raspberry_meshvlan|length > 0 ) and ( raspberry_wifi != "ja" )
-</file>
-<file java ~/ansible/roles/client-mesh/tasks/clientohnemesh.yml>django@Djangos-ThinkPad-X230:~$ cat ~/ansible/roles/client-mesh/tasks/clientohnemesh.yml
+- name: "Konfiguration des Client-VLAN ohne Mesh-Netz"
----
+  ansible.builtin.template:
-  - name: "Konfiguration des Client-VLAN ohne Mesh-Netz"
+    src: templates/interfaces_client_ohne_mesh.j2
-    # https://docs.ansible.com/ansible/latest/modules/template_module.html
+    dest: /etc/network/interfaces
-    template:
+    owner: root
-      src: templates/interfaces_client_ohne_mesh.j2
+    group: root
-      dest: /etc/network/interfaces
+    mode: '0640'
-    when: ( raspberry_clientvlan|length > 0 ) and ( raspberry_meshvlan|length == 0 )
+  when: ( raspberry_clientvlan|length > 0 ) and ( raspberry_meshvlan|length == 0 )
-</file>
-<file java  ~/ansible/roles/client-mesh/tasks/getvxlanid.yml>---
+...</file>
-  - name: "vxlan_id für ausgewähltes Segment ermitteln"
-    # https://docs.ansible.com/ansible/latest/modules/set_fact_module.html
-    set_fact:
-      ffmuc_vxlan_id: "{{ item.value }}"
-    loop: "{{ lookup('dict', vxlan_ids) }}"
-    when: "ffmuc_segment in item.key"
-</file>
-<file java ~/ansible/roles/client-mesh/tasks/meshohneclient.yml>---
+<file c++ ~/ansible/roles/client-mesh/tasks/getvxlanid.yml>---
-  - name: "Konfiguration des Mesh-VLAN ohne Client-VLAN"
-    # https://docs.ansible.com/ansible/latest/modules/template_module.html
+- name: "vxlan_id für ausgewähltes Segment ermitteln"
-    template:
+  ansible.builtin.set_fact:
-      src: templates/interfaces_mesh_ohne_client.j2
+    ffmuc_vxlan_id: "{{ item.value }}"
-      dest: /etc/network/interfaces
+  loop: "{{ lookup('dict', vxlan_ids) }}"
-    when: ( raspberry_clientvlan|length == 0 ) and ( raspberry_meshvlan|length > 0 )
+  when: "ffmuc_segment in item.key"
-</file>
+...</file>
-<file java  ~/ansible/roles/client-mesh/tasks/meshundclient.yml>---
+<file c++ ~/ansible/roles/client-mesh/tasks/meshohneclient.yml>---
-  - name: "Konfiguration von Mesh- und Client-VLAN"
-    # https://docs.ansible.com/ansible/latest/modules/template_module.html
+- name: "Konfiguration des Mesh-VLAN ohne Client-VLAN"
-    template:
+  ansible.builtin.template:
-      src: templates/interfaces_mesh_mit_client.j2
+    src: templates/interfaces_mesh_ohne_client.j2
-      dest: /etc/network/interfaces
+    dest: /etc/network/interfaces
-    when: ( raspberry_clientvlan|length > 0 ) and ( raspberry_meshvlan|length > 0 )
+    owner: root
-</file>
+    group: root
+    mode: '0640'
+  when: ( raspberry_clientvlan|length == 0 ) and ( raspberry_meshvlan|length > 0 )
+...</file>
+<file c++ ~/ansible/roles/client-mesh/tasks/meshundclient.yml>---
+- name: "Konfiguration von Mesh- und Client-VLAN"
+  ansible.builtin.template:
+    src: templates/interfaces_mesh_mit_client.j2
+    dest: /etc/network/interfaces
+    owner: root
+    group: root
+    mode: '0640'
+  when: ( raspberry_clientvlan|length > 0 ) and ( raspberry_meshvlan|length > 0 )
+...</file>
+<file c++  ~/ansible/roles/client-mesh/tasks/batmanohnewifi.yml>---
+- name: "Konfiguration des bevorzugte Meshingpoint in BATMAN_V ohne Wifi-Nutzung"
+  ansible.builtin.template:
+    src: templates/rclocal_vxlan.j2
+    dest: /etc/rc.local
+    owner: root
+    group: root
+    mode: '0750'
+  when: ( raspberry_meshvlan|length > 0 ) and ( raspberry_wifi != "true" )
+...</file>
+<file c++ ~/ansible/roles/client-mesh/tasks/batmanmitwifi.yml>---
+- name: "Konfiguration des bevorzugte Meshingpoint in BATMAN_V mit Wifi-Nutzung"
+  ansible.builtin.template:
+    src: templates/rclocal_both.j2
+    dest: /etc/rc.local
+    owner: root
+    group: root
+    mode: '0750'
+  when: ( raspberry_meshvlan|length > 0 ) and ( raspberry_wifi == "true" )
+...</file>
 == Templates ==
-<file java ~/ansible/roles/client-mesh/templates/interfaces_client_ohne_mesh.j2># interfaces(5) file used by ifup(8) and ifdown(8)
+<file c++ ~/ansible/roles/client-mesh/templates/interfaces_client_ohne_mesh.j2># Generated by Ansible on {{ ansible_date_time.date }}, do not edit manually!
+# interfaces(5) file used by ifup(8) and ifdown(8)
 # Please note that this file is written to be used with dhcpcd
@@ Zeile 1565: / Zeile 1644: @@
         pre-up /usr/sbin/batctl meshif bat-{{ ffmuc_segment }} gw_mode client
         pre-up /sbin/ip link set address $(ip -br l | grep eth0 | egrep -o '([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})' | head -1) dev bat-{{ ffmuc_segment }}
-        post-up /sbin/ip link set address $(ip -br l | grep eth0 | egrep -o '([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})' | head -1) dev br-{{ ffmuc_segment }}
+        post-up /sbin/ip link set address $(ip -br l | grep eth0 | egrep -o '([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})' | head -1) dev br-{{ ffmuc_segment }}</file>
-</file>
-<file java ~/ansible/roles/client-mesh/templates/interfaces_mesh_mit_client.j2># interfaces(5) file used by ifup(8) and ifdown(8)
+<file c++ ~/ansible/roles/client-mesh/templates/interfaces_mesh_mit_client.j2># Generated by Ansible on {{ ansible_date_time.date }}, do not edit manually!
+# interfaces(5) file used by ifup(8) and ifdown(8)
 # Please note that this file is written to be used with dhcpcd
@@ Zeile 1605: / Zeile 1685: @@
 </file>
-<file java ~/ansible/roles/client-mesh/templates/interfaces_mesh_ohne_client.j2># interfaces(5) file used by ifup(8) and ifdown(8)
+<file java ~/ansible/roles/client-mesh/templates/interfaces_mesh_ohne_client.j2># Generated by Ansible on {{ ansible_date_time.date }}, do not edit manually!
+# interfaces(5) file used by ifup(8) and ifdown(8)
 # Please note that this file is written to be used with dhcpcd
@@ Zeile 1636: / Zeile 1718: @@
         pre-up /usr/sbin/batctl meshif bat-{{ ffmuc_segment }} gw_mode client
         pre-up /sbin/ip link set address $(ip -br l | grep eth0 | egrep -o '([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})' | head -1) dev bat-{{ ffmuc_segment }}
-        post-up /sbin/ip link set address $(ip -br l | grep eth0 | egrep -o '([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})' | head -1) dev br-{{ ffmuc_segment }}
+        post-up /sbin/ip link set address $(ip -br l | grep eth0 | egrep -o '([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})' | head -1) dev br-{{ ffmuc_segment }}</file>
-</file>
 <file bash ~/ansible/roles/client-mesh/templates/rclocal_both.j2>#!/bin/sh -e
+# Generated by Ansible on {{ ansible_date_time.date }}, do not edit manually!
 #
 # rc.local
@@ Zeile 1659: / Zeile 1742: @@
 sleep 10; /sbin/brctl addif br-{{ ffmuc_segment }} wlan0
 /usr/sbin/batctl hardif mesh-vpn throughput_override 10000
-exit 0
+exit 0</file>
-</file>
 <file bash ~/ansible/roles/client-mesh/templates/rclocal_vxlan.j2>#!/bin/sh -e
+# Generated by Ansible on {{ ansible_date_time.date }}, do not edit manually!
 #
 # rc.local
@@ Zeile 1681: / Zeile 1765: @@
 fi
 /usr/sbin/batctl hardif mesh-vpn throughput_override 10000
-exit 0
+exit 0</file>
-</file>
+/*
 === Rolle "oled" ===
 == Tasks ==
@@ Zeile 2123: / Zeile 2206: @@
 </file>
+*/
 === Rolle "final" ===
 == Tasks ==
 <file java ~/ansible/roles/final/tasks/main.yml>--- # Reboot nach Abschluss der Konfiguration unseres Offloaders
-- include: reboot.yml                   # /etc/hosts anpassen
+- include: reboot.yml                   # abschließender Reboot nach Fertigstellung
-... #YAML Ende Syntax
+... # YML Ende</file>
-</file>
 <file java ~/ansible/roles/final/tasks/reboot.yml>---
-  - name: "Reboot nach Abschluss der Konfiguration unseres Offloaders"
-    # https://docs.ansible.com/ansible/latest/modules/reboot_module.html
+- name: "Reboot nach Abschluss der Konfiguration unseres Offloaders"
-    reboot:
+  ansible.builtin.reboot:
-</file>
+...</file>
 ==== Download des auf Debian Buster basierenden Raspbian ====