summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-06-12 14:47:07 -0400
committerMicah Anderson <micah@riseup.net>2013-06-12 14:47:07 -0400
commit41e09b5aed53948650579547f6fc0a771793f1ae (patch)
tree5bcb1c8a6c7bfe61b2e79168422ea1bca036d632
parent086439b2676a763d4414ea3f2ef80fb0daaba088 (diff)
parent8c038fea91adc87adf9e408c16e2f0ec9838e3d2 (diff)
Merge remote-tracking branch 'leap/develop' into develop
-rw-r--r--provider_base/services/webapp.json3
-rw-r--r--puppet/modules/site_config/templates/hosts8
2 files changed, 7 insertions, 4 deletions
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 3dd9bebe..ad32bb61 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -2,7 +2,8 @@
"webapp": {
"modules": ["user", "billing", "help"],
"couchdb_admin_user": "= global.services[:couchdb].couch.users[:admin]",
- "couchdb_webapp_user": "= global.services[:couchdb].couch.users[:webapp]",
+// "couchdb_webapp_user": "= global.services[:couchdb].couch.users[:webapp]",
+ "couchdb_webapp_user": "= global.services[:couchdb].couch.users[:admin]",
"favicon": "= file_path 'branding/favicon.ico'",
"tail_scss": "= file_path 'branding/tail.scss'",
"head_scss": "= file_path 'branding/head.scss'",
diff --git a/puppet/modules/site_config/templates/hosts b/puppet/modules/site_config/templates/hosts
index 00cc6a79..2c784b05 100644
--- a/puppet/modules/site_config/templates/hosts
+++ b/puppet/modules/site_config/templates/hosts
@@ -1,10 +1,12 @@
# This file is managed by puppet, any changes will be overwritten!
127.0.0.1 localhost
-127.0.1.1 <%= hostname %>.<%= @domain_public %> <%= hostname %>
+127.0.1.1 <%= @hostname %>.<%= @domain_public %> <%= @hostname %>
-<%- if hosts.to_s != '' then -%>
-<%= hosts %>
+<%- if @hosts then -%>
+<% @hosts.each do |name, props| -%>
+<%= props["ip_address"] %> <%= props["domain_full"] %> <%= props["domain_internal"] %> <%= name %>
+<% end -%>
<% end -%>
# The following lines are desirable for IPv6 capable hosts