From d82f8524972086862f64750f325ba067ea993d86 Mon Sep 17 00:00:00 2001
From: Niklas Yann Wettengel <niyawe@niyawe.de>
Date: Mon, 3 Jul 2017 09:46:42 +0200
Subject: fastd working

---
 roles/install_fastd/files/fastd-api.php        | 45 ------------------
 roles/install_fastd/handlers/main.yml          | 29 +++++++++++-
 roles/install_fastd/tasks/main.yml             | 63 +++++++++-----------------
 roles/install_fastd/templates/fastd-api.php.j2 | 45 ++++++++++++++++++
 roles/install_fastd/templates/fastd.conf.j2    | 12 ++---
 roles/install_fastd/templates/fastd_up.sh.j2   | 14 +++---
 6 files changed, 106 insertions(+), 102 deletions(-)
 delete mode 100644 roles/install_fastd/files/fastd-api.php
 create mode 100644 roles/install_fastd/templates/fastd-api.php.j2

(limited to 'roles/install_fastd')

diff --git a/roles/install_fastd/files/fastd-api.php b/roles/install_fastd/files/fastd-api.php
deleted file mode 100644
index 98da7a7..0000000
--- a/roles/install_fastd/files/fastd-api.php
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/php -f
-<?php
-//$url = 'http://register.freifunk-myk.de/srvapi.php';
-$url = 'https://www.freifunk-myk.de/node/keys';
-$out = '/etc/fastd/ffmyk/peers/';
- 
-if(!is_dir($out)) die('Output Dir missing');
-if(!is_writable($out)) die('Output Dir perms');
-
-if( ($data = file_get_contents($url)) === FALSE ) die('Error getting keys');
-$data = unserialize($data);
-
-$active=array();
- 
-foreach($data as $router) {
-        $router['MAC'] = trim($router['MAC']);
-        $router['PublicKey'] = trim($router['PublicKey']);
-	if(!preg_match('/^[A-F0-9]{2}:[A-F0-9]{2}:[A-F0-9]{2}:[A-F0-9]{2}:[A-F0-9]{2}:[A-F0-9]{2}$/', $router['MAC'])) {
-		//trigger_error('Router mit falscher MAC?!', E_USER_WARNING);
-	}elseif(!preg_match('/^[A-F0-9]{64}$/', $router['PublicKey'])) {
-		//trigger_error('Router mit falschem Key?!'.$router['MAC'], E_USER_WARNING);
-	}else{
-		$filename='client_'.str_replace(':', '-', $router['MAC']);
-		$fp=fopen($out.$filename, 'w');
-		fwrite($fp, 'key "'.$router['PublicKey'].'";'."\n");
-		fclose($fp);
-		$active[] = $filename;
-	}
-}
-
-//Check if we fscked up
-if(count($active) < 10) die('Less than 10 nodes? Database broken?'); 
-
-$dh = opendir($out);
-while(($file = readdir($dh)) !== false) {
-	if($file != '.' && $file != '..') {
-		if(!in_array($file, $active) && (strpos($file, 'client_') !== false)) {
-			unlink($out.$file);
-		}
-	}
-}
- 
-exec('killall -SIGHUP fastd');
- 
-?>
diff --git a/roles/install_fastd/handlers/main.yml b/roles/install_fastd/handlers/main.yml
index e8051bc..01cff4d 100644
--- a/roles/install_fastd/handlers/main.yml
+++ b/roles/install_fastd/handlers/main.yml
@@ -4,7 +4,32 @@
       name: fastd@ffmyk.service
       state: reloaded
 
-- name: restart fastd
+- name: restart fastdaw
   systemd:
-      name: fastd@ffmyk.service
+      name: fastd@ffaw.service
+      state: restarted
+
+- name: restart fastdcoc
+  systemd:
+      name: fastd@ffcoc.service
+      state: restarted
+
+- name: restart fastdems
+  systemd:
+      name: fastd@ffems.service
+      state: restarted
+
+- name: restart fastdko
+  systemd:
+      name: fastd@ffko.service
+      state: restarted
+
+- name: restart fastdmy
+  systemd:
+      name: fastd@ffmy.service
+      state: restarted
+
+- name: restart fastdsim
+  systemd:
+      name: fastd@ffsim.service
       state: restarted
diff --git a/roles/install_fastd/tasks/main.yml b/roles/install_fastd/tasks/main.yml
index 4a0a131..8f01e47 100644
--- a/roles/install_fastd/tasks/main.yml
+++ b/roles/install_fastd/tasks/main.yml
@@ -6,77 +6,58 @@
       name: fastd
       tool: yaourt
 
-- name: create ffmyk folder
+- name: create site folder
   file:
-      path: /etc/fastd/ffmyk
+      path: /etc/fastd/ff{{ item.name }}
       state: directory
+  with_items: "{{ sites }}"
 
 - name: fastd.conf
   template:
       src: fastd.conf.j2
-      dest: /etc/fastd/ffmyk/fastd.conf
+      dest: /etc/fastd/ff{{ item.name }}/fastd.conf
       mode: 0640
-  notify: restart fastd
-
-- name: create backbone folder
-  file:
-      path: /etc/fastd/ffmyk/backbone
-      state: directory
-
-- name: add backbone peers
-  copy:
-      src: '{{ item }}'
-      dest: /etc/fastd/ffmyk/backbone/{{ item }}
-  with_items:
-      - fastd1
-      - fastd2
-      - fastd3
-      - fastd4
-      - fastd5
-      - fastd6
-      - fastd7
-      - fastd8
-      - fastd9
-      - fastd10
-      - fastd11
-      - fastd12
-      - fastd13
-      - fastd14
-      - fastd15
-  notify: reload fastd
+  notify: restart fastd{{ item.name }}
+  with_items: "{{ sites }}"
 
 - name: add fastd bin folder
   file:
-      path: /etc/fastd/ffmyk/bin
+      path: /etc/fastd/ff{{ item.name }}/bin
       state: directory
+  with_items: "{{ sites }}"
 
 - name: add fastd up script
   template:
       src: fastd_up.sh.j2
-      dest: /etc/fastd/ffmyk/bin/up.sh
+      dest: /etc/fastd/ff{{ item.name }}/bin/up.sh
       mode: 0744
-  notify: restart fastd
+  notify: restart fastd{{ item.name }}
+  with_items: "{{ sites }}"
 
 - name: add fastd peers folder
   file:
-      path: /etc/fastd/ffmyk/peers
+      path: /etc/fastd/ff{{ item.name }}/peers
       state: directory
+  with_items: "{{ sites }}"
 
 - name: add fastd peer api script
-  copy:
-      src: fastd-api.php
-      dest: /etc/fastd/ffmyk/bin/fastd-api.php
+  template:
+      src: fastd-api.php.j2
+      dest: /etc/fastd/ff{{ item.name }}/bin/fastd-api.php
+  with_items: "{{ sites }}"
 
 - name: setup cronjob for fastd-api
   cron:
-      name: fastd-api
+      name: fastd-api-{{ item.name }}
       minute: '*/10'
       user: root
       cron_file: fastd-api
-      job: '/usr/bin/php /etc/fastd/ffmyk/bin/fastd-api.php'
+      job: '/usr/bin/php /etc/fastd/ff{{ item.name }}/bin/fastd-api.php'
+  with_items: "{{ sites }}"
 
 - name: start and enable fastd service
   systemd:
-      name: fastd@ffmyk.service
+      name: fastd@ff{{ item.name }}.service
       enabled: yes
       state: started
+  with_items: "{{ sites }}"
diff --git a/roles/install_fastd/templates/fastd-api.php.j2 b/roles/install_fastd/templates/fastd-api.php.j2
new file mode 100644
index 0000000..7b1fc17
--- /dev/null
+++ b/roles/install_fastd/templates/fastd-api.php.j2
@@ -0,0 +1,45 @@
+#!/usr/bin/php -f
+<?php
+//$url = 'http://register.freifunk-myk.de/srvapi.php';
+$url = 'https://www.freifunk-myk.de/node/keys';
+$out = '/etc/fastd/ff{{ item.name }}/peers/';
+ 
+if(!is_dir($out)) die('Output Dir missing');
+if(!is_writable($out)) die('Output Dir perms');
+
+if( ($data = file_get_contents($url)) === FALSE ) die('Error getting keys');
+$data = unserialize($data);
+
+$active=array();
+ 
+foreach($data as $router) {
+        $router['MAC'] = trim($router['MAC']);
+        $router['PublicKey'] = trim($router['PublicKey']);
+	if(!preg_match('/^[A-F0-9]{2}:[A-F0-9]{2}:[A-F0-9]{2}:[A-F0-9]{2}:[A-F0-9]{2}:[A-F0-9]{2}$/', $router['MAC'])) {
+		//trigger_error('Router mit falscher MAC?!', E_USER_WARNING);
+	}elseif(!preg_match('/^[A-F0-9]{64}$/', $router['PublicKey'])) {
+		//trigger_error('Router mit falschem Key?!'.$router['MAC'], E_USER_WARNING);
+	}else{
+		$filename='client_'.str_replace(':', '-', $router['MAC']);
+		$fp=fopen($out.$filename, 'w');
+		fwrite($fp, 'key "'.$router['PublicKey'].'";'."\n");
+		fclose($fp);
+		$active[] = $filename;
+	}
+}
+
+//Check if we fscked up
+if(count($active) < 10) die('Less than 10 nodes? Database broken?'); 
+
+$dh = opendir($out);
+while(($file = readdir($dh)) !== false) {
+	if($file != '.' && $file != '..') {
+		if(!in_array($file, $active) && (strpos($file, 'client_') !== false)) {
+			unlink($out.$file);
+		}
+	}
+}
+ 
+exec('killall -SIGHUP fastd');
+ 
+?>
diff --git a/roles/install_fastd/templates/fastd.conf.j2 b/roles/install_fastd/templates/fastd.conf.j2
index 9d8a42b..1ec818d 100644
--- a/roles/install_fastd/templates/fastd.conf.j2
+++ b/roles/install_fastd/templates/fastd.conf.j2
@@ -1,18 +1,16 @@
 log to syslog level info;
-interface "ffmyk-mesh-vpn";
+interface "vpn{{ item.name }}";
 method "salsa2012+gmac";
 method "salsa2012+umac";
 secure handshakes yes;
-bind any:10000;
+bind any:{{ item.fastd_port1 }};
 hide ip addresses yes;
 hide mac addresses yes;
 mtu 1280;
 peer group "clients" {
 	include peers from "peers";
-	peer limit {{ fastd_peer_limit }};
 }
-include peers from "backbone";
-secret "{{ fastd_secret }}";
-on up "/etc/fastd/ffmyk/bin/up.sh $INTERFACE";
-status socket "/run/ffmyk.socket";
+secret "{{ item.fastd_secret }}";
+on up "/etc/fastd/ff{{ item.name }}/bin/up.sh $INTERFACE";
+status socket "/run/ff{{ item.name }}1.socket";
 
diff --git a/roles/install_fastd/templates/fastd_up.sh.j2 b/roles/install_fastd/templates/fastd_up.sh.j2
index 87b71ce..6ab39b0 100644
--- a/roles/install_fastd/templates/fastd_up.sh.j2
+++ b/roles/install_fastd/templates/fastd_up.sh.j2
@@ -1,11 +1,11 @@
 #!/bin/bash
-ip link set address {{ fastd_mesh_mac }} dev $1
+ip link set address {{ item.fastd_mesh_mac }} dev $1
 ip link set up dev $1
-batctl -m bat0 if add $1
-batctl -m bat0 gw server 1000000/1000000
-batctl -m bat0 it 10000
-batctl -m bat0 mm 1
-echo 128 > /sys/class/net/bat0/mesh/hop_penalty
-netctl start bat0
+batctl -m bat{{ item.name }} if add $1
+batctl -m bat{{ item.name }} gw server 1000000/1000000
+batctl -m bat{{ item.name }} it 10000
+batctl -m bat{{ item.name }} mm 1
+echo 64 > /sys/class/net/bat0/mesh/hop_penalty
+netctl start bat{{ item.name }}
 systemctl restart dhcpd4.service
 systemctl restart named.service
-- 
cgit v1.2.3-54-g00ecf