Unterschiede

Hier werden die Unterschiede zwischen zwei Versionen angezeigt.

--- linux:ansible:ffmuc-rpb4-ol [27.09.2022 15:29. ] – [Tasks] django
+++ linux:ansible:ffmuc-rpb4-ol [27.09.2022 15:43. ] – [Tasks] django
@@ Zeile 1472: / Zeile 1472: @@
 == 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 1502: / 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 1524: / 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 1537: / 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
-    template:
-      src: templates/interfaces_mesh_ohne_client.j2
-      dest: /etc/network/interfaces
-    when: ( raspberry_clientvlan|length == 0 ) and ( raspberry_meshvlan|length > 0 )
-</file>
-<file java  ~/ansible/roles/client-mesh/tasks/meshundclient.yml>---
+- name: "vxlan_id für ausgewähltes Segment ermitteln"
-  - name: "Konfiguration von Mesh- und Client-VLAN"
+  ansible.builtin.set_fact:
-    # https://docs.ansible.com/ansible/latest/modules/template_module.html
+    ffmuc_vxlan_id: "{{ item.value }}"
-    template:
+  loop: "{{ lookup('dict', vxlan_ids) }}"
-      src: templates/interfaces_mesh_mit_client.j2
+  when: "ffmuc_segment in item.key"
-      dest: /etc/network/interfaces
-    when: ( raspberry_clientvlan|length > 0 ) and ( raspberry_meshvlan|length > 0 )
+...</file>
-</file>
+<file c++ ~/ansible/roles/client-mesh/tasks/meshohneclient.yml>---
+- name: "Konfiguration des Mesh-VLAN ohne Client-VLAN"
+  ansible.builtin.template:
+    src: templates/interfaces_mesh_ohne_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/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 1620: / 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 1660: / 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 1691: / 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 1714: / 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 1736: / Zeile 1765: @@
 fi
 /usr/sbin/batctl hardif mesh-vpn throughput_override 10000
-exit 0
+exit 0</file>
-</file>
+/*
 === Rolle "oled" ===
 == Tasks ==
@@ Zeile 2178: / 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 ====