summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-04-08 10:41:54 -0700
committerelijah <elijah@riseup.net>2016-04-08 10:41:54 -0700
commit82b15a8a071ba099cf52bb00c66caebdbd265273 (patch)
tree3f27b0673839be7d10ed5b401216ab79e43ce751 /puppet/modules
parent44666c42ce836fb611dfd9c1b549e955c470814c (diff)
parenteac3056c237d523f4786593922fe8f88eb65dff7 (diff)
Merge branch 'feature/mxtest' into develop
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_config/templates/hosts3
-rw-r--r--puppet/modules/site_postfix/manifests/mx/static_aliases.pp2
-rw-r--r--puppet/modules/site_webapp/templates/config.yml.erb3
3 files changed, 5 insertions, 3 deletions
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?