diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-06 14:07:17 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-06 14:07:17 -0500 |
| commit | ce1ebea7cc3911ebac616a8a065a484b9452e72b (patch) | |
| tree | aab52e2f06ae31b39a34d59b5432311f30a22911 /templates/inoticoming.default.erb | |
| parent | 31a7ed2a84d909215f1f12ed2bb78bb5fe28bbcd (diff) | |
| parent | 50075192d8827d7fa8721ffb6847fedbb4a99c60 (diff) | |
Merge branch 'master' into leap
There were merge conflicts with this merge, but I deliberately
merged with '-s recursive -X theirs' to take the shared modules
version of the changes.
We had some changes that we made, that I will incorporate as
separate commits on top of shared
Diffstat (limited to 'templates/inoticoming.default.erb')
| -rw-r--r-- | templates/inoticoming.default.erb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/templates/inoticoming.default.erb b/templates/inoticoming.default.erb index b666851..a298a16 100644 --- a/templates/inoticoming.default.erb +++ b/templates/inoticoming.default.erb @@ -1,3 +1,5 @@ +# This file is managed by Puppet. Do not edit, any changes will be overwritten! + # /etc/default/inoticoming # # for an explanation of options and actions, see inoticoming(1) @@ -11,12 +13,12 @@ LOGFILE="/var/log/incoming.log" # first search the directory for files already existing # 0 for false, 1 for true -INITIALSEARCH=0 +INITIALSEARCH=1 # directory to monitor -DIR=<%= basedir %>/incoming +DIR=<%= @basedir %>/incoming # actions -BASEDIR=<%= basedir %> +BASEDIR=<%= @basedir %> RULENAME=incoming ACTIONS="--suffix .changes --stderr-to-log reprepro -s -b $BASEDIR --waitforlock 1000 processincoming $RULENAME {} ;" |