diff options
| author | elijah <elijah@riseup.net> | 2012-12-19 12:12:16 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2012-12-19 12:12:16 -0800 |
| commit | c3c23bbc27dee3fdcdf9aec6addcc816ad7b52ba (patch) | |
| tree | 87a6e1ed0f61fe90fb6b089d695f6de897119128 /puppet/modules/site_webapp | |
| parent | 109334ec46ffdde3a96119fd6108080bd1d45c8a (diff) | |
webapp api now uses a customizable port (so that we don't try to rely on SNI for hosting two TLS domains on one IP).
Diffstat (limited to 'puppet/modules/site_webapp')
| -rw-r--r-- | puppet/modules/site_webapp/manifests/apache.pp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp index 8532cc38..554b9147 100644 --- a/puppet/modules/site_webapp/manifests/apache.pp +++ b/puppet/modules/site_webapp/manifests/apache.pp @@ -1,6 +1,9 @@ class site_webapp::apache { - $api_domain = hiera('api_domain') + $web_api = hiera('api') + $api_domain = $web_api['domain'] + $api_port = $web_api['port'] + $x509 = hiera('x509') $commercial_key = $x509['commercial_key'] $commercial_cert = $x509['commercial_cert'] |