freifunk/ansible-ffibk
9
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix systemd service scripts (#12)

Browse source
This commit is contained in:
n0trax 2017-12-14 19:45:27 +01:00 committed by kokel
parent 2faa4e11dd
commit 7abc41ee92
6 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roles/service-prometheus/README.md
View file

@ -52,9 +52,6 @@ prometheus_install_path: /opt/prometheus
# directory for configuration files # directory for configuration files
prometheus_config_path: /etc/prometheus prometheus_config_path: /etc/prometheus
# directory for PID files
prometheus_pid_path: /var/run/prometheus
# directory for temporary files # directory for temporary files
prometheus_download_path: /tmp prometheus_download_path: /tmp

1
roles/service-prometheus/defaults/main.yml
View file

@ -21,7 +21,6 @@ prometheus_rule_path: "{{ prometheus_config_path }}/rules"
prometheus_file_sd_config_path: "{{ prometheus_config_path }}/tgroups" prometheus_file_sd_config_path: "{{ prometheus_config_path }}/tgroups"
prometheus_db_path: /var/lib/prometheus prometheus_db_path: /var/lib/prometheus
alertmanager_db_path: /var/lib/alertmanager alertmanager_db_path: /var/lib/alertmanager
prometheus_pid_path: /var/run/prometheus
prometheus_download_path: /tmp prometheus_download_path: /tmp
prometheus_workdir: "{{ prometheus_download_path }}/prometheus_workdir" prometheus_workdir: "{{ prometheus_download_path }}/prometheus_workdir"

1
roles/service-prometheus/tasks/main.yml
View file

@ -24,7 +24,6 @@
with_items: with_items:
- "{{ prometheus_install_path }}" - "{{ prometheus_install_path }}"
- "{{ prometheus_config_path }}" - "{{ prometheus_config_path }}"
- "{{ prometheus_pid_path }}"
- name: install helper utility "gosu" - name: install helper utility "gosu"
include_tasks: install-gosu.yml include_tasks: install-gosu.yml

5
roles/service-prometheus/templates/alertmanager.service.j2
View file

@ -5,8 +5,6 @@ After=network.target
[Service] [Service]
Type=simple Type=simple
PIDFile={{ prometheus_pid_path }}/alertmanager.pid
User={{ prometheus_user }} User={{ prometheus_user }}
Group={{ prometheus_group }} Group={{ prometheus_group }}
@ -16,3 +14,6 @@ ExecStart={{ alertmanager_daemon_dir }}/alertmanager {{ alertmanager_default_opt
ExecStart={{ alertmanager_daemon_dir }}/alertmanager {{ alertmanager_default_opts }} ExecStart={{ alertmanager_daemon_dir }}/alertmanager {{ alertmanager_default_opts }}
{% endif %} {% endif %}
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target

5
roles/service-prometheus/templates/node_exporter.service.j2
View file

@ -5,8 +5,6 @@ After=network.target
[Service] [Service]
Type=simple Type=simple
PIDFile={{ prometheus_pid_path }}/node_exporter.pid
User={{ prometheus_user }} User={{ prometheus_user }}
Group={{ prometheus_group }} Group={{ prometheus_group }}
@ -16,3 +14,6 @@ ExecStart={{ node_exporter_daemon_dir }}/node_exporter {{ node_exporter_opts }}
ExecStart={{ node_exporter_daemon_dir }}/node_exporter ExecStart={{ node_exporter_daemon_dir }}/node_exporter
{% endif %} {% endif %}
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target

5
roles/service-prometheus/templates/prometheus.service.j2
View file

@ -5,8 +5,6 @@ After=network.target
[Service] [Service]
Type=simple Type=simple
PIDFile={{ prometheus_pid_path }}/prometheus.pid
User={{ prometheus_user }} User={{ prometheus_user }}
Group={{ prometheus_group }} Group={{ prometheus_group }}
@ -16,3 +14,6 @@ ExecStart={{ prometheus_daemon_dir }}/prometheus {{ prometheus_default_opts }} {
ExecStart={{ prometheus_daemon_dir }}/prometheus {{ prometheus_default_opts }} ExecStart={{ prometheus_daemon_dir }}/prometheus {{ prometheus_default_opts }}
{% endif %} {% endif %}
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target