opendev/puppet-meetbot
Code Issues Proposed changes

Merge "Fix template variables"

Browse Source
This commit is contained in:
Zuul 2018-07-02 20:57:45 +00:00 committed by Gerrit Code Review
commit fbd5b1515e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/index.html.erb
View File

@ -4,10 +4,10 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title><%= name.capitalize %> IRC log server</title> <title><%= @name.capitalize %> IRC log server</title>
</head> </head>
<body> <body>
<h1>Welcome to <%= name.capitalize %> IRC log server</h1> <h1>Welcome to <%= @name.capitalize %> IRC log server</h1>
<ul> <ul>
<li><a href="/irclogs/">Channel Logs</a></li> <li><a href="/irclogs/">Channel Logs</a></li>
<li><a href="/meetings/">Meeting Logs</a></li> <li><a href="/meetings/">Meeting Logs</a></li>

2
templates/vhost.erb
View File

@ -7,7 +7,7 @@ NameVirtualHost <%= @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 ! ['', nil].include?(@serveraliases) -%>
<%= " ServerAlias #{@serveraliases}" %> <%= " ServerAlias #{@serveraliases}" %>
<% end -%> <% end -%>
DocumentRoot <%= @docroot %> DocumentRoot <%= @docroot %>