Fix @var deprecation warnings in drupal templates
Change-Id: I603d54bc6fb002f634c2da77465ad6569c08ce0a
This commit is contained in:
parent
971906b1bf
commit
c2c3864127
|
@ -3,16 +3,16 @@
|
||||||
# Managed by Puppet
|
# Managed by Puppet
|
||||||
# ************************************
|
# ************************************
|
||||||
|
|
||||||
NameVirtualHost <%= vhost_name %>:<%= port %>
|
NameVirtualHost <%= @vhost_name %>:<%= @port %>
|
||||||
<VirtualHost <%= vhost_name %>:<%= port %>>
|
<VirtualHost <%= @vhost_name %>:<%= @port %>>
|
||||||
ServerName <%= srvname %>
|
ServerName <%= @srvname %>
|
||||||
<% if serveraliases.is_a? Array -%>
|
<% if @serveraliases.is_a? Array -%>
|
||||||
<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
|
<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
|
||||||
<% elsif serveraliases != '' -%>
|
<% elsif @serveraliases != '' -%>
|
||||||
<%= " ServerAlias #{serveraliases}" %>
|
<%= " ServerAlias #{@serveraliases}" %>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
DocumentRoot <%= docroot %>
|
DocumentRoot <%= @docroot %>
|
||||||
<Directory <%= site_docroot %>>
|
<Directory <%= @site_docroot %>>
|
||||||
Options FollowSymLinks MultiViews
|
Options FollowSymLinks MultiViews
|
||||||
AllowOverride None
|
AllowOverride None
|
||||||
Order allow,deny
|
Order allow,deny
|
||||||
|
@ -132,8 +132,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
|
||||||
</IfModule>
|
</IfModule>
|
||||||
</IfModule>
|
</IfModule>
|
||||||
</Directory>
|
</Directory>
|
||||||
ErrorLog /var/log/apache2/<%= name %>_error.log
|
ErrorLog /var/log/apache2/<%= @name %>_error.log
|
||||||
LogLevel warn
|
LogLevel warn
|
||||||
CustomLog /var/log/apache2/<%= name %>_access.log combined
|
CustomLog /var/log/apache2/<%= @name %>_access.log combined
|
||||||
ServerSignature Off
|
ServerSignature Off
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
# Site deployment config file: <%= site_name %>
|
# Site deployment config file: <%= @site_name %>
|
||||||
#
|
#
|
||||||
|
|
||||||
site_tarball=<%= site_staging_root %>/<%= site_staging_tarball %>
|
site_tarball=<%= @site_staging_root %>/<%= @site_staging_tarball %>
|
||||||
db_url=mysql://<%= site_mysql_user %>:<%= site_mysql_password %>@<%= site_mysql_host %>/<%= site_mysql_database %>
|
db_url=mysql://<%= @site_mysql_user %>:<%= @site_mysql_password %>@<%= @site_mysql_host %>/<%= @site_mysql_database %>
|
||||||
site_admin_password=<%= site_admin_password %>
|
site_admin_password=<%= @site_admin_password %>
|
||||||
site_name=<%= site_name %>
|
site_name=<%= @site_name %>
|
||||||
profile_name=<%= site_profile %>
|
profile_name=<%= @site_profile %>
|
||||||
dest_dir=<%= site_docroot %>
|
dest_dir=<%= @site_docroot %>
|
||||||
flag_file=<%= site_deploy_flagfile %>
|
flag_file=<%= @site_deploy_flagfile %>
|
||||||
is_clean=true
|
is_clean=true
|
||||||
base_url=<%= site_base_url %>
|
base_url=<%= @site_base_url %>
|
||||||
file_owner=<%= site_file_owner %>
|
file_owner=<%= @site_file_owner %>
|
||||||
|
|
Loading…
Reference in New Issue