From de13076f7e000d32d5e8f29ebf2e217cc71cfe2c Mon Sep 17 00:00:00 2001 From: Martin Arendtsen Date: Sat, 4 Apr 2015 18:19:25 +0200 Subject: [PATCH 1/2] Added support for .conf in /usr/local/etc --- acts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acts b/acts index 59055a2..2bf5ebe 100755 --- a/acts +++ b/acts @@ -42,8 +42,11 @@ if [ -f acts.conf ] ; then elif [ -f /etc/acts.conf ] ; then . /etc/acts.conf log_debug "Loaded /etc/acts.conf" +elif [ -f /usr/local/etc/acts.conf ] ; then + . /usr/local/etc/acts.conf + log_debug "Loaded /usr/local/etc/acts.conf" else - log_message "No $(pwd)/acts.conf or /etc/acts.conf! Exiting." + log_message "No $(pwd)/acts.conf, /etc/acts.conf or /usr/local/etc/acts.conf! Exiting." exit 1 fi # Use default values if anything is not set From 5bc9674fadd4a0476c5d0fe4123ee6571a339e1c Mon Sep 17 00:00:00 2001 From: Martin Arendtsen Date: Fri, 17 Apr 2015 07:58:30 +0200 Subject: [PATCH 2/2] Updated documentation for where acts.conf can be placed. --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 368e398..022783c 100644 --- a/README.rst +++ b/README.rst @@ -23,7 +23,7 @@ You can use the development version of acts by cloning this repository, or `down Usage ----- -1. Take ``acts.conf`` and customise it for your environment. Put it in ``/etc``. +1. Take ``acts.conf`` and customise it for your environment. Put it in ``/etc`` or ``/usr/local/etc``. 2. Run ``acts`` daily from cron. Notes on behaviour: