Merge branch 'master' of github.com:ffdo/ffdo-ansible

roles/internal/ffdo.mapserver/meta/main.yml

@@ -19,4 +19,4 @@ galaxy_info:
   - web
 dependencies:
 - ffdo.mapserver-nginx
-- meshviewer
+- ffdo.meshviewer

roles/internal/meshviewer/defaults/main.yml

@@ -1,9 +1,9 @@
 ---
 # defaults file for meshviewer
 
-meshviewer_version: v3
+meshviewer_version: v4
 meshviewer_archive_name: "meshviewer-{{meshviewer_version}}.tar.gz"
-meshviewer_repo: https://github.com/tcatm/meshviewer.git
+meshviewer_repo: https://github.com/ffnord/meshviewer.git
 meshviewer_download_url: "http://draic.info/meshviewer/{{meshviewer_archive_name}}"
 meshviewer_install_directory: /srv/meshviewer
 meshviewer_build_directory: /usr/src/meshviewer

roles/internal/meshviewer/tasks/main.yml

@@ -1,16 +1,10 @@
 ---
 # tasks file for meshviewer
 
-- include_vars: "{{ ansible_os_family}}.yml"
-
 - name: Install build dependencies
   apt: name={{item}} state=present
   with_items: "{{meshviewer_build_dependencies}}"
 
-#- name: Fix annoying bug debians node package
-#  when: ansible_os_family == 'Debian'
-#  file: dest=/usr/bin/node src=/usr/bin/nodejs state=link
-
 - name: Create meshviewer install directory
   file: name={{meshviewer_install_directory}} state=directory
 
@@ -35,15 +29,6 @@
   args:
     chdir: "{{meshviewer_build_directory}}"
 
-- name: Install frontend dependencies
-  command: node_modules/.bin/bower --allow-root --config.interactive=false install
-  args:
-    chdir: "{{meshviewer_build_directory}}/"
-    creates: "{{meshviewer_build_directory}}/bower_components"
-
-- name: Install build config
-  template: src=config.js.j2 dest="{{meshviewer_build_directory}}/config.js"
-
 - name: Build meshviewer
   command: node_modules/.bin/grunt
   args:
@@ -51,4 +36,7 @@
     creates: "{{meshviewer_build_directory}}/build"
 
 - name: Copy meshviewer into install directory
-  shell: cp -r {{meshviewer_build_directory}}/build/* {{meshviewer_install_directory}}
+  shell: cp -r {{meshviewer_build_directory}}/build/* {{meshviewer_install_directory}}
+
+- name: Install build config
+  template: src=config.js.j2 dest="{{meshviewer_build_directory}}/config.js"

roles/internal/ffdo.meshviewer/vars/main.yml

@@ -0,0 +1,6 @@
+---
+# vars file for meshviewer
+
+meshviewer_build_dependencies:
+- ruby-sass
+- git

roles/internal/ffdo.supernode/vars/main.yml

@@ -1,62 +1,3 @@
 ---
 # vars file for ff-supernode
 fastd_use_rng: true
-
-dhcp_interfaces: bat0
-dhcp_common_default_lease_time: 600
-dhcp_common_max_lease_time: 7200
-dhcp_common_ddns_update_style: none
-dhcp_common_authoritative: true
-dhcp_common_log_facility: local7
-dhcp_common_options:
-  - wpad code 252 = text
-  - 'wpad "\n\000"'
-  - interface-mtu 1280
-dhcp_subnets:
-  - base: "{{supernode_mesh_ipv4|ipaddr('network')}}"
-    netmask: "{{supernode_mesh_ipv4|ipaddr('netmask')}}"
-    routers: "{{supernode_mesh_ipv4|ipaddr('address')}}"
-    range_start: "{{supernode_dhcp_range_start}}"
-    range_end: "{{supernode_dhcp_range_end}}"
-    domain_nameservers: "{{supernode_mesh_ipv4|ipaddr('address')}}, {{supernode_other_nameserver}}"
-    ntp_servers: "{{supernode_mesh_ipv4|ipaddr('address')}}, {{supernode_other_ntp_server}}"
-dhcp_classes:
-  - name: MSFT
-    rule: 'match if substring(option vendor-class-identifier, 0, 4) = "MSFT"'
-    options:
-      - opt: 'dhcp-parameter-request-list = concat(option dhcp-parameter-request-list, fc)'
-
-radvd_default_interface: 'bat0'
-radvd_default_interface_options: |
-  AdvSendAdvert on;
-  IgnoreIfMissing on;
-  MaxRtrAdvInterval 600;
-  MinDelayBetweenRAs 10;
-  AdvLinkMTU 1280;
-  prefix {{supernode_mesh_ipv6|ipaddr('subnet')}}
-  {
-  };
-  RDNSS {{supernode_mesh_ipv6|ipaddr('address')}} 
-  {
-  };
-
-unbound_configuration:
-    - verbosity: 1
-    - do-ip4: "yes"
-    - do-ip6: "yes"
-    - num-threads: 1
-    - pidfile: "/var/run/unbound.pid"
-    - logfile: "{{unbound_logfile}}"
-    - module-config: '"iterator"'
-
-unbound_forward_zone_active : true
-unbound_forward_zone:
-  - 151.80.64.190
-  - 85.14.255.33
-unbound_interfaces:
-  - 0.0.0.0
-  - ::0
-unbound_access_control:
-  - 10.233.0.0/16 allow
-  - "2a03:2260:50:5::/64 allow"
-  - "fe80::/10 allow"

roles/internal/meshviewer/vars/Debian.yml

@@ -1,2 +0,0 @@
-meshviewer_build_dependencies:
-- ruby-sass

roles/internal/meshviewer/vars/main.yml

@@ -1,2 +0,0 @@
----
-# vars file for meshviewer