Преглед на файлове

Removed support for unnecessary operating systems

Till Klocke преди 9 години
родител
ревизия
f2ac13bd8e

+ 1 - 1
roles/internal/ff-supernode/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 # defaults file for ff-supernode
-supernode_local_ip: ansible_default_ipv4.address
+supernode_local_ip: "{{ansible_default_ipv4.address}}"
 supernode_freifunk_tools_repo: https://github.com/ffrl/ff-tools.git
 supernode_freifunk_tools_dir: /src/ff-tools
 supernode_pip_executable: pip3

+ 1 - 1
roles/internal/ff-supernode/tasks/debian.yml

@@ -1,7 +1,7 @@
 - name: Remove resolvconf from Ubunut
   when: ansible_distribution == 'Ubuntu'
   apt: name=resolvconf state=absent
-  
+
 - name: Install custom resolv.conf
   template: src=resolv.conf.j2 dest=/etc/resolv.conf
 

+ 17 - 4
roles/internal/ff-supernode/tasks/main.yml

@@ -4,11 +4,24 @@
 - include_vars: "{{ ansible_distribution }}-{{ansible_distribution_release }}.yml"
   when: ansible_distribution_release == 'wheezy' and ansible_distribution == 'Debian'
 
-- include: debian.yml
-  when: ansible_distribution == 'Debian'
+- name: Install custom resolv.conf
+  template: src=resolv.conf.j2 dest=/etc/resolv.conf
 
-- include: debian.yml
-  when: ansible_distribution == 'Ubuntu'
+- name: Make sure necessary tools are installed
+  apt: name={{item}} state=present
+  with_items:
+  - wget
+  - ntp
+  - git
+
+- name: Install dependencies for ffrl tools
+  apt: name={{item}}
+  with_items:
+  - python3
+  - python3-pip
+
+- name: Start and enable supervisor
+  service: name=supervisor state=started enabled=yes
 
 - name: Install crontab to update the blacklist
   cron:

+ 0 - 1
roles/internal/ff-supernode/vars/Debian-wheezy.yml

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