Cleanup (mostly whitespace and style)

This commit is contained in:
Markus 2018-07-26 10:57:58 +02:00
parent 111f94303b
commit 3477a59405
13 changed files with 39 additions and 36 deletions

View File

@ -1,2 +1,4 @@
---
batman-adv_version: 2017.3 batman-adv_version: 2017.3
batman-adv_tar_sha256_hash: 830edd297ff11b91623e9612172db3e2b2c1524e2f9b2ca1cb243e2e3f0ba4d4 batman-adv_tar_sha256_hash: 830edd297ff11b91623e9612172db3e2b2c1524e2f9b2ca1cb243e2e3f0ba4d4

View File

@ -3,9 +3,9 @@
- name: Install powerdns - name: Install powerdns
apt: name={{ item }} apt: name={{ item }}
with_items: with_items:
- pdns-backend-bind - pdns-backend-bind
- pdns-recursor - pdns-recursor
- pdns-server - pdns-server
- name: Create zone directory - name: Create zone directory
file: path=/etc/powerdns/bind/ state=directory file: path=/etc/powerdns/bind/ state=directory
@ -15,14 +15,14 @@
tags: dns tags: dns
notify: Restart powerdns notify: Restart powerdns
with_items: with_items:
- bind/ffrgb.zone - bind/ffrgb.zone
- bind/90.10.in-addr.arpa.zone - bind/90.10.in-addr.arpa.zone
- bindbackend.conf - bindbackend.conf
- pdns.conf - pdns.conf
- recursor.conf - recursor.conf
- name: Start the powerdns services - name: Start the powerdns services
service: name={{ item }} state=started enabled=yes service: name={{ item }} state=started enabled=yes
with_items: with_items:
- pdns - pdns
- pdns-recursor - pdns-recursor

View File

@ -1,3 +1,5 @@
---
batman_interface: bat-{{ site_code }} batman_interface: bat-{{ site_code }}
fastd_anonymous: true fastd_anonymous: true

View File

@ -1,4 +1,5 @@
--- ---
- name: Restart node_exporter - name: Restart node_exporter
service: name=node_exporter state=restarted service: name=node_exporter state=restarted

View File

@ -16,4 +16,4 @@
- Restart node_exporter - Restart node_exporter
- name: Enable node_exporter - name: Enable node_exporter
service: name=node_exporter enabled=yes service: name=node_exporter state=started enabled=yes

View File

@ -2,6 +2,7 @@
Description=Node Exporter Description=Node Exporter
[Service] [Service]
Type=simple
User=node_exporter User=node_exporter
EnvironmentFile=/etc/default/node_exporter EnvironmentFile=/etc/default/node_exporter
ExecStart=/opt/node_exporter-{{ node_exporter_version }}.linux-amd64/node_exporter $OPTIONS ExecStart=/opt/node_exporter-{{ node_exporter_version }}.linux-amd64/node_exporter $OPTIONS

View File

@ -1,3 +1,4 @@
--- ---
- name: Restart prometheus - name: Restart prometheus
service: name=prometheus state=restarted service: name=prometheus state=restarted

View File

@ -11,4 +11,4 @@
notify: Restart prometheus notify: Restart prometheus
- name: Enable prometheus - name: Enable prometheus
service: name=prometheus enabled=yes service: name=prometheus state=started enabled=yes

View File

@ -1,18 +1,11 @@
--- ---
- name: Install radvd - name: Install radvd
apt: name={{ item }} apt: name=radvd
with_items:
- radvd
- name: Configure radvd - name: Configure radvd
template: src={{ item }}.j2 dest=/etc/{{ item }} template: src=radvd.j2 dest=/etc/radvd
tags: radvd
notify: Restart radvd notify: Restart radvd
with_items:
- radvd.conf
- name: Start the radvd service - name: Start the radvd service
service: name={{ item }} state=started enabled=yes service: name=radvd state=started enabled=yes
with_items:
- radvd

View File

@ -14,4 +14,4 @@
- Restart respondd - Restart respondd
- name: Enable respondd - name: Enable respondd
service: name=respondd enabled=yes service: name=respondd state=started enabled=yes

View File

@ -1,10 +1,12 @@
--- ---
yanic_source: github.com/ffrgb/yanic
yanic_publisher: false yanic_publisher: false
yanic_respondd: true yanic_respondd: true
yanic_respondd_collect_interval: "1m" yanic_respondd_collect_interval: 1m
yanic_respondd_synchronize_interval: "1m" yanic_respondd_synchronize_interval: 1m
yanic_respondd_interface: "br-{{ site_code }}" yanic_respondd_interface: br-{{ site_code }}
yanic_webserver: false yanic_webserver: false
yanic_webserver_bind: "127.0.0.1:8080" yanic_webserver_bind: "127.0.0.1:8080"
@ -12,9 +14,9 @@ yanic_webserver_webroot: "/var/www/html/meshviewer"
yanic_nodes: true yanic_nodes: true
yanic_nodes_state_path: "/var/lib/yanic/yanic.json" yanic_nodes_state_path: "/var/lib/yanic/yanic.json"
yanic_nodes_save_interval: "5s" yanic_nodes_save_interval: 5s
yanic_nodes_offline_after: "10m" yanic_nodes_offline_after: 10m
yanic_nodes_prune_after: "7d" yanic_nodes_prune_after: 7d
yanic_meshviewer_ffrgb_enable: true yanic_meshviewer_ffrgb_enable: true
yanic_meshviewer_ffrgb_path: "/var/www/html/meshviewer/data/meshviewer.json" yanic_meshviewer_ffrgb_path: "/var/www/html/meshviewer/data/meshviewer.json"
@ -25,8 +27,8 @@ yanic_meshviewer_path: "/var/www/html/meshviewer/data"
yanic_meshviewer_nodes: "{{yanic_meshviewer_path}}/nodes.json" yanic_meshviewer_nodes: "{{yanic_meshviewer_path}}/nodes.json"
yanic_meshviewer_graph: "{{yanic_meshviewer_path}}/graph.json" yanic_meshviewer_graph: "{{yanic_meshviewer_path}}/graph.json"
yanic_database_delete_after: "7d" yanic_database_delete_after: 7d
yanic_database_delete_interval: "1h" yanic_database_delete_interval: 1h
yanic_repondd_enable: true yanic_repondd_enable: true
yanic_repondd_remotehost: "[2a01:4f8:173:2919::2]:10001" yanic_repondd_remotehost: "[2a01:4f8:173:2919::2]:10001"

View File

@ -1,4 +1,5 @@
--- ---
- name: Restart yanic - name: Restart yanic
service: name=yanic state=restarted service: name=yanic state=restarted

View File

@ -4,7 +4,7 @@
user: name=yanic user: name=yanic
- name: Install yanic - name: Install yanic
shell: /usr/local/go/bin/go get -v -u github.com/ffrgb/yanic shell: /usr/local/go/bin/go get -v -u {{ yanic_source }}
args: args:
creates: /opt/go/bin/yanic creates: /opt/go/bin/yanic
environment: environment:
@ -18,14 +18,14 @@
- name: Create directories - name: Create directories
file: path={{ item }}/ state=directory owner=yanic file: path={{ item }}/ state=directory owner=yanic
with_items: with_items:
- "{{ yanic_meshviewer_path }}" - "{{ yanic_meshviewer_path }}"
- /var/lib/yanic - /var/lib/yanic
- name: Install systemd unit - name: Install systemd unit
copy: src=yanic.service dest=/lib/systemd/system/yanic.service copy: src=yanic.service dest=/lib/systemd/system/yanic.service
notify: notify:
- Reload systemd - Reload systemd
- Restart yanic - Restart yanic
- name: Enable yanic - name: Enable yanic
service: name=yanic enabled=yes service: name=yanic enabled=yes