Skip to content

Commit 01fff88

Browse files
committed
ping-primary: add config generator
Adding the final generated config for server here. A handler for the smokeping service and apache2 (due to UWSGI usage) is implemented as well. Therefor the role is now fully automated via Ansible.
1 parent 84aef22 commit 01fff88

File tree

6 files changed

+89
-42
lines changed

6 files changed

+89
-42
lines changed

Diff for: roles/ping-primary/handlers/main.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- name: restart smokeping
2+
service: name=smokeping state=restarted
3+
4+
- name: restart apache2
5+
service: name=apache2 state=restarted

Diff for: roles/ping-primary/tasks/config.yml

+23
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,44 @@
33
path: "{{ smokeping_path_config }}/General"
44
regexp: '^owner ='
55
line: "owner = {{ smokeping_owner }}"
6+
notify:
7+
- restart smokeping
8+
- restart apache2
69

710
- name: config - Kontakt setzen
811
lineinfile:
912
path: "{{ smokeping_path_config }}/General"
1013
regexp: '^contact ='
1114
line: "contact = {{ smokeping_contact }}"
15+
notify:
16+
- restart smokeping
17+
- restart apache2
1218

1319
- name: config - CGI-URL setzen
1420
lineinfile:
1521
path: "{{ smokeping_path_config }}/General"
1622
regexp: '^cgiurl ='
1723
line: "cgiurl = {{ smokeping_cgiurl }}"
24+
notify:
25+
- restart smokeping
26+
- restart apache2
1827

1928
- name: config - CGI-URL setzen
2029
lineinfile:
2130
path: "{{ smokeping_path_config }}/pathnames"
2231
regexp: '^imgurl ='
2332
line: "imgurl = {{ smokeping_imgurl }}"
33+
notify:
34+
- restart smokeping
35+
- restart apache2
36+
37+
- name: cron - Übertrage Konfigurationsdateien
38+
template:
39+
src: "{{ item }}"
40+
dest: "{{ smokeping_path_config }}"
41+
with_items:
42+
- oni-server
43+
- Targets
44+
notify:
45+
- restart smokeping
46+
- restart apache2

Diff for: roles/ping-primary/tasks/install.yml

+3
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@
55
packages:
66
- smokeping
77
- libapache2-mod-fcgid
8+
notify:
9+
- restart smokeping
10+
- restart apache2

Diff for: roles/ping-primary/tasks/web.yml

+9
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
file:
33
dest: "{{ smokeping_path_web }}"
44
state: directory
5+
notify:
6+
- restart smokeping
7+
- restart apache2
58

69
- name: web - Kopiere Daten für Webseite
710
copy:
@@ -10,9 +13,15 @@
1013
with_items:
1114
- favicon.ico
1215
- Opennet_logo.png
16+
notify:
17+
- restart smokeping
18+
- restart apache2
1319

1420
- name: web - SmokePing Webseite anpassen
1521
lineinfile:
1622
path: "/etc/smokeping/basepage.html"
1723
regexp: 'navbar-user'
1824
line: '<div class="navbar-user"><img src="/Opennet_logo.png" height="45" /></div>'
25+
notify:
26+
- restart smokeping
27+
- restart apache2

Diff for: roles/ping-primary/templates/Targets

+12-42
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,24 @@
11
# {{ ansible_managed }}
22

3+
*** Targets ***
4+
5+
probe = FPing
6+
37
menu = Top
4-
title = Opennet Monitoring - SmokePing
8+
title = Opennet Monitoring - SmokePing
59
remark = Welcome to the SmokePing website of the Opennet Initiative. \
610
Here you will learn all about the latency of our network.
711

8-
+ Server-Gateways
9-
menu = Opennet Server Gateways
10-
title = Opennet Mesh Network - Server - Gateway
11-
12-
{% for host in smokeping_targets_server_gateway %}
13-
++ {{ host | replace(".", "-") }}
14-
host = {{ host }}
15-
{% endfor %}
16-
17-
+ Server-Services
18-
menu = Opennet Server Services
19-
title = Opennet Mesh Network - Server - Service
20-
21-
{% for host in smokeping_targets_server_service %}
22-
++ {{ host | replace(".", "-") }}
23-
host = {{ host }}
24-
{% endfor %}
25-
26-
+ Server-Virtualization
27-
menu = Opennet Server Virtualization
28-
title = Opennet Mesh Network - Server - Virtualization
29-
30-
{% for host in smokeping_targets_server_virtualization %}
31-
++ {{ host | replace(".", "-") }}
32-
host = {{ host }}
33-
{% endfor %}
34-
35-
+ Server-Other
36-
menu = Opennet Server Other
37-
title = Opennet Mesh Network - Server - Other
38-
39-
{% for host in smokeping_targets_server_other %}
40-
++ {{ host | replace(".", "-") }}
41-
host = {{ host }}
42-
{% endfor %}
12+
@include /etc/smokeping/config.d/oni-server
4313

44-
+ Access-Point-Online
14+
+ Opennet-Access-Points-Online
4515
menu = Opennet Access Point (Online)
46-
title = Opennet Mesh Network - Access Point - Online
16+
title = Opennet Mesh Network - Access Points Online
4717

48-
@include {{ smokeping_path_config }}/oni-accesspoints-online
18+
@include /etc/smokeping/config.d/oni-accesspoints-online
4919

50-
+ Access-Point-Flapping
20+
+ Opennet-Access-Points-Flapping
5121
menu = Opennet Access Point (Flapping)
52-
title = Opennet Mesh Network - Access Point - Flapping
22+
title = Opennet Mesh Network - Access Points Flapping
5323

54-
@include {{ smokeping_path_config }}/oni-accesspoints-flapping
24+
@include /etc/smokeping/config.d/oni-accesspoints-flapping

Diff for: roles/ping-primary/templates/oni-server

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# {{ ansible_managed }}
2+
3+
+ Opennet-Server-Gateways
4+
menu = Opennet Server Gateways
5+
title = Opennet Mesh Network - Server - Gateways
6+
7+
{% for host in smokeping_targets_server_gateway %}
8+
++ {{ host | replace(".", "-") }}
9+
host = {{ host }}
10+
{% endfor %}
11+
12+
+ Opennet-Server-Services
13+
menu = Opennet Server Services
14+
title = Opennet Mesh Network - Server - Services
15+
16+
{% for host in smokeping_targets_server_service %}
17+
++ {{ host | replace(".", "-") }}
18+
host = {{ host }}
19+
{% endfor %}
20+
21+
+ Opennet-Server-Virtualization
22+
menu = Opennet Server Virtualization
23+
title = Opennet Mesh Network - Server - Virtualization
24+
25+
{% for host in smokeping_targets_server_virtualization %}
26+
++ {{ host | replace(".", "-") }}
27+
host = {{ host }}
28+
{% endfor %}
29+
30+
+ Opennet-Server-Other
31+
menu = Opennet Server Other
32+
title = Opennet Mesh Network - Server - Other
33+
34+
{% for host in smokeping_targets_server_other %}
35+
++ {{ host | replace(".", "-") }}
36+
host = {{ host }}
37+
{% endfor %}

0 commit comments

Comments
 (0)