From f038109912ec8321ebae3104f4dcd2de20634f43 Mon Sep 17 00:00:00 2001 From: Simon Kelly Date: Mon, 19 Oct 2020 11:32:07 +0200 Subject: [PATCH] move monit process config into main file --- tests/integration/targets/monit/templates/httpd_echo.j2 | 4 ---- tests/integration/targets/monit/templates/monitrc.j2 | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 tests/integration/targets/monit/templates/httpd_echo.j2 diff --git a/tests/integration/targets/monit/templates/httpd_echo.j2 b/tests/integration/targets/monit/templates/httpd_echo.j2 deleted file mode 100644 index 0f605c6e5c..0000000000 --- a/tests/integration/targets/monit/templates/httpd_echo.j2 +++ /dev/null @@ -1,4 +0,0 @@ -check process httpd_echo with pidfile /tmp/httpd_echo.pid - start program = "{{ansible_python.executable}} /opt/httpd_echo.py start" - stop program = "{{ansible_python.executable}} /opt/httpd_echo.py stop" - if failed host localhost port 8082 then restart diff --git a/tests/integration/targets/monit/templates/monitrc.j2 b/tests/integration/targets/monit/templates/monitrc.j2 index b4e8ed5203..3a27eb705f 100644 --- a/tests/integration/targets/monit/templates/monitrc.j2 +++ b/tests/integration/targets/monit/templates/monitrc.j2 @@ -11,4 +11,7 @@ set httpd port 2812 and use address localhost allow localhost -include /etc/monit/conf.d/* +check process httpd_echo with pidfile /tmp/httpd_echo.pid + start program = "{{ansible_python.executable}} /opt/httpd_echo.py start" + stop program = "{{ansible_python.executable}} /opt/httpd_echo.py stop" + if failed host localhost port 8082 then restart