瀏覽代碼

This is one of the bad commits. Just lots of changes to get this working

Till Klocke 9 年之前
父節點
當前提交
b9e9053cca

+ 2 - 4
roles/ff-supernode/tasks/main.yml

@@ -39,7 +39,5 @@
   git: repo={{supernode_freifunk_tools_repo}} dest={{supernode_freifunk_tools_dir}}
 
 - name: Install nodeinfo cron job
-  cron: 
-    name: nodeinfo.py 
-    job: "{{supernode_freifunk_tools_dir}}/nodeinfo/nodeinfo.py | gzip | alfred -s 158"
-    user: root
+  template: src=nodeinfo.cron.j2 dest=/etc/cron.d/nodeinfo
+  notify: Restart cron

+ 1 - 0
roles/ff-supernode/vars/main.yml

@@ -1,5 +1,6 @@
 ---
 # vars file for ff-supernode
+fastd_use_rng: true
 
 dhcp_interfaces: bat0
 dhcp_common_default_lease_time: 600

+ 1 - 3
roles/supernode-interfaces/handlers/main.yml

@@ -1,4 +1,2 @@
 ---
-# handlers file for supernode-interfaces
-- name: Restart network
-  shell: ifdown --exclude=lo --exclude="{{supernode_public_interface}}" -a && ifup --exclude=lo --exclude="{{supernode_public_interface}}" -a
+# handlers file for supernode-interfaces

+ 1 - 1
roles/supernode-interfaces/tasks/debian.yml

@@ -14,4 +14,4 @@
 
 - name: Restart network
   when: network_template_installed|changed
-  shell: "ifdown --exclude=lo --exclude=eth0 -a && ifup --exclude=lo --exclude=eth0 -a"
+  shell: "ifdown --exclude=lo --exclude={{supernode_public_interface}} -a && ifup --exclude=lo --exclude={{supernode_public_interface}} -a"

+ 2 - 0
test/application/supernode_pkg_vars.yml

@@ -61,6 +61,7 @@ fastd_instances:
     peer_limit: 125
     mtu: 1280
     status_socket: /tmp/fastd00.sock
+    peer_dir: /etc/fastd/do00/dummy
     on_up_script: |
       ip link set up $INTERFACE
       batctl if add $INTERFACE
@@ -75,6 +76,7 @@ fastd_instances:
     peer_limit: 125
     mtu: 1280
     status_socket: /tmp/fastd01.sock
+    peer_dir: /etc/fastd/do01/dummy
     on_up_script: |
       ip link set up $INTERFACE
       batctl if add $INTERFACE

+ 0 - 1
test/integration/supernode/serverspec/test_spec.rb

@@ -2,7 +2,6 @@ require 'serverspec'
 
 describe cron do
   it { should have_entry '*/5 * * * * wget -q -O /etc/fastd/fastd-blacklist.json https://raw.githubusercontent.com/ffruhr/fastdbl/master/fastd-blacklist.json' }
-  it { should have_entry '* * * * * /src/ff-tools/nodeinfo/nodeinfo.py | gzip | alfred -s 158'}
 end
 
 describe user('fritz') do