opuppet/module-puppetlabs-mysql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplify a few things.

Browse source
This commit is contained in:
Ashley Penney 2013-07-09 23:12:38 -04:00
parent 4e6073de92
commit b00a6758a2
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/my.cnf.erb
View file

@ -92,7 +92,7 @@ default-storage-engine = <%= @default_engine %>
<% if @character_set != 'UNSET' -%> <% if @character_set != 'UNSET' -%>
character-set-server = <%= @character_set %> character-set-server = <%= @character_set %>
<% end -%> <% end -%>
<% if @ssl == true %> <% if @ssl %>
ssl-ca = <%= @ssl_ca %> ssl-ca = <%= @ssl_ca %>
ssl-cert = <%= @ssl_cert %> ssl-cert = <%= @ssl_cert %>
ssl-key = <%= @ssl_key %> ssl-key = <%= @ssl_key %>

2
templates/my.conf.cnf.erb
View file

@ -3,7 +3,7 @@
[<%= section %>] [<%= section %>]
<% content.sort.each do |key, values| -%> <% content.sort.each do |key, values| -%>
<% [values].flatten.sort.each do |value| -%> <% [values].flatten.sort.each do |value| -%>
<%= value == false ? '#' : '' %><%= key -%><%= <%= !value ? '#' : '' %><%= key -%><%=
case value case value
when true, false when true, false
'' ''

2
templates/mysqlbackup.sh.erb
View file

@ -34,7 +34,7 @@ cleanup
mysqldump -u${USER} -p${PASS} --opt --flush-logs --single-transaction \ mysqldump -u${USER} -p${PASS} --opt --flush-logs --single-transaction \
--all-databases <% if @backupcompress %>| bzcat -zc <% end %>> ${DIR}/${PREFIX}`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %>.bz2<% end %> --all-databases <% if @backupcompress %>| bzcat -zc <% end %>> ${DIR}/${PREFIX}`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %>.bz2<% end %>
<% if not @delete_before_dump -%> <% unless @delete_before_dump -%>
if [ $? -eq 0 ] ; then if [ $? -eq 0 ] ; then
cleanup cleanup
fi fi