cleanup legacy <3

apt/dependencies.sls

 python-apt:
   pkg.installed
 
+python3-apt:
+  pkg.installed
+
 debian-archive-keyring:
   pkg.installed

apt/files/ffda.key

------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-xZo=
-=G8fy
------END PGP PUBLIC KEY BLOCK-----

apt/files/keys/info-ffffm.gpg

------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-Sc9pyg==
-=Ual2
------END PGP PUBLIC KEY BLOCK-----

apt/repository/ffda.sls

----
-include:
-  - apt.transport.https
-
-apt.ffda.io:
-  pkgrepo.managed:
-    - humanname: ffda
-    - file: /etc/apt/sources.list.d/ffda.list
-    - name: deb https://apt.ffda.io/debian/stretch ffda main
-    - key_url: salt://apt/files/ffda.key
-    - require:
-      - pkg: apt-transport-https

apt/repository/ffffm.sls

-include:
-  - apt.transport.https
-  - apt.dependencies
-
-ffffm-repo:
-  pkgrepo.managed:
-    - comments:
-      - "# FFFFM APT repo"
-    - human_name: FFFFM repository
-    - name: deb https://dl.ffm.freifunk.net/debian-packages/ sid main
-    - dist: sid
-    - file: /etc/apt/sources.list.d/ffffm.list
-    - clean_file: True
-    - key_url: salt://apt/files/keys/info-ffffm.gpg
-    - require:
-      - pkg: python-apt
-      - pkg: apt-transport-https

apt/transport/https.sls

+{% if grains['osmajorrelease'] < 10 %}
 apt-transport-https:
   pkg.installed:
     - order: 1
+{% endif %}

babeld/files/babeld.conf

-ipv6-subtrees true
-reflect-kernel-metric true
-export-table 10
-import-table 11
-import-table 12
-local-port-readwrite 33123
-
-{%- for name, interface in pillar.ifaces.items() if 'babel' in interface %}
-interface {{ name }} type wired rxcost 10 update-interval 60
-{%- endfor %}
-
-{%- for name in salt['fastd.all_instances_name']() %}
-interface {{ name }} type tunnel link-quality true update-interval 300
-{%- endfor %}
-
-default enable-timestamps true
-default max-rtt-penalty 96
-default rtt-min 25
-out ip 2a06:8187:fbab:2::1/128 deny
-redistribute ip 2a06:8187:fbab:2::1/128 deny
-redistribute ip 2a06:8187:fbab:2::/64 eq 128  allow
-redistribute ip 2a06:8187:fbab:1::/64 eq 128  allow
-redistribute src-ip 2a06:8187:fb00::/40 ip 2000::/3 allow
-redistribute ip ::/0 allow
-redistribute ip 2000::/3 allow
-redistribute local deny

babeld/files/babeld.service

-[Unit]
-Description=babeld
-Wants=basic.target
-After=basic.target network.target
-Before=fastd.service
-
-[Service]
-Type=forking
-ExecStart=/usr/local/bin/babeld -D -c /etc/babeld.conf
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
-

babeld/files/echotobabel

-#!/bin/bash
-PORT=33123
-
-count=0
-line="$1"
-while ! (echo -e "$line" | nc ::1 "$PORT" >/dev/null 2>&1)
-do
-  sleep 1
-  echo retrying to connect to babeld on port $PORT in script in PID $$, waited ${count}s >&2
-  count=$((count+1))
-done
-return 0

babeld/files/ferm.conf

-domain (ip ip6) {
-	table filter {
-		chain INPUT {
-			interface(lo){
-				proto tcp dport (33123) ACCEPT;
-			}
-		{% for name, interface in pillar.ifaces.items() if 'babel' in interface %}
-			interface( {{ name }} ) {
-				proto udp dport (6696) ACCEPT;
-			}
-		{% endfor %}
-		{%- for name in salt['fastd.all_instances_name']() %}
-			interface( {{ name }} ) {
-				proto udp dport (6696) ACCEPT;
-			}
-		{%- endfor %}
-		}
-	}
-}

babeld/init.sls

-babeld:
-  pkg.installed:
-    - name: babeld
-  service.running:
-    - enable: True
-    - name: babeld
-    - require:
-      - pkg: babeld
-    - watch:
-      - file: /etc/babeld.conf
-      - file: /etc/systemd/system/babeld.service
-
-/etc/babeld.conf:
-  file.managed:
-    - source: salt://babeld/files/babeld.conf
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: '0644'
-
-/etc/systemd/system/babeld.service:
-  file.managed:
-    - source: salt://babeld/files/babeld.service
-    - user: root
-    - group: root
-    - mode: '0644'
-
-/etc/ferm/conf.d/50-babeld.conf:
-   file.managed:
-     - source: salt://babeld/files/ferm.conf
-     - template: jinja
-     - user: root
-     - group: root
-     - mode: '0644'
-     - require:
-       - pkg: ferm
-
-/usr/local/bin/echotobabel:
-   file.managed:
-    - source: salt://babeld/files/echotobabel
-    - user: root
-    - group: root
-    - mode: '0755'
-
-include:
-  - network.babel-tabels
-  - apt.repository.ffffm

common/locales.sls

@@ -22,4 +22,3 @@ default_locale:
     - name: /usr/sbin/update-locale LANG=en_US.UTF-8
     - onchanges:
       - cmd: locales_reconfigure
-

l3roamd/files/execafter_ifup

-#!/bin/bash
-ifname="$1"
-shift
-
-while ! ip -o l l "$ifname" |grep -q "${ifname}:"
-do
-	echo waiting for interface $ifname to be come available
-	sleep 1
-done
-
-
-$@

l3roamd/files/ferm.conf

-domain (ip ip6) {
-	table filter {
-		chain INPUT {
-		{% for name, interface in pillar.ifaces.items() if 'babel' in interface %}
-			interface( {{ name }} ) {
-				proto udp dport (5523) ACCEPT;
-			}
-		{%- endfor %}
-		{%- for name in salt['fastd.all_instances_name']() %}
-			interface( {{ name }} ) {
-				proto udp dport (5523) ACCEPT;
-			}
-		{%- endfor %}
-		}
-	}
-}

l3roamd/files/l3roamd-network

-allow-hotplug l3roam0
-auto l3roam0
-iface l3roam0
-	post-up /sbin/ip -6 a add {{ pillar.l3roamd.nodeip }} dev lo
-	post-up /sbin/ip -6 r a 2a06:8187:fbab:2::/64 dev l3roam0 t 10

l3roamd/files/l3roamd.service.tpl

-[Unit]
-Description=l3roamd
-Wants=basic.target
-After=basic.target network.target fastd.service babeld.service
-
-[Service]
-Type=simple
-ExecStart=/usr/local/bin/l3roamd -s /var/run/l3roamd.sock -p 2a06:8187:fbab:2::/64  {% for name, interface in pillar.ifaces.items() if 'babel' in interface %} -m {{ name }} {% endfor %} {% for name in salt['fastd.all_instances_name']() %} -m {{ name }} {% endfor %} -t 11 -a {{ pillar.l3roamd.nodeip }} -4 0:0:0:0:0:ffff::/96
-KillMode=process
-ExecStartPost=/usr/local/bin/execafter_ifup l3roam0 "/sbin/ip -6 route add 2a06:8187:fbab:2::/64 dev l3roam0 table 10"
-ExecStartPost=/usr/local/bin/execafter_ifup l3roam0 "/sbin/ip -6 route add 2a06:8187:fbab:1::/64 dev l3roam0 table 10"
-Restart=always
-RestartSec=3
-
-[Install]
-WantedBy=multi-user.target

l3roamd/init.sls

-l3roamd:
-  pkg.installed:
-    - name: l3roamd
-
-/etc/systemd/system/l3roamd.service:
-  file.managed:
-    - template: jinja
-    - source: salt://l3roamd/files/l3roamd.service.tpl
-    - user: root
-    - group: root
-    - mode: '0644'
-    - template: jinja
-    - require:
-      - file: /usr/local/bin/execafter_ifup
-
-/usr/local/bin/execafter_ifup:
-  file.managed:
-    - source: salt://l3roamd/files/execafter_ifup
-    - user: root
-    - group: root
-    - mode: '0755'
-
-/etc/ferm/conf.d/41-l3roamd.conf:
-  file.managed:
-    - template: jinja
-    - source: salt://l3roamd/files/ferm.conf
-    - user: root
-    - group: root
-    - mode: '0644'
-    - require:
-      - pkg: ferm
-
-/etc/network/interfaces.d/l3roamd:
-  file.managed:
-    - source: salt://l3roamd/files/l3roamd-network
-    - user: root
-    - group: root
-    - template: jinja
-    - mode: '0644'
-
-include:
-  - network.babel-tabels
-  - apt.repository.ffffm

mmfd/files/ferm.conf

-domain (ip ip6) {
-	table filter {
-		chain INPUT {
-		{% for name, interface in pillar.ifaces.items() if 'babel' in interface %}
-			interface( {{ name }} ) {
-				proto udp dport (27275) ACCEPT;
-			}
-		{%- endfor %}
-		{%- for name in salt['fastd.all_instances_name']() %}
-			interface( {{ name }} ) {
-				proto udp dport (27275) ACCEPT;
-			}
-		{%- endfor %}
-		}
-	}
-}