opendev
/
puppet-drupal
Code Issues Proposed changes

Merge "Fix scope of vhost template variables"

This commit is contained in:
Zuul 2018-06-12 22:39:23 +00:00 committed by Gerrit Code Review
parent 26bb0c054b 1de34a782d
commit 65619c9583
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
templates/drupal.vhost.erb
View File

@ -5,7 +5,7 @@
NameVirtualHost <%= @vhost_name %>:80 NameVirtualHost <%= @vhost_name %>:80
<VirtualHost <%= @vhost_name %>:80> <VirtualHost <%= @vhost_name %>:80>
<% if @site_ssl_enabled %> <% if scope.lookupvar('::drupal::site_ssl_enabled') %>
ServerName <%= @srvname %> ServerName <%= @srvname %>
Redirect / https://<%= @srvname %>/ Redirect / https://<%= @srvname %>/
</VirtualHost> </VirtualHost>
@ -14,10 +14,10 @@ NameVirtualHost <%= @vhost_name %>:443
<VirtualHost <%= @vhost_name %>:443> <VirtualHost <%= @vhost_name %>:443>
SSLEngine on SSLEngine on
SSLProtocol All -SSLv2 -SSLv3 SSLProtocol All -SSLv2 -SSLv3
SSLCertificateFile <%= @site_ssl_cert_file %> SSLCertificateFile <%= scope.lookupvar('::drupal::site_ssl_cert_file') %>
SSLCertificateKeyFile <%= @site_ssl_key_file %> SSLCertificateKeyFile <%= scope.lookupvar('::drupal::site_ssl_key_file') %>
<% if @site_ssl_chain_file_contents %> <% if scope.lookupvar('::drupal::site_ssl_chain_file_contents') %>
SSLCertificateChainFile <%= @site_ssl_chain_file %> SSLCertificateChainFile <%= scope.lookupvar('::drupal::site_ssl_chain_file') %>
<% end %> <% end %>
<% end %> <% end %>
ServerName <%= @srvname %> ServerName <%= @srvname %>
@ -30,7 +30,7 @@ NameVirtualHost <%= @vhost_name %>:443
<Directory <%= @docroot %>> <Directory <%= @docroot %>>
Options FollowSymLinks MultiViews Options FollowSymLinks MultiViews
AllowOverride None AllowOverride None
<% if @new_vhost_perms %> <% if scope.lookupvar('::drupal::new_vhost_perms') %>
Require all granted Require all granted
<% else %> <% else %>
Order allow,deny Order allow,deny