copr-be: copr-ping: use system paths
So NRPE can execute/read those files. Also update the log file format a bit.
This commit is contained in:
parent
a8ffcd6575
commit
06f2e4b236
2 changed files with 33 additions and 9 deletions
|
@ -2,8 +2,22 @@
|
||||||
- set_fact:
|
- set_fact:
|
||||||
ping_user: copr-ping
|
ping_user: copr-ping
|
||||||
ping_scriptdir: /home/copr-ping
|
ping_scriptdir: /home/copr-ping
|
||||||
ping_log: /home/copr-ping/ping.log
|
ping_log: /var/log/copr-ping.log
|
||||||
ping_script: copr-ping-script.sh
|
ping_script: copr-ping-script.sh
|
||||||
|
ping_check: copr-ping-check.py
|
||||||
|
tags: copr_ping
|
||||||
|
|
||||||
|
- stat: path={{ ping_log }}
|
||||||
|
register: ping_log
|
||||||
|
tags: copr_ping
|
||||||
|
|
||||||
|
- name: pre-create ping log file
|
||||||
|
file:
|
||||||
|
path: "{{ ping_log }}"
|
||||||
|
owner: "{{ ping_user }}"
|
||||||
|
group: nagios
|
||||||
|
mode: '0644'
|
||||||
|
when: not ping_log.stat.exists
|
||||||
tags: copr_ping
|
tags: copr_ping
|
||||||
|
|
||||||
- name: create the user ping user
|
- name: create the user ping user
|
||||||
|
@ -14,16 +28,22 @@
|
||||||
dnf: name=copr-cli state=latest
|
dnf: name=copr-cli state=latest
|
||||||
tags: copr_ping
|
tags: copr_ping
|
||||||
|
|
||||||
- name: install a stub script
|
- name: install the ping script
|
||||||
template:
|
template:
|
||||||
dest: "{{ ping_scriptdir }}/{{ item }}"
|
dest: "{{ ping_scriptdir }}/{{ ping_script }}"
|
||||||
src: "{{ item }}.j2"
|
src: "{{ ping_script }}.j2"
|
||||||
|
owner: "{{ ping_user }}"
|
||||||
|
group: "{{ ping_user }}"
|
||||||
|
mode: 0700
|
||||||
|
tags: copr_ping
|
||||||
|
|
||||||
|
- name: install the check script
|
||||||
|
template:
|
||||||
|
dest: "/usr/bin/{{ ping_check }}"
|
||||||
|
src: "{{ ping_check }}.j2"
|
||||||
owner: "{{ ping_user }}"
|
owner: "{{ ping_user }}"
|
||||||
group: "{{ ping_user }}"
|
group: "{{ ping_user }}"
|
||||||
mode: 0700
|
mode: 0700
|
||||||
with_items:
|
|
||||||
- copr-ping-script.sh
|
|
||||||
- copr-ping-check.py
|
|
||||||
tags: copr_ping
|
tags: copr_ping
|
||||||
|
|
||||||
- name: rebuild the copr-ping package periodically
|
- name: rebuild the copr-ping package periodically
|
||||||
|
|
|
@ -1,7 +1,11 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
|
||||||
start_time=$(date +%s)
|
start_time=$(date +%s)
|
||||||
copr build-package @copr/copr-ping --name copr-ping
|
output=$(copr build-package @copr/copr-ping --name copr-ping)
|
||||||
exit_status=$?
|
exit_status=$?
|
||||||
echo "start=$start_time stop=$(date +%s) exit_status=$exit_status" \
|
stop_time=$(date +%s)
|
||||||
|
build_id=$(echo "$output" | grep 'Created builds:' | cut -d' ' -f3)
|
||||||
|
took=$(( stop_time - start_time ))
|
||||||
|
|
||||||
|
echo "build_id=$build_id start=$start_time stop=$stop_time took=$took exit_status=$exit_status" \
|
||||||
>> ~/ping.log
|
>> ~/ping.log
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue