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: 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