summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp/templates
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/site_webapp/templates
parent44666c42ce836fb611dfd9c1b549e955c470814c (diff)
parenteac3056c237d523f4786593922fe8f88eb65dff7 (diff)
Merge branch 'feature/mxtest' into develop
Diffstat (limited to 'puppet/modules/site_webapp/templates')
-rw-r--r--puppet/modules/site_webapp/templates/config.yml.erb3
1 files changed, 2 insertions, 1 deletions
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?