From 5b8a4588b81c6000c27711c1929de792156bb21c Mon Sep 17 00:00:00 2001 From: Spencer Krum Date: Wed, 16 Jul 2014 00:15:05 -0700 Subject: [PATCH] Fixing deprecation warnings in cgit module Change-Id: Ie5ef97fea66c33abfbd073a15dd3ae200517c3ee --- templates/git.vhost.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/git.vhost.erb b/templates/git.vhost.erb index 9bda1f8..6d77a56 100644 --- a/templates/git.vhost.erb +++ b/templates/git.vhost.erb @@ -2,10 +2,10 @@ ServerName <%= scope.lookupvar("cgit::vhost_name") %> ServerAdmin <%= scope.lookupvar("cgit::serveradmin") %> -<% if serveraliases.is_a? Array -%> -<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> -<% elsif serveraliases != '' -%> -<%= " ServerAlias #{serveraliases}" -%> +<% if @serveraliases.is_a? Array -%> +<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> +<% elsif @serveraliases != '' -%> +<%= " ServerAlias #{@serveraliases}" -%> <% end -%> Alias /cgit-data /usr/share/cgit @@ -33,10 +33,10 @@ ServerName <%= scope.lookupvar("cgit::vhost_name") %> ServerAdmin <%= scope.lookupvar("cgit::serveradmin") %> -<% if serveraliases.is_a? Array -%> -<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> -<% elsif serveraliases != '' -%> -<%= " ServerAlias #{serveraliases}" -%> +<% if @serveraliases.is_a? Array -%> +<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> +<% elsif @serveraliases != '' -%> +<%= " ServerAlias #{@serveraliases}" -%> <% end -%> Alias /cgit-data /usr/share/cgit