From 301dc1ecb5acd5fdf16d373cd6dd0bf94dc119a2 Mon Sep 17 00:00:00 2001
From: Ansible Admin <roman@katrincak.de>
Date: Tue, 3 Jul 2018 23:10:50 +0200
Subject: [PATCH] Batman-adv fixes for Ubuntu 16.04

---
 install.sn.yml | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/install.sn.yml b/install.sn.yml
index 63fafcc..931c20e 100644
--- a/install.sn.yml
+++ b/install.sn.yml
@@ -10,7 +10,7 @@
   gather_facts: False
   vars:
     snversion: master_v3.0.16
-    batmanversion: v2015.2
+    batmanversion: v2017.4
     common_required_packages:
       - git
       - make
@@ -41,6 +41,9 @@
       - psmisc
       - dnsutils
       - ntp
+      - libnl-genl-3-dev
+      - virtualenv
+      - linux-image-extra-4.4.0-127-generic
     modules_required:
       - batman-adv
       - nf_conntrack_netlink
@@ -118,14 +121,14 @@
       register: aptupdates
     - name: Set clock
       shell: /etc/init.d/ntp stop && /usr/sbin/ntpd -q -g && /etc/init.d/ntp start
-    - name: Add modules
-      lineinfile: dest=/etc/modules line={{ item }}
-      with_items: modules_required
-      register: modules_req
-    - name: Load modules
-      modprobe: name={{ item }}
-      with_items: modules_required
-      when: modules_req.changed
+#    - name: Add modules
+#      lineinfile: dest=/etc/modules line={{ item }}
+#      with_items: modules_required
+#      register: modules_req
+#    - name: Load modules
+#      modprobe: name={{ item }}
+#      with_items: modules_required
+#      when: modules_req.changed
     - name: Install Linux headers
       shell: >
         apt-get install linux-headers-$(uname -r) -y
@@ -179,6 +182,16 @@
       copy: src=./files/{{ item }} dest=/etc/systemd/system owner=root group=root mode=0444
       with_items: tunneldigger_service
       when: tunneldigger.changed
+##########
+    - name: Add modules
+      lineinfile: dest=/etc/modules line={{ item }}
+      with_items: modules_required
+      register: modules_req
+    - name: Load modules
+      modprobe: name={{ item }}
+      with_items: modules_required
+      when: modules_req.changed
+#########
     - name: Tunneldigger reload
       command: "{{item}}"
       with_items:
@@ -308,11 +321,8 @@
       poll: 0
       ignore_errors: true
       when: tunneldigger.changed
-    - file:
-      path: /etc/logrotate.conf 
-      owner: root
-      group: root
-      mode: 0644
+    - name: Logrotate rights
+      file: path=/etc/logrotate.conf mode=0644 owner=root group=root
     - name: Change root password
       user: name=root password={{ sn_rootpasswd }}
     - name: Wirte version information