Merge branch 'develop' (0.5.0)

Conflicts:
	.gitignore

Change-Id: I778f3e1f1f4832f5894bc149ead67e9a4becf304

2 files changed, 77 insertions, 0 deletions

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
new file mode 100644
index 00000000..b59eac01
--- /dev/null
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -0,0 +1,62 @@
+class leap_mx {
+
+  $leap_mx          = hiera('couchdb_leap_mx_user')
+  $couchdb_user     = $leap_mx['username']
+  $couchdb_password = $leap_mx['password']
+
+  $couchdb_host     = 'localhost'
+  $couchdb_port     = '4096'
+
+  include soledad::common
+  include site_apt::preferences::twisted
+
+  #
+  # USER AND GROUP
+  #
+
+  group { 'leap-mx':
+    ensure    => present,
+    allowdupe => false;
+  }
+
+  user { 'leap-mx':
+    ensure    => present,
+    allowdupe => false,
+    gid       => 'leap-mx',
+    home      => '/etc/leap',
+    require   => Group['leap-mx'];
+  }
+
+  #
+  # LEAP-MX CONFIG
+  #
+
+  file { '/etc/leap/mx.conf':
+    content => template('leap_mx/mx.conf.erb'),
+    owner   => 'leap-mx',
+    group   => 'leap-mx',
+    mode    => '0600',
+    notify  => Service['leap-mx'];
+  }
+
+  #
+  # LEAP-MX CODE
+  #
+
+  package { 'leap-mx':
+    ensure  => installed,
+    require => Class['site_apt::preferences::twisted']
+  }
+
+  #
+  # LEAP-MX DAEMON
+  #
+
+  service { 'leap-mx':
+    ensure     => running,
+    enable     => true,
+    hasstatus  => true,
+    hasrestart => true,
+    require    => [ Package['leap-mx'] ];
+  }
+}
diff --git a/puppet/modules/leap_mx/templates/mx.conf.erb b/puppet/modules/leap_mx/templates/mx.conf.erb
new file mode 100644
index 00000000..e05bc150
--- /dev/null
+++ b/puppet/modules/leap_mx/templates/mx.conf.erb
@@ -0,0 +1,15 @@
+[mail1]
+path=/var/mail/vmail/Maildir
+recursive=True
+
+[couchdb]
+user=<%= @couchdb_user %>
+password=<%= @couchdb_password %>
+server=<%= @couchdb_host %>
+port=<%= @couchdb_port %>
+
+[alias map]
+port=4242
+
+[check recipient]
+port=2244