Browse Source

fastd is now a self contained role and doesn't rely on external roles any more. Therefore we have now 3 roles less, which is good

Till Klocke 9 years ago
parent
commit
d5efa86d74

+ 1 - 2
roles/batman/meta/main.yml

@@ -14,5 +14,4 @@ galaxy_info:
     - all
   categories:
   - networking
-dependencies:
-  - repo-universe-factory
+dependencies: []

+ 15 - 1
roles/fastd/defaults/main.yml

@@ -6,4 +6,18 @@ fastd_install_dir: /opt/fastd
 fastd_build_dir: /usr/src/fastd-build
 fastd_install_from_source: false
 fastd_user_name: fastd
-fastd_user_shell: /bin/false
+fastd_user_shell: /bin/false
+
+repo_universe_factory_unsupported_architecture: false
+repo_universe_factory_unsupported_distro: false
+
+libsodium_build_from_source: false
+libsodum_version: 1.0.3
+libsodum_src_url: https://download.libsodium.org/libsodium/releases/libsodium-{{libsodum_version}}.tar.gz
+libsodium_build_dir: /usr/src/
+
+libuecc_build_from_source: false
+libuecc_version: v5
+libuecc_repo: git://git.universe-factory.net/libuecc
+libuecc_repo_dir: /usr/src/
+libuecc_build_dir: /usr/src/libuecc-build

+ 1 - 4
roles/fastd/meta/main.yml

@@ -11,7 +11,4 @@ galaxy_info:
     - jessie
   categories:
   - networking
-dependencies:
-  - repo-universe-factory
-  - libsodium
-  - libuecc
+dependencies: []

roles/libsodium/tasks/debian.yml → roles/fastd/tasks/libsodium/debian.yml


roles/libsodium/tasks/main.yml → roles/fastd/tasks/libsodium/main.yml


roles/libsodium/tasks/source.yml → roles/fastd/tasks/libsodium/source.yml


roles/libsodium/tasks/ubuntu.yml → roles/fastd/tasks/libsodium/ubuntu.yml


roles/libuecc/tasks/debian.yml → roles/fastd/tasks/libuecc/debian.yml


roles/libuecc/tasks/main.yml → roles/fastd/tasks/libuecc/main.yml


roles/libuecc/tasks/source.yml → roles/fastd/tasks/libuecc/source.yml


+ 6 - 0
roles/fastd/tasks/main.yml

@@ -1,6 +1,12 @@
 ---
 # tasks file for fastd
 
+- include: repo.yml
+
+- include: libsodium/main.yml
+
+- include: libuecc/main.yml
+
 - include: debian.yml
   when: ansible_distribution == "Ubuntu"
 

+ 1 - 2
roles/repo-universe-factory/tasks/main.yml

@@ -33,5 +33,4 @@
 
 - name: Add Universe Factory Apt Repository 
   when: repo_universe_factory_available
-  apt_repository: repo='deb http://repo.universe-factory.net/debian/ sid main' state=present update_cache=yes
-
+  apt_repository: repo='deb http://repo.universe-factory.net/debian/ sid main' state=present update_cache=yes

+ 0 - 38
roles/libsodium/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 - 7
roles/libsodium/defaults/main.yml

@@ -1,7 +0,0 @@
----
-# defaults file for libsodium
-libsodium_build_from_source: false
-libsodum_version: 1.0.3
-libsodum_src_url: https://download.libsodium.org/libsodium/releases/libsodium-{{libsodum_version}}.tar.gz
-libsodium_build_dir: /usr/src/
-

+ 0 - 2
roles/libsodium/handlers/main.yml

@@ -1,2 +0,0 @@
----
-# handlers file for libsodium

+ 0 - 18
roles/libsodium/meta/main.yml

@@ -1,18 +0,0 @@
----
-galaxy_info:
-  author: Till Klocke
-  description: Installs libsodium
-  company: Freifunk Dortmund
-  license: MIT
-  min_ansible_version: 1.2
-  platforms:
-  - name: Ubuntu
-    versions:
-    - all
-  - name: Debian
-    versions:
-    - all
-  categories:
-  - system
-dependencies:
-  - repo-universe-factory

+ 0 - 2
roles/libsodium/vars/main.yml

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

+ 0 - 38
roles/libuecc/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/libuecc/defaults/main.yml

@@ -1,8 +0,0 @@
----
-# defaults file for libsodium
-libuecc_build_from_source: false
-libuecc_version: v5
-libuecc_repo: git://git.universe-factory.net/libuecc
-libuecc_repo_dir: /usr/src/
-libuecc_build_dir: /usr/src/libuecc-build
-

+ 0 - 2
roles/libuecc/handlers/main.yml

@@ -1,2 +0,0 @@
----
-# handlers file for libsodium

+ 0 - 18
roles/libuecc/meta/main.yml

@@ -1,18 +0,0 @@
----
-galaxy_info:
-  author: Till Klocke
-  description: Installs libuec
-  company: Freifunk Dortmund
-  license: MIT
-  min_ansible_version: 1.2
-  platforms:
-  - name: Ubuntu
-    versions:
-    - all
-  - name: Debian
-    versions:
-    - all
-  categories:
-  - system
-dependencies:
-  - repo-universe-factory

+ 0 - 2
roles/libuecc/vars/main.yml

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

+ 0 - 38
roles/repo-universe-factory/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 - 4
roles/repo-universe-factory/defaults/main.yml

@@ -1,4 +0,0 @@
----
-# defaults file for repo-universe-factory
-repo_universe_factory_unsupported_architecture: false
-repo_universe_factory_unsupported_distro: false

+ 0 - 2
roles/repo-universe-factory/handlers/main.yml

@@ -1,2 +0,0 @@
----
-# handlers file for repo-universe-factory

+ 0 - 20
roles/repo-universe-factory/meta/main.yml

@@ -1,20 +0,0 @@
----
-galaxy_info:
-  author: Till Klocke
-  description: Installs Universe Factory repository if possible
-  company: Freifunk Dortmund
-  license: MIT
-  min_ansible_version: 1.2
-  platforms:
-  - name: Ubuntu
-    versions:
-    - all
-  - name: Debian
-    versions:
-    - all
-  categories:
-  - system
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.

+ 0 - 2
roles/repo-universe-factory/vars/main.yml

@@ -1,2 +0,0 @@
----
-# vars file for repo-universe-factory