Просмотр исходного кода

Remove legacy alfred and ffmap-backend

Markus Lindenberg 9 лет назад
Родитель
Сommit
c761254b27
66 измененных файлов с 4 добавлено и 963 удалено
  1. 0 2
      roles/external/dereulenspiegel.alfred-json/.gitignore
  2. 0 32
      roles/external/dereulenspiegel.alfred-json/.kitchen.yml
  3. 0 23
      roles/external/dereulenspiegel.alfred-json/.travis.yml
  4. 0 7
      roles/external/dereulenspiegel.alfred-json/Gemfile
  5. 0 47
      roles/external/dereulenspiegel.alfred-json/README.md
  6. 0 6
      roles/external/dereulenspiegel.alfred-json/defaults/main.yml
  7. 0 2
      roles/external/dereulenspiegel.alfred-json/handlers/main.yml
  8. 0 1
      roles/external/dereulenspiegel.alfred-json/meta/.galaxy_install_info
  9. 0 18
      roles/external/dereulenspiegel.alfred-json/meta/main.yml
  10. 0 27
      roles/external/dereulenspiegel.alfred-json/tasks/main.yml
  11. 0 2
      roles/external/dereulenspiegel.alfred-json/test/ansible.cfg
  12. 0 7
      roles/external/dereulenspiegel.alfred-json/test/application/alfred-json.yml
  13. 0 7
      roles/external/dereulenspiegel.alfred-json/test/application/alfred-json_travis.yml
  14. 0 10
      roles/external/dereulenspiegel.alfred-json/test/integration/alfred-json/serverspec/test_spec.rb
  15. 0 1
      roles/external/dereulenspiegel.alfred-json/test/local.ini
  16. 0 17
      roles/external/dereulenspiegel.alfred-json/test/run_vagrant_kitchen.sh
  17. 0 98
      roles/external/dereulenspiegel.alfred-json/test/travis_run.py
  18. 0 8
      roles/external/dereulenspiegel.alfred-json/vars/Debian.yml
  19. 0 2
      roles/external/dereulenspiegel.alfred-json/vars/main.yml
  20. 0 2
      roles/external/dereulenspiegel.alfred/.gitignore
  21. 0 36
      roles/external/dereulenspiegel.alfred/.kitchen.yml
  22. 0 23
      roles/external/dereulenspiegel.alfred/.travis.yml
  23. 0 7
      roles/external/dereulenspiegel.alfred/Gemfile
  24. 0 50
      roles/external/dereulenspiegel.alfred/README.md
  25. 0 10
      roles/external/dereulenspiegel.alfred/defaults/main.yml
  26. 0 5
      roles/external/dereulenspiegel.alfred/handlers/main.yml
  27. 0 1
      roles/external/dereulenspiegel.alfred/meta/.galaxy_install_info
  28. 0 20
      roles/external/dereulenspiegel.alfred/meta/main.yml
  29. 0 15
      roles/external/dereulenspiegel.alfred/tasks/debian.yml
  30. 0 60
      roles/external/dereulenspiegel.alfred/tasks/main.yml
  31. 0 10
      roles/external/dereulenspiegel.alfred/templates/alfred.service.j2
  32. 0 10
      roles/external/dereulenspiegel.alfred/templates/batadv-vis.service.j2
  33. 0 20
      roles/external/dereulenspiegel.alfred/templates/libcap.patch.j2
  34. 0 2
      roles/external/dereulenspiegel.alfred/test/ansible.cfg
  35. 0 10
      roles/external/dereulenspiegel.alfred/test/application/alfred_all.yml
  36. 0 10
      roles/external/dereulenspiegel.alfred/test/application/alfred_pure.yml
  37. 0 10
      roles/external/dereulenspiegel.alfred/test/application/alfred_travis.yml
  38. 0 29
      roles/external/dereulenspiegel.alfred/test/integration/alfred_all/serverspec/alfred_spec.rb
  39. 0 27
      roles/external/dereulenspiegel.alfred/test/integration/alfred_pure/serverspec/test_spec.rb
  40. 0 1
      roles/external/dereulenspiegel.alfred/test/local.ini
  41. 0 17
      roles/external/dereulenspiegel.alfred/test/run_vagrant_kitchen.sh
  42. 0 98
      roles/external/dereulenspiegel.alfred/test/travis_run.py
  43. 0 11
      roles/external/dereulenspiegel.alfred/vars/Debian-jessie.yml
  44. 0 11
      roles/external/dereulenspiegel.alfred/vars/Debian-wheezy.yml
  45. 0 11
      roles/external/dereulenspiegel.alfred/vars/Ubuntu-precise.yml
  46. 0 11
      roles/external/dereulenspiegel.alfred/vars/Ubuntu-trusty.yml
  47. 0 2
      roles/external/dereulenspiegel.alfred/vars/main.yml
  48. 1 1
      roles/external/dereulenspiegel.fastd/meta/.galaxy_install_info
  49. 1 1
      roles/external/jdauphant.nginx/meta/.galaxy_install_info
  50. 1 1
      roles/external/usermanage/meta/.galaxy_install_info
  51. 0 38
      roles/internal/ffdo.ffmap-backend/README.md
  52. 0 8
      roles/internal/ffdo.ffmap-backend/defaults/main.yml
  53. 0 2
      roles/internal/ffdo.ffmap-backend/handlers/main.yml
  54. 0 20
      roles/internal/ffdo.ffmap-backend/meta/main.yml
  55. 0 24
      roles/internal/ffdo.ffmap-backend/tasks/main.yml
  56. 0 2
      roles/internal/ffdo.ffmap-backend/templates/ffmap-backend.cron.j2
  57. 0 1
      roles/internal/ffdo.ffmap-backend/vars/Debian-wheezy.yml
  58. 0 7
      roles/internal/ffdo.ffmap-backend/vars/Debian.yml
  59. 0 2
      roles/internal/ffdo.ffmap-backend/vars/main.yml
  60. 0 1
      roles/internal/ffdo.mapserver/meta/main.yml
  61. 1 7
      roles/internal/ffdo.mesh-interfaces/templates/mesh_interfaces.j2
  62. 0 1
      roles/internal/ffdo.meshviewer/meta/main.yml
  63. 0 1
      roles/internal/ffdo.supernode/meta/main.yml
  64. 0 2
      roles/internal/ffdo.supernode/tasks/main.yml
  65. 0 2
      roles/internal/ffdo.supernode/templates/nodeinfo.cron.j2
  66. 0 6
      roles/thirdparty_roles.yml

+ 0 - 2
roles/external/dereulenspiegel.alfred-json/.gitignore

@@ -1,2 +0,0 @@
-.kitchen/
-secrets

+ 0 - 32
roles/external/dereulenspiegel.alfred-json/.kitchen.yml

@@ -1,32 +0,0 @@
----
-driver:
-  name: vagrant
-
-provisioner:
-    name               : ansible_push
-    verbose            : "vvvv"
-    ansible_config     : "test/ansible.cfg"
-    idempotency_test   : False
-    sudo               : True
-    #chef_bootstrap_url : False
-    #extra_vars        : "@kitchen_vars.yml"
-
-platforms:
-    - name: Ubuntu-precise
-      driver:
-        box: ubuntu/precise64
-    - name: Debian-jessie
-      driver:
-        box: debian/jessie64
-    - name: Debian-wheezy
-      driver:
-        box: debian/wheezy64
-    - name: Ubuntu-trusty
-      driver:
-        box: ubuntu/trusty64
-
-suites:
-  - name: alfred-json
-    provisioner:
-      playbook: "test/application/alfred-json.yml"
-      extra_vars: {'kitchen_connection': 'smart'}

+ 0 - 23
roles/external/dereulenspiegel.alfred-json/.travis.yml

@@ -1,23 +0,0 @@
----
-language: python
-python: "2.7"
-
-before_install:
-  # Make sure everything's up to date.
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq python-apt python-pycurl git python-pip ruby ruby-dev build-essential autoconf
-  - gem install bundler
-
-install:
-  - sudo pip install ansible
-
-
-script:
-    #- cd test
-    - ansible --version
-    - bundle install
-    - KITCHEN_YAML=.kitchen.travis.yml bundle exec kitchen test travis
-
-
-after_success:
-    - echo "Success"

+ 0 - 7
roles/external/dereulenspiegel.alfred-json/Gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gem "test-kitchen"
-gem "kitchen-ansiblepush"
-gem "kitchen-ansible"
-gem "kitchen-vagrant"
-gem "kitchen-localhost"

+ 0 - 47
roles/external/dereulenspiegel.alfred-json/README.md

@@ -1,47 +0,0 @@
-alfred-json [![Build Status](https://travis-ci.org/dereulenspiegel/ansible-alfred-json.svg)](https://travis-ci.org/dereulenspiegel/ansible-alfred-json)
-=========
-
-This role simply compiles and installs [alfred-json](https://github.com/tcatm/alfred-json).
-
-Requirements
-------------
-
-None, except ansible and a Debian based host.
-
-Role Variables
---------------
-
-## Default Variables
-
-None of these need to be modified, but is is possible to modify them to suit your needs (i.e. build your custom fork)
-
-Name | Default | Description
----- | ------- | -----------
-alfred_json_repo_url | https://github.com/tcatm/alfred-json.git | The git url to clone alfred-json from
-alfred_json_version | v0.3.1 | Branch or tag to checkout after cloning
-alfred_json_src_dir | /usr/src/alfred-json | Where to clone the sources
-alfred_json_build_dir | /usr/src/alfred-json-build | CMake build dir
-
-Dependencies
-------------
-
-None
-
-Example Playbook
-----------------
-
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
-    - hosts: servers
-      roles:
-         - { role: dereulenspiegel.alfred-json }
-
-License
--------
-
-MIT
-
-Author Information
-------------------
-
-Till Klocke [dereulenspiegel](https://twitter.com/dereulenspiegel)

+ 0 - 6
roles/external/dereulenspiegel.alfred-json/defaults/main.yml

@@ -1,6 +0,0 @@
----
-# defaults file for alfred-json
-alfred_json_repo_url: https://github.com/tcatm/alfred-json.git
-alfred_json_version: v0.3.1
-alfred_json_src_dir: /usr/src/alfred-json
-alfred_json_build_dir: /usr/src/alfred-json-build

+ 0 - 2
roles/external/dereulenspiegel.alfred-json/handlers/main.yml

@@ -1,2 +0,0 @@
----
-# handlers file for alfred-json

+ 0 - 1
roles/external/dereulenspiegel.alfred-json/meta/.galaxy_install_info

@@ -1 +0,0 @@
-{install_date: 'Wed Dec 30 00:33:14 2015', version: v1.0}

+ 0 - 18
roles/external/dereulenspiegel.alfred-json/meta/main.yml

@@ -1,18 +0,0 @@
----
-galaxy_info:
-  author: Till Klocke
-  description: Installs alfred-json
-  company: Freifunk Dortmund
-  license: MIT
-  min_ansible_version: 1.2
-  platforms:
-  - name: Ubuntu
-    versions:
-    - all
-  - name: Debian
-    versions:
-    - all
-  categories:
-  - monitoring
-  - networking
-dependencies: []

+ 0 - 27
roles/external/dereulenspiegel.alfred-json/tasks/main.yml

@@ -1,27 +0,0 @@
----
-# tasks file for alfred-json
-
-- include_vars: "{{ ansible_os_family }}.yml"
-
-- name: Install build dependencies
-  apt: name={{item}} state=present
-  with_items: "{{alfred_json_build_deps}}"
-
-- name: Create directories for clone and build
-  file: dest={{item}} state=directory
-  with_items:
-  - "{{alfred_json_src_dir}}"
-  - "{{alfred_json_build_dir}}"
-
-- name: Clone alfred-json repo
-  git: dest={{alfred_json_src_dir}} repo={{alfred_json_repo_url}} version={{alfred_json_version}}
-
-- name: Cmake alfred-json
-  shell: cmake {{alfred_json_src_dir}}
-  args:
-    chdir: "{{alfred_json_build_dir}}"
-
-- name: Build and install alfred-json
-  shell: make && make install
-  args:
-    chdir: "{{alfred_json_build_dir}}"

+ 0 - 2
roles/external/dereulenspiegel.alfred-json/test/ansible.cfg

@@ -1,2 +0,0 @@
-[defaults]
-roles_path=../:../../:/spec/

+ 0 - 7
roles/external/dereulenspiegel.alfred-json/test/application/alfred-json.yml

@@ -1,7 +0,0 @@
----
-- name         : Install alfred-json from source
-  hosts        : all
-  gather_facts : yes
-  connection   : "{{ kitchen_connection | default('local') }}"
-  roles        :
-                 - "ansible-alfred-json"

+ 0 - 7
roles/external/dereulenspiegel.alfred-json/test/application/alfred-json_travis.yml

@@ -1,7 +0,0 @@
----
-- name         : Install alfde-json from source on Travis CI
-  hosts        : localhost
-  gather_facts : yes
-  connection   : "{{ kitchen_connection | default('local') }}"
-  roles        :
-                 - "ansible-alfred-json"

+ 0 - 10
roles/external/dereulenspiegel.alfred-json/test/integration/alfred-json/serverspec/test_spec.rb

@@ -1,10 +0,0 @@
-require 'serverspec'
-
-# Required by serverspec
-set :backend, :exec
-
-describe file('/usr/local/bin/alfred-json') do
-  it { should be_file }
-  it { should be_readable }
-  it { should be_executable }
-end

+ 0 - 1
roles/external/dereulenspiegel.alfred-json/test/local.ini

@@ -1 +0,0 @@
-localhost ansible_connection='local'

+ 0 - 17
roles/external/dereulenspiegel.alfred-json/test/run_vagrant_kitchen.sh

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-set -e
-echo "**** Box setup ***"
-
-echo "* mkdir /kitchen"
-mkdir -p /kitchen
-
-#echo "* cp -ar /mnt/shared /kitchen"
-#cp -r /mnt/shared/. /kitchen
-echo "* ln -sf /mnt/shared /kitchen"
-ln -sf /mnt/shared/* /kitchen/
-
-echo "* cd /kitchen"
-cd /kitchen/*
-
-echo "* python test/travis_run.py"
-python test/travis_run.py

+ 0 - 98
roles/external/dereulenspiegel.alfred-json/test/travis_run.py

@@ -1,98 +0,0 @@
-#!/usr/bin/env python
-# https://github.com/ahelal/travis-in-box
-
-import yaml
-import subprocess
-import sys
-import os.path
-
-
-class TravisExec(object):
-    def __init__(self, filename="travis.yml"):
-        self.fail = False
-        stream = open(filename, 'r')
-        yaml_file = yaml.load(stream)
-        # language
-        self.language = yaml_file.get("language", None)
-
-        # Section
-        self.section_before_install = yaml_file.get("before_install", None)
-        self.section_install = yaml_file.get("install", None)
-        self.section_before_script = yaml_file.get("before_script", None)
-        self.section_script = yaml_file.get("script", None)
-
-        #self.section_after_script = yaml_file.get("after_script", None)
-        self.section_after_failure = yaml_file.get("after_failure", None)
-        self.section_after_success = yaml_file.get("after_success", None)
-
-    def _setup(self):
-        if self.language == "python":
-            print "********** Setup Python  **********"
-            print ""
-            # Since we are not using container we have to install various lang our self
-            # So this is probably not the best way to do it
-            self._execute_command(["sudo apt-get install python-setuptools python-pip -y"])
-        else:
-            print "Errors unsupported language {}".format(self.language)
-            exit(1)
-
-    def life_cycle(self):
-        # See http://docs.travis-ci.com/user/build-configuration/
-
-            # 1. setup language
-            self._setup()
-            # 4. Run before_install commands
-            self.run_command("before_install", self.section_before_install, self.section_after_failure)
-            # 5. Run install commands
-            self.run_command("install", self.section_install, self.section_after_failure)
-            # 6. Run before_script commands
-            self.run_command("before_script", self.section_before_script, self.section_after_failure)
-            # 7. Run test script commands
-            self.run_command("script", self.section_script, self.section_after_failure)
-            # 8 . if we reach this point we made it run after_success
-            self.run_command("after_success", self.section_after_success, None)
-
-    @staticmethod
-    def _execute_command(command):
-        new_command = ["echo '> " + item.rstrip('\n') + "' && { " + item.rstrip('\n') + " ; }" for item in command]
-        new_command = " && ".join(new_command)
-
-        p = subprocess.Popen(new_command, shell=True, stderr=subprocess.PIPE)
-        while True:
-            out = p.stderr.read(1)
-            if out == '' and p.poll() is not None:
-                break
-            if out != '':
-                sys.stdout.write(out)
-                sys.stdout.flush()
-        print ""
-        return p.returncode
-
-    def run_command(self, section_name=None, command=None, execute_on_failure=None):
-        if command:
-            print ""
-            print "********** Running '{}' **********".format(section_name)
-            return_code = self._execute_command(command)
-            if return_code != 0:
-                print ""
-                print "********** Failed in '{}' **********".format(section_name)
-                if execute_on_failure:
-                    print ""
-                    print "********** Running after_failure  **********".format(section_name)
-                    self._execute_command(execute_on_failure)
-                    exit(1)
-
-filename = None
-if len(sys.argv) == 1:
-    filename = ".travis.yml"
-elif len(sys.argv) == 2:
-    filename = sys.argv[1]
-else:
-    print "Invalid number of arguments"
-    exit(1)
-
-if os.path.exists(filename):
-    TravisExec(filename).life_cycle()
-else:
-    print "Could not file travis file '{}'".format(filename)
-    exit(1)

+ 0 - 8
roles/external/dereulenspiegel.alfred-json/vars/Debian.yml

@@ -1,8 +0,0 @@
-alfred_json_build_deps:
-- cmake
-- build-essential
-- git
-- libjansson-dev
-- libjansson4
-- zlib1g-dev
-- pkg-config

+ 0 - 2
roles/external/dereulenspiegel.alfred-json/vars/main.yml

@@ -1,2 +0,0 @@
----
-# vars file for alfred-json

+ 0 - 2
roles/external/dereulenspiegel.alfred/.gitignore

@@ -1,2 +0,0 @@
-.kitchen/
-secrets

+ 0 - 36
roles/external/dereulenspiegel.alfred/.kitchen.yml

@@ -1,36 +0,0 @@
----
-driver:
-  name: vagrant
-
-provisioner:
-    name               : ansible_push
-    verbose            : "vvvv"
-    ansible_config     : "test/ansible.cfg"
-    idempotency_test   : False
-    sudo               : True
-    #chef_bootstrap_url : False
-    #extra_vars        : "@kitchen_vars.yml"
-
-platforms:
-    - name: Ubuntu-precise
-      driver:
-        box: ubuntu/precise64
-    - name: Debian-jessie
-      driver:
-        box: debian/jessie64
-    - name: Debian-wheezy
-      driver:
-        box: debian/wheezy64
-    - name: Ubuntu-trusty
-      driver:
-        box: ubuntu/trusty64
-
-suites:
-  - name: alfred_all
-    provisioner:
-      playbook: "test/application/alfred_all.yml"
-      extra_vars: {'kitchen_connection': 'smart'}
-  - name: alfred_pure
-    provisioner:
-      playbook: "test/application/alfred_pure.yml"
-      extra_vars: {'kitchen_connection': 'smart'}

+ 0 - 23
roles/external/dereulenspiegel.alfred/.travis.yml

@@ -1,23 +0,0 @@
----
-language: python
-python: "2.7"
-
-before_install:
-  # Make sure everything's up to date.
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq python-apt python-pycurl git python-pip ruby ruby-dev build-essential autoconf
-  - gem install bundler
-
-install:
-  - sudo pip install ansible
-
-
-script:
-    #- cd test
-    - ansible --version
-    - bundle install
-    - KITCHEN_YAML=.kitchen.travis.yml bundle exec kitchen test travis
-
-
-after_success:
-    - echo "Success"

+ 0 - 7
roles/external/dereulenspiegel.alfred/Gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gem "test-kitchen"
-gem "kitchen-ansiblepush"
-gem "kitchen-ansible"
-gem "kitchen-vagrant"
-gem "kitchen-localhost"

+ 0 - 50
roles/external/dereulenspiegel.alfred/README.md

@@ -1,50 +0,0 @@
-alfred [![Build Status](https://travis-ci.org/dereulenspiegel/ansible-alfred.svg?branch=master)](https://travis-ci.org/dereulenspiegel/ansible-alfred)
-=========
-
-This role installs [alfred](http://www.open-mesh.org/projects/open-mesh/wiki/Alfred).
-
-Requirements
-------------
-
-Ansible of course
-
-Role Variables
---------------
-
-### Default Variables
-
-Name | Default | Description
----- | ------- | -----------
-alfred_version | 2015.0 | The version of alfred to install
-alfred_source_url | http://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-{{alfred_version}}.tar.gz | The URL to download alfred from
-alfred_gps | true | Wether to build alfred-gpsd
-alfred_vis | true | Wether to build batadv-vis
-alfred_batman_interface | bat0 | The Batman interface alfred will use. Use 'none' to disable the batman-adv based best server selection.
-alfred_interface | bat0 | The interface alfred will use
-alfred_batadv_vis_interface | bat0 | Interface for batadv-vis if alfred_vis is true
-alfred_master_mode | false | Wether alfred should run master mode or not
-
-
-Dependencies
-------------
-
-None
-
-Example Playbook
-----------------
-
-Simply depend on this role
-
-    - hosts: servers
-      roles:
-         - { role: dereulenspiegel.alfred, alfred_gps: false, alfred_interface: alfred0 }
-
-License
--------
-
-MIT
-
-Author Information
-------------------
-
-Till Klocke [dereulenspiegel](https://twitter.com/dereulenspiegel) on Twitter

+ 0 - 10
roles/external/dereulenspiegel.alfred/defaults/main.yml

@@ -1,10 +0,0 @@
----
-# defaults file for alfred
-alfred_version: 2015.0
-alfred_source_url: https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-{{alfred_version}}.tar.gz
-alfred_gps: true
-alfred_vis: true
-alfred_batman_interface: bat0
-alfred_interface: bat0
-alfred_batadv_vis_interface: bat0
-alfred_master_mode: false

+ 0 - 5
roles/external/dereulenspiegel.alfred/handlers/main.yml

@@ -1,5 +0,0 @@
----
-# handlers file for alfred
-
-- name: Mount all
-  shell: mount -a

+ 0 - 1
roles/external/dereulenspiegel.alfred/meta/.galaxy_install_info

@@ -1 +0,0 @@
-{install_date: 'Wed Dec 30 00:33:10 2015', version: v1.4}

+ 0 - 20
roles/external/dereulenspiegel.alfred/meta/main.yml

@@ -1,20 +0,0 @@
----
-galaxy_info:
-  author: Till Klocke
-  description: Install alfred daemon
-  company: Freifunk Dortmund
-  license: MIT
-  min_ansible_version: 1.2
-  platforms:
-  - name: Ubuntu
-    versions:
-    - trusty
-    - precise
-  - name: Debian
-    versions:
-    - wheezy
-    - jessie
-  categories:
-  - monitoring
-  - networking
-dependencies: []

+ 0 - 15
roles/external/dereulenspiegel.alfred/tasks/debian.yml

@@ -1,15 +0,0 @@
-- include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
-
-- name: Ensure Alfred build deps are installed
-  apt: name={{item}} state=present
-  with_items: "{{alfred_build_deps}}"
-
-- name: Ensure alfred-gpsd build deps are installed
-  when: alfred_gps
-  apt: name={{item}} state=present
-  with_items: "{{alfred_gpsd_build_deps}}"
-
-- name: Ensure that debugfs is mounted. Alfred seems to depend on it
-  when: ansible_distribution_release == 'wheezy'
-  lineinfile: dest=/etc/fstab line="none /sys/kernel/debug     debugfs   defaults   0  0"
-  notify: Mount all

+ 0 - 60
roles/external/dereulenspiegel.alfred/tasks/main.yml

@@ -1,60 +0,0 @@
----
-# tasks file for alfred
-
-- include: debian.yml
-  when: ansible_os_family == 'Debian'
-
-- name: Download alfred source code
-  register: alfred_source_downloaded
-  get_url: dest=/usr/src url={{alfred_source_url}}
-
-- name: Extract alfred source code
-  when: alfred_source_downloaded|changed
-  register: alfred_source_extracted
-  unarchive: src=/usr/src/alfred-{{alfred_version}}.tar.gz dest=/usr/src copy=no
-
-- name: Copy libcap patch to src directory
-  when: alfred_libcap_dev_broken
-  template: src=libcap.patch.j2 dest=/usr/src/alfred-{{alfred_version}}/libcap.patch
-
-- name: Patch makefile to fix broken libcap-dev package on Debian and Ubuntu
-  when: alfred_libcap_dev_broken
-  patch: basedir=/usr/src/alfred-{{alfred_version}} src=/usr/src/alfred-{{alfred_version}}/libcap.patch remote_src=True strip=0
-
-- set_fact:
-    alfred_config_gps: "CONFIG_ALFRED_GPSD=n"
-  when: not alfred_gps
-
-- set_fact:
-    alfred_config_vis: "CONFIG_ALFRED_VIS=n"
-  when: not alfred_vis
-
-- name: Compile and install alfred
-  when: alfred_source_extracted|changed
-  shell: "make {{alfred_config_gps|default('')}} {{alfred_config_vis|default('')}} && make {{alfred_config_gps|default('')}} {{alfred_config_vis|default('')}} install"
-  args:
-    chdir: /usr/src/alfred-{{alfred_version}}
-
-- name: Install systemd services
-  register: alfred_systemd
-  template: src={{item}}.service.j2 dest=/etc/systemd/system/{{item}}.service
-  with_items:
-  - alfred
-
-- name: Install systemd services
-  register: alfred_systemd_vis
-  when: alfred_vis is defined and alfred_vis
-  template: src={{item}}.service.j2 dest=/etc/systemd/system/{{item}}.service
-  with_items:
-  - batadv-vis
-
-- name: Systemd daemon reload
-  when: alfred_systemd_vis|changed or alfred_systemd|changed
-  shell: systemctl daemon-reload
-
-- name: Start and enable alfred
-  service: name=alfred state=started enabled=yes
-
-- name: Start and enable batadv-vis service
-  when: alfred_vis is defined and alfred_vis
-  service: name=batadv-vis state=started enabled=yes

+ 0 - 10
roles/external/dereulenspiegel.alfred/templates/alfred.service.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=Almighty Lightweight Fact Remote Exchange Daemon
-
-[Service]
-ExecStart=/usr/local/sbin/alfred -i alfred0
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-

+ 0 - 10
roles/external/dereulenspiegel.alfred/templates/batadv-vis.service.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=batman-adv visualization (vis)
-
-[Service]
-ExecStart=/usr/local/sbin/batadv-vis -s
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-

+ 0 - 20
roles/external/dereulenspiegel.alfred/templates/libcap.patch.j2

@@ -1,20 +0,0 @@
---- ../alfred_/Makefile 2015-05-01 23:47:25.179644579 +0000
-+++ Makefile    2015-05-02 00:11:56.251644579 +0000
-@@ -83,11 +83,12 @@
- 
-   ifeq ($(origin LIBCAP_CFLAGS) $(origin LIBCAP_LDLIBS), undefined undefined)
-     LIBCAP_NAME ?= libcap
--    ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBCAP_NAME) 2>/dev/null),)
--      $(error No $(LIBCAP_NAME) development libraries found!)
--    endif
--    LIBCAP_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBCAP_NAME))
--    LIBCAP_LDLIBS +=  $(shell $(PKG_CONFIG) --libs $(LIBCAP_NAME))
-+#    ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBCAP_NAME) 2>/dev/null),)
-+#      $(error No $(LIBCAP_NAME) development libraries found!)
-+#    endif
-+#    LIBCAP_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBCAP_NAME))
-+#    LIBCAP_LDLIBS +=  $(shell $(PKG_CONFIG) --libs $(LIBCAP_NAME))
-+    LIBCAP_LDLIBS += -lcap
-   endif
-   CFLAGS += $(LIBCAP_CFLAGS)
-   CPPFLAGS += -DCONFIG_ALFRED_CAPABILITIES

+ 0 - 2
roles/external/dereulenspiegel.alfred/test/ansible.cfg

@@ -1,2 +0,0 @@
-[defaults]
-roles_path=../:../../:/spec/

+ 0 - 10
roles/external/dereulenspiegel.alfred/test/application/alfred_all.yml

@@ -1,10 +0,0 @@
----
-- name         : Install and configure alfred
-  hosts        : all
-  gather_facts : yes
-  connection   : "{{ kitchen_connection | default('local') }}"
-  vars         :
-                 alfred_gps: true
-                 alfred_vis: true
-  roles        :
-                 - "ansible-alfred"

+ 0 - 10
roles/external/dereulenspiegel.alfred/test/application/alfred_pure.yml

@@ -1,10 +0,0 @@
----
-- name         : Install and configure alfred without alfred-gpsd or batadv-vis
-  hosts        : all
-  gather_facts : yes
-  connection   : "{{ kitchen_connection | default('local') }}"
-  vars         :
-                 alfred_gps: false
-                 alfred_vis: false
-  roles        :
-                 - "ansible-alfred"

+ 0 - 10
roles/external/dereulenspiegel.alfred/test/application/alfred_travis.yml

@@ -1,10 +0,0 @@
----
-- name         : Install and configure alfred
-  hosts        : localhost
-  gather_facts : yes
-  connection   : "{{ kitchen_connection | default('local') }}"
-  vars         :
-                 alfred_gps: true
-                 alfred_vis: true
-  roles        :
-                 - "ansible-alfred"

+ 0 - 29
roles/external/dereulenspiegel.alfred/test/integration/alfred_all/serverspec/alfred_spec.rb

@@ -1,29 +0,0 @@
-require 'serverspec'
-
-# Required by serverspec
-set :backend, :exec
-
-describe file('/usr/local/sbin/alfred') do
-  it { should exist }
-  it { should be_executable }
-end
-
-describe file('/usr/local/sbin/alfred-gpsd') do
-  it { should exist }
-  it { should be_executable }
-end
-
-describe file('/usr/local/sbin/batadv-vis') do
-  it { should exist }
-  it { should be_executable }
-end
-
-describe file('/etc/init.d/alfred') do
-  it { should exist }
-  it { should be_executable }
-end
-
-describe file('/etc/init.d/batadv-vis') do
-  it { should exist }
-  it { should be_executable }
-end

+ 0 - 27
roles/external/dereulenspiegel.alfred/test/integration/alfred_pure/serverspec/test_spec.rb

@@ -1,27 +0,0 @@
-require 'serverspec'
-
-# Required by serverspec
-set :backend, :exec
-
-describe file('/usr/local/sbin/alfred') do
-  it { should exist }
-  it { should be_executable }
-end
-
-describe file('/usr/local/sbin/alfred-gpsd') do
-  it { should_not exist }
-  it { should_not be_executable }
-end
-
-describe file('/usr/local/sbin/batadv-vis') do
-  it { should_not exist }
-  it { should_not be_executable }
-end
-
-describe package('libgps-dev') do
-  it { should_not be_installed }
-end
-
-describe file('/etc/init.d/batadv-vis') do
-  it { should_not exist }
-end

+ 0 - 1
roles/external/dereulenspiegel.alfred/test/local.ini

@@ -1 +0,0 @@
-localhost ansible_connection='local'

+ 0 - 17
roles/external/dereulenspiegel.alfred/test/run_vagrant_kitchen.sh

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-set -e
-echo "**** Box setup ***"
-
-echo "* mkdir /kitchen"
-mkdir -p /kitchen
-
-#echo "* cp -ar /mnt/shared /kitchen"
-#cp -r /mnt/shared/. /kitchen
-echo "* ln -sf /mnt/shared /kitchen"
-ln -sf /mnt/shared/* /kitchen/
-
-echo "* cd /kitchen"
-cd /kitchen/*
-
-echo "* python test/travis_run.py"
-python test/travis_run.py

+ 0 - 98
roles/external/dereulenspiegel.alfred/test/travis_run.py

@@ -1,98 +0,0 @@
-#!/usr/bin/env python
-# https://github.com/ahelal/travis-in-box
-
-import yaml
-import subprocess
-import sys
-import os.path
-
-
-class TravisExec(object):
-    def __init__(self, filename="travis.yml"):
-        self.fail = False
-        stream = open(filename, 'r')
-        yaml_file = yaml.load(stream)
-        # language
-        self.language = yaml_file.get("language", None)
-
-        # Section
-        self.section_before_install = yaml_file.get("before_install", None)
-        self.section_install = yaml_file.get("install", None)
-        self.section_before_script = yaml_file.get("before_script", None)
-        self.section_script = yaml_file.get("script", None)
-
-        #self.section_after_script = yaml_file.get("after_script", None)
-        self.section_after_failure = yaml_file.get("after_failure", None)
-        self.section_after_success = yaml_file.get("after_success", None)
-
-    def _setup(self):
-        if self.language == "python":
-            print "********** Setup Python  **********"
-            print ""
-            # Since we are not using container we have to install various lang our self
-            # So this is probably not the best way to do it
-            self._execute_command(["sudo apt-get install python-setuptools python-pip -y"])
-        else:
-            print "Errors unsupported language {}".format(self.language)
-            exit(1)
-
-    def life_cycle(self):
-        # See http://docs.travis-ci.com/user/build-configuration/
-
-            # 1. setup language
-            self._setup()
-            # 4. Run before_install commands
-            self.run_command("before_install", self.section_before_install, self.section_after_failure)
-            # 5. Run install commands
-            self.run_command("install", self.section_install, self.section_after_failure)
-            # 6. Run before_script commands
-            self.run_command("before_script", self.section_before_script, self.section_after_failure)
-            # 7. Run test script commands
-            self.run_command("script", self.section_script, self.section_after_failure)
-            # 8 . if we reach this point we made it run after_success
-            self.run_command("after_success", self.section_after_success, None)
-
-    @staticmethod
-    def _execute_command(command):
-        new_command = ["echo '> " + item.rstrip('\n') + "' && { " + item.rstrip('\n') + " ; }" for item in command]
-        new_command = " && ".join(new_command)
-
-        p = subprocess.Popen(new_command, shell=True, stderr=subprocess.PIPE)
-        while True:
-            out = p.stderr.read(1)
-            if out == '' and p.poll() is not None:
-                break
-            if out != '':
-                sys.stdout.write(out)
-                sys.stdout.flush()
-        print ""
-        return p.returncode
-
-    def run_command(self, section_name=None, command=None, execute_on_failure=None):
-        if command:
-            print ""
-            print "********** Running '{}' **********".format(section_name)
-            return_code = self._execute_command(command)
-            if return_code != 0:
-                print ""
-                print "********** Failed in '{}' **********".format(section_name)
-                if execute_on_failure:
-                    print ""
-                    print "********** Running after_failure  **********".format(section_name)
-                    self._execute_command(execute_on_failure)
-                    exit(1)
-
-filename = None
-if len(sys.argv) == 1:
-    filename = ".travis.yml"
-elif len(sys.argv) == 2:
-    filename = sys.argv[1]
-else:
-    print "Invalid number of arguments"
-    exit(1)
-
-if os.path.exists(filename):
-    TravisExec(filename).life_cycle()
-else:
-    print "Could not file travis file '{}'".format(filename)
-    exit(1)

+ 0 - 11
roles/external/dereulenspiegel.alfred/vars/Debian-jessie.yml

@@ -1,11 +0,0 @@
-alfred_build_deps:
-  - build-essential
-  - pkg-config
-  - libcap2
-  - libcap-dev
-
-alfred_gpsd_build_deps:
-  - libgps21
-  - libgps-dev
-
-alfred_libcap_dev_broken: false

+ 0 - 11
roles/external/dereulenspiegel.alfred/vars/Debian-wheezy.yml

@@ -1,11 +0,0 @@
-alfred_build_deps:
-  - build-essential
-  - pkg-config
-  - libcap2
-  - libcap-dev
-
-alfred_gpsd_build_deps:
-  - libgps20
-  - libgps-dev
-
-alfred_libcap_dev_broken: true

+ 0 - 11
roles/external/dereulenspiegel.alfred/vars/Ubuntu-precise.yml

@@ -1,11 +0,0 @@
-alfred_build_deps:
-  - build-essential
-  - pkg-config
-  - libcap2
-  - libcap-dev
-
-alfred_gpsd_build_deps:
-  - libgps20
-  - libgps-dev
-
-alfred_libcap_dev_broken: true

+ 0 - 11
roles/external/dereulenspiegel.alfred/vars/Ubuntu-trusty.yml

@@ -1,11 +0,0 @@
-alfred_build_deps:
-  - build-essential
-  - pkg-config
-  - libcap2
-  - libcap-dev
-
-alfred_gpsd_build_deps:
-  - libgps20
-  - libgps-dev
-
-alfred_libcap_dev_broken: true

+ 0 - 2
roles/external/dereulenspiegel.alfred/vars/main.yml

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

+ 1 - 1
roles/external/dereulenspiegel.fastd/meta/.galaxy_install_info

@@ -1 +1 @@
-{install_date: 'Wed Dec 30 00:33:09 2015', version: v1.0}
+{install_date: 'Mon Jan 11 21:36:13 2016', version: v1.0}

+ 1 - 1
roles/external/jdauphant.nginx/meta/.galaxy_install_info

@@ -1 +1 @@
-{install_date: 'Wed Dec 30 00:33:19 2015', version: v1.9.1}
+{install_date: 'Mon Jan 11 21:36:16 2016', version: v1.9.1}

+ 1 - 1
roles/external/usermanage/meta/.galaxy_install_info

@@ -1 +1 @@
-{install_date: 'Wed Dec 30 00:33:04 2015', version: v1.4.1}
+{install_date: 'Mon Jan 11 21:36:11 2016', version: v1.4.1}

+ 0 - 38
roles/internal/ffdo.ffmap-backend/README.md

@@ -1,38 +0,0 @@
-Role Name
-=========
-
-A brief description of the role goes here.
-
-Requirements
-------------
-
-Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
-
-Role Variables
---------------
-
-A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
-
-Dependencies
-------------
-
-A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
-
-Example Playbook
-----------------
-
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
-    - hosts: servers
-      roles:
-         - { role: username.rolename, x: 42 }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).

+ 0 - 8
roles/internal/ffdo.ffmap-backend/defaults/main.yml

@@ -1,8 +0,0 @@
----
-# defaults file for ffmap-backend
-ffmap_backend_repo_url: https://github.com/ffnord/ffmap-backend.git
-ffmap_backend_version: v2
-ffmap_backend_install_dir: /opt/ffmap-backend
-ffmap_backend_data_dir: /srv/ffmap-data
-ffmap_backend_prune_days: 14
-ffmap_backend_pip_executable: pip3

+ 0 - 2
roles/internal/ffdo.ffmap-backend/handlers/main.yml

@@ -1,2 +0,0 @@
----
-# handlers file for ffmap-backend

+ 0 - 20
roles/internal/ffdo.ffmap-backend/meta/main.yml

@@ -1,20 +0,0 @@
----
-galaxy_info:
-  author: Till Klocke
-  description: Installs ffmap-backend
-  company: Freifunk Dortmund
-  license: MIT
-  min_ansible_version: 1.2
-  platforms:
-  - name: Debian
-    versions:
-    - all
-  - name: Ubuntu
-    versions:
-    - all
-  categories:
-  - monitoring
-  - networking
-dependencies:
-- dereulenspiegel.alfred
-- dereulenspiegel.alfred-json

+ 0 - 24
roles/internal/ffdo.ffmap-backend/tasks/main.yml

@@ -1,24 +0,0 @@
----
-# tasks file for ffmap-backend
-
-- 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
-  apt: name={{item}} state=present update_cache=yes cache_valid_time=3600
-  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
-  file: dest={{ffmap_backend_install_dir}} state=directory
-
-- name: Clone ffmap-backend sources
-  git: repo={{ffmap_backend_repo_url}} version={{ffmap_backend_version}} dest={{ffmap_backend_install_dir}}
-
-- name: Add ffmap-backend cron entry
-  template: src=ffmap-backend.cron.j2 dest=/etc/cron.d/ffmap-backend

+ 0 - 2
roles/internal/ffdo.ffmap-backend/templates/ffmap-backend.cron.j2

@@ -1,2 +0,0 @@
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-* * * * * root {{ffmap_backend_install_dir}}/backend.py -d {{ffmap_backend_data_dir}} -p {{ffmap_backend_prune_days}}

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

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

+ 0 - 7
roles/internal/ffdo.ffmap-backend/vars/Debian.yml

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

+ 0 - 2
roles/internal/ffdo.ffmap-backend/vars/main.yml

@@ -1,2 +0,0 @@
----
-# vars file for ffmap-backend

+ 0 - 1
roles/internal/ffdo.mapserver/meta/main.yml

@@ -18,7 +18,6 @@ galaxy_info:
   - system
   - web
 dependencies:
-- dereulenspiegel.alfred
 - ffdo.gluon-collector
 - ffdo.mapserver-nginx
 - ffdo.meshviewer

+ 1 - 7
roles/internal/ffdo.mesh-interfaces/templates/mesh_interfaces.j2

@@ -24,12 +24,6 @@ iface bat0 inet static
     pre-up echo 120 > /sys/class/net/$IFACE/mesh/hop_penalty
     post-down ip rule del from {{mesh_ipv4}} table 42
     post-down ip rule del to {{mesh_ipv4}} table 42
-    # Paralleles Macvlan-Interface mit fixer MTU fuer Alfred
-    up ip link add link $IFACE alfred0 type macvlan
-    up ip link set dev alfred0 mtu 1280
-    up ip link set up dev alfred0
-    down ip link set down dev alfred0
-    down ip link del dev alfred0
 
 {% if mesh_ipv6 is defined %}
 iface bat0 inet6 static
@@ -39,4 +33,4 @@ iface bat0 inet6 static
     post-down ip -6 rule del from {{mesh_ipv6|ipaddr('cidr')}} table 42
     post-down ip -6 rule del to {{mesh_ipv6|ipaddr('cidr')}} table 42
     #pre-up ebtables -A FORWARD -p IPv6 -i $IFACE --ip6-proto ipv6-icmp --ip6-icmp-type router-advertisement -j DROP
-{% endif %}
+{% endif %}

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

@@ -50,5 +50,4 @@ galaxy_info:
   - monitoring
   - web
 dependencies:
-- ffmap-backend
 - laggyluke.nodejs

+ 0 - 1
roles/internal/ffdo.supernode/meta/main.yml

@@ -18,5 +18,4 @@ dependencies:
 - dereulenspiegel.fastd
 - ffdo.dhcp
 - ffdo.radvd
-- dereulenspiegel.alfred
 - ffdo.unbound

+ 0 - 2
roles/internal/ffdo.supernode/tasks/main.yml

@@ -40,5 +40,3 @@
 - name: Clone ffrl tools
   git: repo={{supernode_freifunk_tools_repo}} dest={{supernode_freifunk_tools_dir}}
 
-- name: Install nodeinfo cron job
-  template: src=nodeinfo.cron.j2 dest=/etc/cron.d/nodeinfo

+ 0 - 2
roles/internal/ffdo.supernode/templates/nodeinfo.cron.j2

@@ -1,2 +0,0 @@
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-* * * * * root {{supernode_freifunk_tools_dir}}/nodeinfo/nodeinfo.py | gzip | alfred -s 158

+ 0 - 6
roles/thirdparty_roles.yml

@@ -4,12 +4,6 @@
 
 - src: dereulenspiegel.fastd
 
-- src: https://github.com/dereulenspiegel/ansible-alfred.git
-  name: dereulenspiegel.alfred
-  version: v1.4
-
-- src: dereulenspiegel.alfred-json
-
 - src: jdauphant.nginx
 
 - src: laggyluke.nodejs