tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated all templates to use instance variables

Browse source
This commit is contained in:
Ossi Salmi 2013-05-05 00:07:55 +03:00
parent a0c854d3c0
commit dc51af1ca2
113 changed files with 527 additions and 522 deletions
Download patch file Download diff file Expand all files Collapse all files

16
mythtv/templates/config.xml.erb
View file

@ -2,19 +2,19 @@
<UPnP>
<MythFrontend>
<DefaultBackend>
<DBHostName><%= mythtv_dbhost -%></DBHostName>
<DBUserName><%= mythtv_dbuser -%></DBUserName>
<DBPassword><%= mythtv_dbpass -%></DBPassword>
<DBName><%= mythtv_dbname -%></DBName>
<DBHostName><%= @mythtv_dbhost -%></DBHostName>
<DBUserName><%= @mythtv_dbuser -%></DBUserName>
<DBPassword><%= @mythtv_dbpass -%></DBPassword>
<DBName><%= @mythtv_dbname -%></DBName>
<DBPort>3306</DBPort>
</DefaultBackend>
</MythFrontend>
</UPnP>
<Database>
<Host><%= mythtv_dbhost %></Host>
<UserName><%= mythtv_dbuser %></UserName>
<Password><%= mythtv_dbpass %></Password>
<DatabaseName><%= mythtv_dbname %></DatabaseName>
<Host><%= @mythtv_dbhost %></Host>
<UserName><%= @mythtv_dbuser %></UserName>
<Password><%= @mythtv_dbpass %></Password>
<DatabaseName><%= @mythtv_dbname %></DatabaseName>
<Port>3306</Port>
</Database>
</Configuration>

8
mythtv/templates/mysql.txt.erb
View file

@ -1,13 +1,13 @@
DBHostName=<%= mythtv_dbhost %>
DBHostName=<%= @mythtv_dbhost %>
# By default, Myth tries to ping the DB host to see if it exists.
# If your DB host or network doesn't accept pings, set this to no:
#
#DBHostPing=no
DBUserName=<%= mythtv_dbuser %>
DBPassword=<%= mythtv_dbpass %>
DBName=<%= mythtv_dbname %>
DBUserName=<%= @mythtv_dbuser %>
DBPassword=<%= @mythtv_dbpass %>
DBName=<%= @mythtv_dbname %>
DBType=QMYSQL3
# Set the following if you want to use something other than this

8
mythtv/templates/mythweb.conf.erb
View file

@ -44,10 +44,10 @@ Alias /mythweb/ "/usr/share/mythweb/"
# fine unless you've changed mythtv's mysql.txt file, or are running MythWeb on
# a different server from your main backend. Make sure you have mod_env enabled.
#
setenv db_server "<%= mythtv_dbhost -%>"
setenv db_name "<%= mythtv_dbname -%>"
setenv db_login "<%= mythtv_dbuser -%>"
setenv db_password "<%= mythtv_dbpass -%>"
setenv db_server "<%= @mythtv_dbhost -%>"
setenv db_name "<%= @mythtv_dbname -%>"
setenv db_login "<%= @mythtv_dbuser -%>"
setenv db_password "<%= @mythtv_dbpass -%>"
#
# By default, MythWeb uses the hostname program to look up the hostname of the