diff options
| author | Micah Anderson <micah@leap.se> | 2014-04-04 10:37:09 -0400 | 
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-04-04 10:37:09 -0400 | 
| commit | 6af957a1c20f75a827655a3cd75e40a03cffe7c4 (patch) | |
| tree | e5995b0c4b53583fd9d16857f66f81137dccbf73 /puppet/modules/leap_mx | |
| parent | 7451213d5e0772d0d6cba4613bf66792da495909 (diff) | |
| parent | 1551f785c5c7c515781995928eec7659365d8988 (diff) | |
Merge branch '0.5' into develop
Conflicts:
	provider_base/services/tor.json
Change-Id: I826579945a0d93c43384f0fd12c9833762b084cf
Diffstat (limited to 'puppet/modules/leap_mx')
| -rw-r--r-- | puppet/modules/leap_mx/templates/mx.conf.erb | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/puppet/modules/leap_mx/templates/mx.conf.erb b/puppet/modules/leap_mx/templates/mx.conf.erb index bf1e6421..e05bc150 100644 --- a/puppet/modules/leap_mx/templates/mx.conf.erb +++ b/puppet/modules/leap_mx/templates/mx.conf.erb @@ -1,5 +1,5 @@  [mail1] -path=/var/mail/vmail +path=/var/mail/vmail/Maildir  recursive=True  [couchdb] @@ -12,4 +12,4 @@ port=<%= @couchdb_port %>  port=4242  [check recipient] -port=2244
\ No newline at end of file +port=2244 | 
