Переглянути джерело

More work to get meshviewer compiled on the server and ffmap-backend to run on all supported OS

Till Klocke 9 роки тому
батько
коміт
03d738f169

+ 2 - 1
roles/ffmap-backend/defaults/main.yml

@@ -4,4 +4,5 @@ ffmap_backend_repo_url: https://github.com/ffnord/ffmap-backend.git
 ffmap_backend_version: v2
 ffmap_backend_version: v2
 ffmap_backend_install_dir: /opt/ffmap-backend
 ffmap_backend_install_dir: /opt/ffmap-backend
 ffmap_backend_data_dir: /srv/ffmap-data
 ffmap_backend_data_dir: /srv/ffmap-data
-ffmap_backend_prune_days: 14
+ffmap_backend_prune_days: 14
+ffmap_backend_pip_executable: pip3

+ 7 - 0
roles/ffmap-backend/tasks/main.yml

@@ -3,10 +3,17 @@
 
 
 - include_vars: "{{ ansible_os_family }}.yml"
 - include_vars: "{{ ansible_os_family }}.yml"
 
 
+- include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
+  when: ansible_distribution == 'Debian' and ansible_distribution_release == 'wheezy'
+
 - name: Install ffmap-backend dependencies
 - name: Install ffmap-backend dependencies
   apt: name={{item}} state=present
   apt: name={{item}} state=present
   with_items: "{{ffmap_backend_dependencies}}"
   with_items: "{{ffmap_backend_dependencies}}"
 
 
+- name: Install ffmap-backend python dependencies
+  pip: name={{item}} executable="{{ffmap_backend_pip_executable}}"
+  with_items: "{{ffmap_backend_python_dependencies}}"
+
 - name: Create install directory for ffmap-backend
 - name: Create install directory for ffmap-backend
   file: dest={{ffmap_backend_install_dir}} state=directory
   file: dest={{ffmap_backend_install_dir}} state=directory
 
 

+ 1 - 0
roles/ffmap-backend/vars/Debian-wheezy.yml

@@ -0,0 +1 @@
+ffmap_backend_pip_executable: pip-3.2

+ 5 - 2
roles/ffmap-backend/vars/Debian.yml

@@ -1,4 +1,7 @@
 ffmap_backend_dependencies:
 ffmap_backend_dependencies:
 - python3
 - python3
-- python3-networkx
-- rrdtool
+- python3-pip
+- rrdtool
+
+ffmap_backend_python_dependencies:
+- networkx

+ 1 - 0
roles/meshviewer/meta/main.yml

@@ -51,3 +51,4 @@ galaxy_info:
   - web
   - web
 dependencies:
 dependencies:
 - ffmap-backend
 - ffmap-backend
+- laggyluke.nodejs

+ 4 - 0
roles/meshviewer/tasks/main.yml

@@ -7,6 +7,10 @@
   apt: name={{item}} state=present
   apt: name={{item}} state=present
   with_items: "{{meshviewer_build_dependencies}}"
   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
 - name: Create meshviewer install directory
   file: name={{meshviewer_install_directory}} state=directory
   file: name={{meshviewer_install_directory}} state=directory
 
 

+ 0 - 1
roles/meshviewer/vars/Debian.yml

@@ -1,3 +1,2 @@
 meshviewer_build_dependencies:
 meshviewer_build_dependencies:
-- npm
 - ruby-sass
 - ruby-sass