diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-13 11:58:37 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-13 11:58:37 -0500 |
| commit | e20017a22d135361980c4889f1827e5ecd3fd1af (patch) | |
| tree | 9e7c44c39cb7b481c8320ff73c785370ed0cba9d /templates/inoticoming.default.erb | |
| parent | 4ea15148100fdf0f8b172901c41ba58b06ff0bec (diff) | |
| parent | cc12ced0f3f62c975f9f711da67770ffb33d7ba7 (diff) | |
Merge branch 'master' into leap
this brings our master back to before we made some changes. I've split out
those changes into topic branches, and rebased them on top of the current state
of master. I will merge those in next
Conflicts:
manifests/init.pp
templates/distributions.erb
Diffstat (limited to 'templates/inoticoming.default.erb')
| -rw-r--r-- | templates/inoticoming.default.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/inoticoming.default.erb b/templates/inoticoming.default.erb index a298a16..dd4d55d 100644 --- a/templates/inoticoming.default.erb +++ b/templates/inoticoming.default.erb @@ -5,7 +5,7 @@ # for an explanation of options and actions, see inoticoming(1) # user to run inoticoming as -USER=reprepro +USER=<%= @user %> # log to some file instead of syslog # required if you want to use --stdout-to-log or --stderr-to-log in actions |