Procházet zdrojové kódy

Refactor roles and playbooks

Markus Lindenberg před 9 roky
rodič
revize
05d4e52ea5
100 změnil soubory, kde provedl 12 přidání a 339 odebrání
  1. 1 2
      ansible.cfg
  2. 0 0
      inventories/ffdo/group_vars/all/peering.yml
  3. 0 0
      inventories/ffdo/group_vars/mapservers/gluon-collector.yml
  4. 0 0
      inventories/ffdo/group_vars/mapservers/meshviewer.yml
  5. 0 0
      inventories/ffdo/group_vars/mapservers/nginx.yml
  6. 0 0
      inventories/ffdo/group_vars/mapservers/ssl.yml
  7. 0 0
      inventories/ffdo/group_vars/supernodes/fastd.yml
  8. 0 0
      inventories/ffdo/group_vars/supernodes/fastd_secrets.yml
  9. 0 0
      inventories/ffdo/host_vars/map.ffdo.de/mesh.yml
  10. 0 0
      inventories/ffdo/host_vars/snode01-1.ffdo.de/dhcp.yml
  11. 0 0
      inventories/ffdo/host_vars/snode01-1.ffdo.de/mesh.yml
  12. 0 0
      inventories/ffdo/host_vars/snode01-1.ffdo.de/peering.yml
  13. 0 0
      inventories/ffdo/host_vars/snode01-2.ffdo.de/dhcp.yml
  14. 0 0
      inventories/ffdo/host_vars/snode01-2.ffdo.de/mesh.yml
  15. 0 0
      inventories/ffdo/host_vars/snode02-1.ffdo.de/dhcp.yml
  16. 0 0
      inventories/ffdo/host_vars/snode02-1.ffdo.de/mesh.yml
  17. 0 0
      inventories/ffdo/host_vars/snode02-1.ffdo.de/peering.yml
  18. 0 0
      inventories/ffdo/host_vars/snode02-2.ffdo.de/dhcp.yml
  19. 0 0
      inventories/ffdo/host_vars/snode02-2.ffdo.de/mesh.yml
  20. 0 0
      inventories/ffdo/hosts
  21. 0 8
      playbooks/common.yml
  22. 0 4
      playbooks/group_vars/all/users.yml
  23. 0 5
      playbooks/manage-users.yml
  24. 0 9
      playbooks/mapserver.yml
  25. 0 6
      playbooks/mesh.yml
  26. 0 9
      playbooks/supernode.yml
  27. 0 3
      roles/batman/defaults/main.yml
  28. 0 10
      roles/batman/tasks/ubuntu.yml
  29. 0 0
      roles/common-auth/handlers/main.yml
  30. 0 0
      roles/common-auth/tasks/main.yml
  31. 0 0
      roles/common-net/tasks/hostname.yml
  32. 0 0
      roles/common-net/tasks/resolvconf.yml
  33. 0 0
      roles/common-net/tasks/sysctl.yml
  34. 0 0
      roles/common-net/templates/resolv.conf.j2
  35. 0 0
      roles/common-net/templates/sysctl.conf.j2
  36. 0 10
      roles/gluon-collector/templates/systemd.j2
  37. 0 38
      roles/mapserver-nginx/README.md
  38. 0 2
      roles/mapserver-nginx/defaults/main.yml
  39. 0 139
      roles/mapserver-nginx/meta/main.yml
  40. 0 2
      roles/mapserver-nginx/vars/main.yml
  41. 0 0
      roles/mesh-interfaces/tasks/batman.yml
  42. 0 0
      roles/mesh-routing/handlers/main.yml
  43. 0 0
      roles/mesh-routing/handlers/radvd.yml
  44. 0 0
      roles/mesh-routing/tasks/main.yml
  45. 0 0
      roles/mesh-routing/tasks/radvd.yml
  46. 0 0
      roles/mesh-routing/templates/bird.conf.j2
  47. 0 0
      roles/mesh-routing/templates/bird6.conf.j2
  48. 0 0
      roles/mesh-routing/templates/radvd.conf.j2
  49. 0 0
      roles/mesh-routing/vars/main.yml
  50. 0 0
      roles/mesh-vpn-fastd/defaults/main.yml
  51. 0 0
      roles/mesh-vpn-fastd/handlers/main.yml
  52. 11 0
      roles/mesh-vpn-fastd/tasks/blacklist.yml
  53. 0 0
      roles/mesh-vpn-fastd/tasks/debian.yml
  54. 0 0
      roles/mesh-vpn-fastd/tasks/libsodium/debian.yml
  55. 0 0
      roles/mesh-vpn-fastd/tasks/libsodium/main.yml
  56. 0 0
      roles/mesh-vpn-fastd/tasks/libsodium/source.yml
  57. 0 0
      roles/mesh-vpn-fastd/tasks/libsodium/ubuntu.yml
  58. 0 0
      roles/mesh-vpn-fastd/tasks/libuecc/debian.yml
  59. 0 0
      roles/mesh-vpn-fastd/tasks/libuecc/main.yml
  60. 0 0
      roles/mesh-vpn-fastd/tasks/libuecc/source.yml
  61. 0 0
      roles/mesh-vpn-fastd/tasks/main.yml
  62. 0 0
      roles/mesh-vpn-fastd/tasks/repo.yml
  63. 0 0
      roles/mesh-vpn-fastd/tasks/source.yml
  64. 0 0
      roles/mesh-vpn-fastd/templates/fastd-blacklist.sh.j2
  65. 0 0
      roles/mesh-vpn-fastd/templates/fastd.conf.j2
  66. 0 0
      roles/mesh-vpn-fastd/templates/peer.config.j2
  67. 0 0
      roles/mesh-vpn-fastd/templates/secret.conf.j2
  68. 0 2
      roles/meshviewer/handlers/main.yml
  69. 0 6
      roles/meshviewer/vars/main.yml
  70. 0 1
      roles/nodejs/.gitignore
  71. 0 4
      roles/nodejs/README.md
  72. 0 4
      roles/nodejs/defaults/main.yml
  73. 0 17
      roles/nodejs/meta/main.yml
  74. 0 48
      roles/nodejs/tasks/main.yml
  75. 0 7
      roles/nodejs/templates/nodesource.list.j2
  76. 0 3
      roles/nodejs/templates/npmrc.j2
  77. 0 0
      roles/service-dhcp/handlers/main.yml
  78. 0 0
      roles/service-dhcp/tasks/main.yml
  79. 0 0
      roles/service-dhcp/templates/dhcpd.conf.j2
  80. 0 0
      roles/service-dns/defaults/main.yml
  81. 0 0
      roles/service-dns/handlers/main.yml
  82. 0 0
      roles/service-dns/tasks/main.yml
  83. 0 0
      roles/service-dns/templates/unbound-supernode.conf.j2
  84. 0 0
      roles/service-dns/templates/unbound.conf.j2
  85. 0 0
      roles/service-gitolite/handlers/main.yml
  86. 0 0
      roles/service-gitolite/tasks/main.yml
  87. 0 0
      roles/service-map/defaults/gluon-collector.yml
  88. 0 0
      roles/service-map/defaults/main.yml
  89. 0 0
      roles/service-map/defaults/meshviewer.yml
  90. 0 0
      roles/service-map/handlers/gluon-collector.yml
  91. 0 0
      roles/service-map/handlers/main.yml
  92. 0 0
      roles/service-map/handlers/nginx.yml
  93. 0 0
      roles/service-map/tasks/gluon-collector.yml
  94. 0 0
      roles/service-map/tasks/main.yml
  95. 0 0
      roles/service-map/tasks/meshviewer.yml
  96. 0 0
      roles/service-map/tasks/nginx.yml
  97. 0 0
      roles/service-map/templates/config.js.j2
  98. 0 0
      roles/service-map/templates/gluon-collector.j2
  99. 0 0
      roles/service-map/templates/nginx-default.conf.j2
  100. 0 0
      roles/service-ntp/tasks/main.yml

+ 1 - 2
ansible.cfg

@@ -1,7 +1,6 @@
 [defaults]
 [defaults]
-roles_path=roles/internal:roles/external
+inventory=inventories/ffdo/hosts
 vault_password_file=.vault-password
 vault_password_file=.vault-password
-host_key_checking = False
 
 
 [privilege_escalation]
 [privilege_escalation]
 become=True
 become=True

inventories/dortmund/group_vars/all/peering.yml → inventories/ffdo/group_vars/all/peering.yml


playbooks/group_vars/mapservers/gluon-collector.yml → inventories/ffdo/group_vars/mapservers/gluon-collector.yml


playbooks/group_vars/mapservers/meshviewer.yml → inventories/ffdo/group_vars/mapservers/meshviewer.yml


playbooks/group_vars/mapservers/nginx.yml → inventories/ffdo/group_vars/mapservers/nginx.yml


playbooks/group_vars/mapservers/ssl.yml → inventories/ffdo/group_vars/mapservers/ssl.yml


playbooks/group_vars/supernodes/fastd.yml → inventories/ffdo/group_vars/supernodes/fastd.yml


playbooks/group_vars/supernodes/fastd_secrets.yml → inventories/ffdo/group_vars/supernodes/fastd_secrets.yml


inventories/dortmund/host_vars/map.ffdo.de/mesh.yml → inventories/ffdo/host_vars/map.ffdo.de/mesh.yml


inventories/dortmund/host_vars/snode01-1.ffdo.de/dhcp.yml → inventories/ffdo/host_vars/snode01-1.ffdo.de/dhcp.yml


inventories/dortmund/host_vars/snode01-1.ffdo.de/mesh.yml → inventories/ffdo/host_vars/snode01-1.ffdo.de/mesh.yml


inventories/dortmund/host_vars/snode01-1.ffdo.de/peering.yml → inventories/ffdo/host_vars/snode01-1.ffdo.de/peering.yml


inventories/dortmund/host_vars/snode01-2.ffdo.de/dhcp.yml → inventories/ffdo/host_vars/snode01-2.ffdo.de/dhcp.yml


inventories/dortmund/host_vars/snode01-2.ffdo.de/mesh.yml → inventories/ffdo/host_vars/snode01-2.ffdo.de/mesh.yml


inventories/dortmund/host_vars/snode02-1.ffdo.de/dhcp.yml → inventories/ffdo/host_vars/snode02-1.ffdo.de/dhcp.yml


inventories/dortmund/host_vars/snode02-1.ffdo.de/mesh.yml → inventories/ffdo/host_vars/snode02-1.ffdo.de/mesh.yml


inventories/dortmund/host_vars/snode02-1.ffdo.de/peering.yml → inventories/ffdo/host_vars/snode02-1.ffdo.de/peering.yml


inventories/dortmund/host_vars/snode02-2.ffdo.de/dhcp.yml → inventories/ffdo/host_vars/snode02-2.ffdo.de/dhcp.yml


inventories/dortmund/host_vars/snode02-2.ffdo.de/mesh.yml → inventories/ffdo/host_vars/snode02-2.ffdo.de/mesh.yml


inventories/dortmund/hosts → inventories/ffdo/hosts


+ 0 - 8
playbooks/common.yml

@@ -1,8 +0,0 @@
----
-
-- hosts: all
-  roles:
-  - ffdo.hostname
-  - ffdo.resolvconf
-  - ffdo.authentication
-  - ffdo.sysctl

+ 0 - 4
playbooks/group_vars/all/users.yml

@@ -1,4 +0,0 @@
----
-usermanage_user_source_files:
-- path: "../databags/users/"
-  databag: true

+ 0 - 5
playbooks/manage-users.yml

@@ -1,5 +0,0 @@
----
-- hosts: all
-  sudo: true
-  roles:
-  - ffdo.authentication

+ 0 - 9
playbooks/mapserver.yml

@@ -1,9 +0,0 @@
----
-
-- include: common.yml
-- include: mesh.yml
-
-- hosts: mapservers
-  roles:
-  - ffdo.mapserver
-  - ffdo.gitit

+ 0 - 6
playbooks/mesh.yml

@@ -1,6 +0,0 @@
----
-
-- hosts: all
-  roles:
-  - ffdo.batman
-  - ffdo.mesh-interfaces

+ 0 - 9
playbooks/supernode.yml

@@ -1,9 +0,0 @@
----
-
-- include: common.yml
-- include: mesh.yml
-
-- hosts: supernodes
-  roles:
-  - ffdo.supernode
-  - ffdo.peering

+ 0 - 3
roles/batman/defaults/main.yml

@@ -1,3 +0,0 @@
----
-# defaults file for batman
-batman_install_from_source: false

+ 0 - 10
roles/batman/tasks/ubuntu.yml

@@ -1,10 +0,0 @@
----
-
-- name: Add universe factory GPG repo key
-  apt_key: keyserver=pgpkeys.mit.edu id=16EF3F64CB201D9C
-
-- name: Add universe factory repo to get batman-adv kernel module for Ubuntu
-  apt_repository: repo='deb http://repo.universe-factory.net/debian/ sid main' state=present update_cache=yes
-
-- name: Install B.A.T.M.A.N. kernel module
-  apt: name=batman-adv-dkms state=present

roles/authentication/handlers/main.yml → roles/common-auth/handlers/main.yml


roles/authentication/tasks/main.yml → roles/common-auth/tasks/main.yml


roles/hostname/tasks/main.yml → roles/common-net/tasks/hostname.yml


roles/resolveconf/tasks/main.yml → roles/common-net/tasks/resolvconf.yml


roles/sysctl/tasks/main.yml → roles/common-net/tasks/sysctl.yml


roles/resolveconf/templates/resolv.conf.j2 → roles/common-net/templates/resolv.conf.j2


roles/sysctl/templates/sysctl.conf.j2 → roles/common-net/templates/sysctl.conf.j2


+ 0 - 10
roles/gluon-collector/templates/systemd.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=gluon-collector
-
-[Service]
-ExecStart={{gluon_collector_base_path}}/gluon-collector -config /etc/gluon-collector.yaml
-Restart=on-failure
-User={{gluon_collector_user}}
-
-[Install]
-WantedBy=multi-user.target

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

@@ -1,2 +0,0 @@
----
-# defaults file for ffdo.mapserver-nginx

+ 0 - 139
roles/mapserver-nginx/meta/main.yml

@@ -1,139 +0,0 @@
----
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  min_ansible_version: 1.2
-  #
-  # Below are all platforms currently available. Just uncomment
-  # the ones that apply to your role. If you don't see your 
-  # platform on this list, let us know and we'll get it added!
-  #
-  #platforms:
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - squeeze
-  #  - wheezy
-  #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
-  #categories:
-  #- cloud
-  #- cloud:ec2
-  #- cloud:gce
-  #- cloud:rax
-  #- clustering
-  #- database
-  #- database:nosql
-  #- database:sql
-  #- development
-  #- monitoring
-  #- networking
-  #- packaging
-  #- system
-  #- web
-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/mapserver-nginx/vars/main.yml

@@ -1,2 +0,0 @@
----
-# vars file for ffdo.mapserver-nginx

roles/batman/tasks/main.yml → roles/mesh-interfaces/tasks/batman.yml


roles/bird/handlers/main.yml → roles/mesh-routing/handlers/main.yml


roles/radvd/handlers/main.yml → roles/mesh-routing/handlers/radvd.yml


roles/bird/tasks/main.yml → roles/mesh-routing/tasks/main.yml


roles/radvd/tasks/main.yml → roles/mesh-routing/tasks/radvd.yml


roles/bird/templates/bird.conf.j2 → roles/mesh-routing/templates/bird.conf.j2


roles/bird/templates/bird6.conf.j2 → roles/mesh-routing/templates/bird6.conf.j2


roles/radvd/templates/radvd.conf.j2 → roles/mesh-routing/templates/radvd.conf.j2


roles/bird/vars/main.yml → roles/mesh-routing/vars/main.yml


roles/fastd/defaults/main.yml → roles/mesh-vpn-fastd/defaults/main.yml


roles/fastd/handlers/main.yml → roles/mesh-vpn-fastd/handlers/main.yml


+ 11 - 0
roles/mesh-vpn-fastd/tasks/blacklist.yml

@@ -0,0 +1,11 @@
+---
+
+- name: Install crontab to update the blacklist
+  cron:
+    name: Update blacklist
+    minute: '*/5'
+    job: wget -q -O /etc/fastd/fastd-blacklist.json https://raw.githubusercontent.com/ffruhr/fastdbl/master/fastd-blacklist.json
+
+- name: Install verify shell script
+  template: src=fastd-blacklist.sh.j2 dest=/etc/fastd/fastd-blacklist.sh mode="u=rwx,g=rx,o=r"
+

roles/fastd/tasks/debian.yml → roles/mesh-vpn-fastd/tasks/debian.yml


roles/fastd/tasks/libsodium/debian.yml → roles/mesh-vpn-fastd/tasks/libsodium/debian.yml


roles/fastd/tasks/libsodium/main.yml → roles/mesh-vpn-fastd/tasks/libsodium/main.yml


roles/fastd/tasks/libsodium/source.yml → roles/mesh-vpn-fastd/tasks/libsodium/source.yml


roles/fastd/tasks/libsodium/ubuntu.yml → roles/mesh-vpn-fastd/tasks/libsodium/ubuntu.yml


roles/fastd/tasks/libuecc/debian.yml → roles/mesh-vpn-fastd/tasks/libuecc/debian.yml


roles/fastd/tasks/libuecc/main.yml → roles/mesh-vpn-fastd/tasks/libuecc/main.yml


roles/fastd/tasks/libuecc/source.yml → roles/mesh-vpn-fastd/tasks/libuecc/source.yml


roles/fastd/tasks/main.yml → roles/mesh-vpn-fastd/tasks/main.yml


roles/fastd/tasks/repo.yml → roles/mesh-vpn-fastd/tasks/repo.yml


roles/fastd/tasks/source.yml → roles/mesh-vpn-fastd/tasks/source.yml


roles/supernode/templates/fastd-blacklist.sh.j2 → roles/mesh-vpn-fastd/templates/fastd-blacklist.sh.j2


roles/fastd/templates/fastd.conf.j2 → roles/mesh-vpn-fastd/templates/fastd.conf.j2


roles/fastd/templates/peer.config.j2 → roles/mesh-vpn-fastd/templates/peer.config.j2


roles/fastd/templates/secret.conf.j2 → roles/mesh-vpn-fastd/templates/secret.conf.j2


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

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

+ 0 - 6
roles/meshviewer/vars/main.yml

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

+ 0 - 1
roles/nodejs/.gitignore

@@ -1 +0,0 @@
-/meta/.galaxy_install_info

+ 0 - 4
roles/nodejs/README.md

@@ -1,4 +0,0 @@
-nodejs
-======
-
-This Ansible role installs Node.JS.

+ 0 - 4
roles/nodejs/defaults/main.yml

@@ -1,4 +0,0 @@
-nodejs:
-  devel: false
-  add_node_modules_bin_to_path: false
-  npmrc: {}

+ 0 - 17
roles/nodejs/meta/main.yml

@@ -1,17 +0,0 @@
----
-galaxy_info:
-  author: George Miroshnykov
-  description: install Node.JS
-  min_ansible_version: 1.4
-  version: 0.1.0
-  platforms:
-  - name: Ubuntu
-    versions:
-    - all
-  - name: Debian
-    versions:
-    - wheezy
-  categories:
-  - system
-  - web
-dependencies: []

+ 0 - 48
roles/nodejs/tasks/main.yml

@@ -1,48 +0,0 @@
----
-- name: install required packages
-  sudo: true
-  apt: pkg={{ item }}
-  with_items:
-  - python-pycurl
-  - apt-transport-https
-
-- name: add nodesource apt key
-  sudo: true
-  apt_key: >
-    id=68576280
-    url=https://deb.nodesource.com/gpgkey/nodesource.gpg.key
-    state=present
-
-- name: add nodesource apt repository
-  sudo: true
-  template: >
-    src=nodesource.list.j2
-    dest=/etc/apt/sources.list.d/nodesource.list
-    owner=root
-    group=root
-    mode=644
-  register: result
-
-- name: apt-get update
-  sudo: true
-  apt: update_cache=yes
-  when: result | changed
-
-- name: install package
-  sudo: true
-  apt: pkg=nodejs
-
-- name: generate ~/.npmrc
-  template: >
-    src=npmrc.j2
-    dest=~/.npmrc
-    mode=0644
-  when: nodejs.npmrc|length > 0
-
-- name: add `./node_modules/.bin` to PATH
-  sudo: true
-  copy: >
-    content='export PATH="./node_modules/.bin:$PATH"'
-    dest=/etc/profile.d/nodejs_path.sh
-    mode=0644
-  when: nodejs.add_node_modules_bin_to_path

+ 0 - 7
roles/nodejs/templates/nodesource.list.j2

@@ -1,7 +0,0 @@
-{% if not nodejs.devel %}
-deb https://deb.nodesource.com/node {{ ansible_distribution_release }} main
-deb-src https://deb.nodesource.com/node {{ ansible_distribution_release }} main
-{% else %}
-deb https://deb.nodesource.com/node-devel {{ ansible_distribution_release }} main
-deb-src https://deb.nodesource.com/node-devel {{ ansible_distribution_release }} main
-{% endif %}

+ 0 - 3
roles/nodejs/templates/npmrc.j2

@@ -1,3 +0,0 @@
-{% for k, v in nodejs.npmrc.iteritems() %}
-{{ k }} = {{ v }}
-{% endfor %}

roles/dhcp/handlers/main.yml → roles/service-dhcp/handlers/main.yml


roles/dhcp/tasks/main.yml → roles/service-dhcp/tasks/main.yml


roles/dhcp/templates/dhcpd.conf.j2 → roles/service-dhcp/templates/dhcpd.conf.j2


roles/unbound/defaults/main.yml → roles/service-dns/defaults/main.yml


roles/unbound/handlers/main.yml → roles/service-dns/handlers/main.yml


roles/unbound/tasks/main.yml → roles/service-dns/tasks/main.yml


roles/unbound/templates/unbound-supernode.conf.j2 → roles/service-dns/templates/unbound-supernode.conf.j2


roles/unbound/templates/unbound.conf.j2 → roles/service-dns/templates/unbound.conf.j2


roles/gitolite/handlers/main.yml → roles/service-gitolite/handlers/main.yml


roles/gitolite/tasks/main.yml → roles/service-gitolite/tasks/main.yml


roles/gluon-collector/defaults/main.yml → roles/service-map/defaults/gluon-collector.yml


roles/mapserver/defaults/main.yml → roles/service-map/defaults/main.yml


roles/meshviewer/defaults/main.yml → roles/service-map/defaults/meshviewer.yml


roles/gluon-collector/handlers/main.yml → roles/service-map/handlers/gluon-collector.yml


roles/mapserver/handlers/main.yml → roles/service-map/handlers/main.yml


roles/mapserver-nginx/handlers/main.yml → roles/service-map/handlers/nginx.yml


roles/gluon-collector/tasks/main.yml → roles/service-map/tasks/gluon-collector.yml


roles/mapserver/tasks/main.yml → roles/service-map/tasks/main.yml


roles/meshviewer/tasks/main.yml → roles/service-map/tasks/meshviewer.yml


roles/mapserver-nginx/tasks/main.yml → roles/service-map/tasks/nginx.yml


roles/meshviewer/templates/config.js.j2 → roles/service-map/templates/config.js.j2


roles/gluon-collector/templates/config.j2 → roles/service-map/templates/gluon-collector.j2


roles/mapserver-nginx/templates/nginx-default.conf.j2 → roles/service-map/templates/nginx-default.conf.j2


+ 0 - 0
roles/service-ntp/tasks/main.yml


Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů