Fixed some small issues in the meshviewer role

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/meshviewer/vars/Debian.yml

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

roles/internal/meshviewer/vars/main.yml

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