From eac3056c237d523f4786593922fe8f88eb65dff7 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 29 Mar 2016 13:27:01 -0700
Subject: testing: adds mx delivery tests

---
 puppet/modules/site_config/templates/hosts                 | 3 ++-
 puppet/modules/site_postfix/manifests/mx/static_aliases.pp | 2 +-
 puppet/modules/site_webapp/templates/config.yml.erb        | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'puppet/modules')

diff --git a/puppet/modules/site_config/templates/hosts b/puppet/modules/site_config/templates/hosts
index d557f730..d62cbc3f 100644
--- a/puppet/modules/site_config/templates/hosts
+++ b/puppet/modules/site_config/templates/hosts
@@ -6,7 +6,8 @@
 <%- if @hosts then -%>
 <%   @hosts.keys.sort.each do |name| -%>
 <%-     props = @hosts[name] -%>
-<%=     props["ip_address"] %> <%= props["domain_full"] %> <%= props["domain_internal"] %> <%= name %>
+<%-     aliases = props["aliases"] ? props["aliases"].join(' ') : nil -%>
+<%=     [props["ip_address"], props["domain_full"], props["domain_internal"], aliases, name].compact.uniq.join(' ') %>
 <%   end -%>
 <% end -%>
 
diff --git a/puppet/modules/site_postfix/manifests/mx/static_aliases.pp b/puppet/modules/site_postfix/manifests/mx/static_aliases.pp
index 71c0555a..9cd7ca02 100644
--- a/puppet/modules/site_postfix/manifests/mx/static_aliases.pp
+++ b/puppet/modules/site_postfix/manifests/mx/static_aliases.pp
@@ -40,7 +40,7 @@ class site_postfix::mx::static_aliases {
   $local_aliases = [
     'admin', 'administrator', 'bin', 'cron', 'games', 'ftp', 'lp', 'maildrop',
     'mysql', 'news', 'nobody', 'noc', 'postgresql', 'ssladmin', 'sys',
-    'usenet', 'uucp', 'www', 'www-data'
+    'usenet', 'uucp', 'www', 'www-data', 'leap-mx'
   ]
 
   postfix::mailalias {
diff --git a/puppet/modules/site_webapp/templates/config.yml.erb b/puppet/modules/site_webapp/templates/config.yml.erb
index c2e9f3df..dd55d3e9 100644
--- a/puppet/modules/site_webapp/templates/config.yml.erb
+++ b/puppet/modules/site_webapp/templates/config.yml.erb
@@ -22,7 +22,8 @@ production = {
   "service_levels" => @webapp['service_levels'],
   "allow_registration" => @webapp['allow_registration'],
   "handle_blacklist" => @webapp['forbidden_usernames'],
-  "invite_required" => @webapp['invite_required']
+  "invite_required" => @webapp['invite_required'],
+  "api_tokens" => @webapp['api_tokens']
 }
 
 if @webapp['engines'] && @webapp['engines'].any?
-- 
cgit v1.2.3