opendev/system-config
Code Issues Proposed changes

Merge "Fixing deprecation warnings in cgit module"

Browse Source
This commit is contained in:
Jenkins 2014-08-11 10:47:18 +00:00 committed by Gerrit Code Review
commit c23f7dd0a8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/cgit/templates/git.vhost.erb
View File

@ -2,10 +2,10 @@
ServerName <%= scope.lookupvar("cgit::vhost_name") %> ServerName <%= scope.lookupvar("cgit::vhost_name") %>
ServerAdmin <%= scope.lookupvar("cgit::serveradmin") %> ServerAdmin <%= scope.lookupvar("cgit::serveradmin") %>
<% 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 -%>
Alias /cgit-data /usr/share/cgit Alias /cgit-data /usr/share/cgit
@ -33,10 +33,10 @@
ServerName <%= scope.lookupvar("cgit::vhost_name") %> ServerName <%= scope.lookupvar("cgit::vhost_name") %>
ServerAdmin <%= scope.lookupvar("cgit::serveradmin") %> ServerAdmin <%= scope.lookupvar("cgit::serveradmin") %>
<% 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 -%>
Alias /cgit-data /usr/share/cgit Alias /cgit-data /usr/share/cgit