opendev
/
puppet-drupal
Code Issues Proposed changes

Fix @var deprecation warnings in drupal templates 

Change-Id: I603d54bc6fb002f634c2da77465ad6569c08ce0a
This commit is contained in:
William Van Hevelingen 2014-03-23 10:13:56 -07:00
parent 8a9bdf192e
commit 678a4c1dea
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
templates/drupal.vhost.erb
View File

@ -3,16 +3,16 @@
# Managed by Puppet
# ************************************
NameVirtualHost <%= vhost_name %>:<%= port %>
<VirtualHost <%= vhost_name %>:<%= port %>>
ServerName <%= srvname %>
<% if serveraliases.is_a? Array -%>
<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
<% elsif serveraliases != '' -%>
<%= " ServerAlias #{serveraliases}" %>
NameVirtualHost <%= @vhost_name %>:<%= @port %>
<VirtualHost <%= @vhost_name %>:<%= @port %>>
ServerName <%= @srvname %>
<% if @serveraliases.is_a? Array -%>
<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
<% elsif @serveraliases != '' -%>
<%= " ServerAlias #{@serveraliases}" %>
<% end -%>
DocumentRoot <%= docroot %>
<Directory <%= site_docroot %>>
DocumentRoot <%= @docroot %>
<Directory <%= @site_docroot %>>
Options FollowSymLinks MultiViews
AllowOverride None
Order allow,deny
@ -132,8 +132,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
</IfModule>
</IfModule>
</Directory>
ErrorLog /var/log/apache2/<%= name %>_error.log
ErrorLog /var/log/apache2/<%= @name %>_error.log
LogLevel warn
CustomLog /var/log/apache2/<%= name %>_access.log combined
CustomLog /var/log/apache2/<%= @name %>_access.log combined
ServerSignature Off
</VirtualHost>

20
templates/site.config.erb
View File

@ -1,13 +1,13 @@
# Site deployment config file: <%= site_name %>
# Site deployment config file: <%= @site_name %>
#
site_tarball=<%= site_staging_root %>/<%= site_staging_tarball %>
db_url=mysql://<%= site_mysql_user %>:<%= site_mysql_password %>@<%= site_mysql_host %>/<%= site_mysql_database %>
site_admin_password=<%= site_admin_password %>
site_name=<%= site_name %>
profile_name=<%= site_profile %>
dest_dir=<%= site_docroot %>
flag_file=<%= site_deploy_flagfile %>
site_tarball=<%= @site_staging_root %>/<%= @site_staging_tarball %>
db_url=mysql://<%= @site_mysql_user %>:<%= @site_mysql_password %>@<%= @site_mysql_host %>/<%= @site_mysql_database %>
site_admin_password=<%= @site_admin_password %>
site_name=<%= @site_name %>
profile_name=<%= @site_profile %>
dest_dir=<%= @site_docroot %>
flag_file=<%= @site_deploy_flagfile %>
is_clean=true
base_url=<%= site_base_url %>
file_owner=<%= site_file_owner %>
base_url=<%= @site_base_url %>
file_owner=<%= @site_file_owner %>