From d8a066a4307bea4c6dd6741daa250b67c92c1606 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 25 Jul 2013 14:40:53 -0400
Subject: initial leap_mx configuration

Change-Id: Iddca4cf52706bf2f612d20ba19a53fbbe6b28479
---
 puppet/modules/leap_mx/manifests/init.pp     | 56 ++++++++++++++++++++++++++++
 puppet/modules/leap_mx/templates/mx.conf.erb | 15 ++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 puppet/modules/leap_mx/manifests/init.pp
 create mode 100644 puppet/modules/leap_mx/templates/mx.conf.erb

(limited to 'puppet/modules/leap_mx')

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
new file mode 100644
index 00000000..652eb85b
--- /dev/null
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -0,0 +1,56 @@
+class leap_mx {
+
+  $couchdb_host     = 'localhost'
+  $couchdb_port     = '4096'
+  $couchdb_user     = $soledad::couchdb::user
+  $couchdb_password = $soledad::couchdb::password
+
+  #
+  # 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;
+  }
+
+  #
+  # 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..bf1e6421
--- /dev/null
+++ b/puppet/modules/leap_mx/templates/mx.conf.erb
@@ -0,0 +1,15 @@
+[mail1]
+path=/var/mail/vmail
+recursive=True
+
+[couchdb]
+user=<%= @couchdb_user %>
+password=<%= @couchdb_password %>
+server=<%= @couchdb_host %>
+port=<%= @couchdb_port %>
+
+[alias map]
+port=4242
+
+[check recipient]
+port=2244
\ No newline at end of file
-- 
cgit v1.2.3


From 04502b614692145141c606f9ed052da4b1e4572a Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 31 Jul 2013 16:02:16 +0200
Subject: fix Could not find dependent Service[leap-mx] (Bug #3331)

---
 puppet/modules/leap_mx/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/leap_mx')

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index 652eb85b..23fd1054 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -46,7 +46,7 @@ class leap_mx {
   # LEAP-MX DAEMON
   #
 
-  service { 'leap_mx':
+  service { 'leap-mx':
     ensure     => running,
     enable     => true,
     hasstatus  => true,
-- 
cgit v1.2.3


From 80ae781667ab1d8803593e03fc9c928b86db5e97 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 31 Jul 2013 17:40:26 +0200
Subject: fix /etc/leap/mx.conf doesn't contain any user credentials (Feature
 #3347)

---
 puppet/modules/leap_mx/manifests/init.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/leap_mx')

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index 23fd1054..1e186bbb 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -1,9 +1,10 @@
 class leap_mx {
 
+  $couchdb_admin_user = hiera('couchdb_admin_user')
   $couchdb_host     = 'localhost'
   $couchdb_port     = '4096'
-  $couchdb_user     = $soledad::couchdb::user
-  $couchdb_password = $soledad::couchdb::password
+  $couchdb_user     = $couchdb_admin_user['username']
+  $couchdb_password = $couchdb_admin_user['password']
 
   #
   # USER AND GROUP
-- 
cgit v1.2.3


From 2eec8200a35ea71e1ea5a1a56fe3a266603284fc Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 15 Aug 2013 14:48:38 -0400
Subject: Because both soledad and leap-mx do not function with twisted 12, we
 had to backport twisted 13. In order to install the backported dependencies
 we need an apt preferences_snippet installed for the backported twisted
 packages

Change-Id: I886bb735eeb3abe7955c7cf054b749554ab84746
---
 puppet/modules/leap_mx/manifests/init.pp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'puppet/modules/leap_mx')

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index 1e186bbb..ffa4519d 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -6,6 +6,8 @@ class leap_mx {
   $couchdb_user     = $couchdb_admin_user['username']
   $couchdb_password = $couchdb_admin_user['password']
 
+  include site_apt::preferences::twisted
+  
   #
   # USER AND GROUP
   #
-- 
cgit v1.2.3


From 92ad38f756f277866e6a3953dbc3e7f31b99898f Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Tue, 27 Aug 2013 15:07:02 -0400
Subject: now that soledad has been split we can better organize things (#3579)

 . create a soledad::common class
 . leap-mx now only needs to include soledad-common
 . move the site_apt::preferences::twisted to a preferences block inside the soledad server class
 . make sure that the packages are doing 'ensure => latest' instead of installed

Change-Id: Ifa978e831cdc8835666b27322a6e068d67251f5d
---
 puppet/modules/leap_mx/manifests/init.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/leap_mx')

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index ffa4519d..25b2758f 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -6,8 +6,9 @@ class leap_mx {
   $couchdb_user     = $couchdb_admin_user['username']
   $couchdb_password = $couchdb_admin_user['password']
 
+  include soledad::common
   include site_apt::preferences::twisted
-  
+
   #
   # USER AND GROUP
   #
@@ -42,7 +43,8 @@ class leap_mx {
   #
 
   package { 'leap-mx':
-    ensure => installed;
+    ensure  => installed,
+    require => Class['site_apt::preferences::twisted']
   }
 
   #
-- 
cgit v1.2.3


From c42879b031a8363e0ad575550c0fd36b269e9e28 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 28 Nov 2013 10:05:28 -0500
Subject: remove admin access from leap_mx

Change-Id: I0bbe42677d7680c99bf205ed4f6080026b308d77
---
 puppet/modules/leap_mx/manifests/init.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'puppet/modules/leap_mx')

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index 25b2758f..0d05a834 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -1,10 +1,11 @@
 class leap_mx {
 
-  $couchdb_admin_user = hiera('couchdb_admin_user')
-  $couchdb_host     = 'localhost'
+  $couchdb          = hiera('couch')
+  $couchdb_users    = $couchdb['users']
+  $couchdb_user     = $couchdb_users['leap_mx']['username']
+  $couchdb_password = $couchdb_users['leap_mx']['password']
+
   $couchdb_port     = '4096'
-  $couchdb_user     = $couchdb_admin_user['username']
-  $couchdb_password = $couchdb_admin_user['password']
 
   include soledad::common
   include site_apt::preferences::twisted
-- 
cgit v1.2.3


From 408621e4b57b9df1d67fa32eba8d15b83b8d1fd4 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 28 Nov 2013 11:52:31 -0500
Subject: remove leap_mx admin user and fix leap_mx couchdb hiera variables

Change-Id: I052576279d8a47313cd99412fdd7b715daa73374
---
 puppet/modules/leap_mx/manifests/init.pp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'puppet/modules/leap_mx')

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index 0d05a834..d1625f5a 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -1,9 +1,8 @@
 class leap_mx {
 
-  $couchdb          = hiera('couch')
-  $couchdb_users    = $couchdb['users']
-  $couchdb_user     = $couchdb_users['leap_mx']['username']
-  $couchdb_password = $couchdb_users['leap_mx']['password']
+  $mx               = hiera('mx')
+  $couchdb_user     = $mx['couchdb_leap_mx_user']['username']
+  $couchdb_password = $mx['couchdb_leap_mx_password']['password']
 
   $couchdb_port     = '4096'
 
-- 
cgit v1.2.3


From 76c3048a15719bc1dd15287fd3406e94d40684ab Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 28 Nov 2013 12:00:50 -0500
Subject: fix soledad couchdb hiera variables

Change-Id: I0882fc993b407eddc40c03838050d42c0443bd3d
---
 puppet/modules/leap_mx/manifests/init.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/leap_mx')

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index d1625f5a..e0c3660b 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -1,8 +1,8 @@
 class leap_mx {
 
-  $mx               = hiera('mx')
-  $couchdb_user     = $mx['couchdb_leap_mx_user']['username']
-  $couchdb_password = $mx['couchdb_leap_mx_password']['password']
+  $leap_mx          = hiera('couchdb_leap_mx_user')
+  $couchdb_user     = $leap_mx['username']
+  $couchdb_password = $leap_mx['password']
 
   $couchdb_port     = '4096'
 
-- 
cgit v1.2.3


From ea37ddb5b324686fe2e3489119e4000a50d9a138 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Tue, 3 Dec 2013 12:39:03 -0500
Subject: restore missing couchdb_host variable for leap_mx

Change-Id: I5b21471ab5de55b627a200b256168122f49c1e28
---
 puppet/modules/leap_mx/manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'puppet/modules/leap_mx')

diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index e0c3660b..b59eac01 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -4,6 +4,7 @@ class leap_mx {
   $couchdb_user     = $leap_mx['username']
   $couchdb_password = $leap_mx['password']
 
+  $couchdb_host     = 'localhost'
   $couchdb_port     = '4096'
 
   include soledad::common
-- 
cgit v1.2.3


From 2630c998af6e4d03c3bcc3f4566093aed533dd0c Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 28 Feb 2014 22:57:23 +0100
Subject: leap_mx: watch /var/mail/vmail/Maildir instead of /var/mail/vmai
 (Feature #5223)

---
 puppet/modules/leap_mx/templates/mx.conf.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/leap_mx')

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
-- 
cgit v1.2.3