diff options
| author | varac <varacanero@zeromail.org> | 2015-11-03 19:19:33 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-11-17 19:51:11 +0100 |
| commit | 40455b8d66d2680debfa408de63533e80baee259 (patch) | |
| tree | dbec294053527d4979191c4f7bf8f22327d07014 | |
| parent | 24a83a7db1408b6b8956266327ae0823fe07ecc4 (diff) | |
[feat] Query erb variables like puppet 3 needs it
- Related: #6920
| -rw-r--r-- | puppet/modules/site_apache/templates/vhosts.d/common.conf.erb | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb index 7f9fd5ab..21c3a211 100644 --- a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb +++ b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb @@ -1,18 +1,18 @@ <VirtualHost *:80> - ServerName <%= webapp_domain %> - ServerAlias <%= domain_name %> - ServerAlias <%= domain %> - ServerAlias www.<%= domain %> + ServerName <%= @webapp_domain %> + ServerAlias <%= @domain_name %> + ServerAlias <%= @domain %> + ServerAlias www.<%= @domain %> RewriteEngine On - RewriteRule ^.*$ https://<%= webapp_domain -%>%{REQUEST_URI} [R=permanent,L] + RewriteRule ^.*$ https://<%= @webapp_domain -%>%{REQUEST_URI} [R=permanent,L] CustomLog ${APACHE_LOG_DIR}/other_vhosts_access.log common </VirtualHost> <VirtualHost *:443> - ServerName <%= webapp_domain %> - ServerAlias <%= domain_name %> - ServerAlias <%= domain %> - ServerAlias www.<%= domain %> + ServerName <%= @webapp_domain %> + ServerAlias <%= @domain_name %> + ServerAlias <%= @domain %> + ServerAlias www.<%= @domain %> CustomLog ${APACHE_LOG_DIR}/other_vhosts_access.log common SSLCACertificatePath /etc/ssl/certs @@ -69,4 +69,3 @@ </DirectoryMatch> <% end -%> </VirtualHost> - |