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

use of variables w/ out a '@' has been deprecated, and as of 3.2.x Puppet warns about it

Browse source
This commit is contained in:
Chris Rutter 2013-05-24 10:01:52 -04:00
parent 2fafc3301c
commit 6194354a7b
4 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
templates/my.cnf.erb
View file

@ -1,24 +1,24 @@
[client] [client]
port = <%= port %> port = <%= @port %>
socket = <%= socket %> socket = <%= @socket %>
[mysqld_safe] [mysqld_safe]
socket = <%= socket %> socket = <%= @socket %>
nice = 0 nice = 0
<% if log_error == 'syslog' -%> <% if @log_error == 'syslog' -%>
syslog syslog
<% end -%> <% end -%>
[mysqld] [mysqld]
user = mysql user = mysql
pid-file = <%= pidfile %> pid-file = <%= @pidfile %>
socket = <%= socket %> socket = <%= @socket %>
port = <%= port %> port = <%= @port %>
basedir = <%= basedir %> basedir = <%= @basedir %>
datadir = <%= datadir %> datadir = <%= @datadir %>
tmpdir = /tmp tmpdir = /tmp
skip-external-locking skip-external-locking
<% if bind_address %> <% if @bind_address %>
bind-address = <%= bind_address %> bind-address = <%= @bind_address %>
<% end %> <% end %>
key_buffer = 16M key_buffer = 16M
@ -28,18 +28,18 @@ thread_cache_size = 8
myisam-recover = BACKUP myisam-recover = BACKUP
query_cache_limit = 1M query_cache_limit = 1M
query_cache_size = 16M query_cache_size = 16M
<% if log_error != 'syslog' -%> <% if @log_error != 'syslog' -%>
log_error = <%= log_error %> log_error = <%= @log_error %>
<% end -%> <% end -%>
expire_logs_days = 10 expire_logs_days = 10
max_binlog_size = 100M max_binlog_size = 100M
<% if default_engine != 'UNSET' %> <% if default_engine != 'UNSET' %>
default-storage-engine = <%= default_engine %> default-storage-engine = <%= @default_engine %>
<% end %> <% end %>
<% if ssl == true %> <% if @ssl == true %>
ssl-ca = <%= ssl_ca %> ssl-ca = <%= @ssl_ca %>
ssl-cert = <%= ssl_cert %> ssl-cert = <%= @ssl_cert %>
ssl-key = <%= ssl_key %> ssl-key = <%= @ssl_key %>
<% end %> <% end %>
[mysqldump] [mysqldump]

4
templates/my.cnf.pass.erb
View file

@ -1,6 +1,6 @@
[client] [client]
user=root user=root
host=localhost host=localhost
<% unless root_password == 'UNSET' -%> <% unless @root_password == 'UNSET' -%>
password=<%= root_password %> password=<%= @root_password %>
<% end -%> <% end -%>

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

@ -1,5 +1,5 @@
### MANAGED BY PUPPET ### ### MANAGED BY PUPPET ###
<% settings.sort.each do |section, content| -%> <% @settings.sort.each do |section, content| -%>
[<%= 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| -%>

8
templates/mysqlbackup.sh.erb
View file

@ -10,14 +10,14 @@
# #
##### START CONFIG ################################################### ##### START CONFIG ###################################################
USER=<%= backupuser %> USER=<%= @backupuser %>
PASS=<%= backuppassword %> PASS=<%= @backuppassword %>
DIR=<%= backupdir %> DIR=<%= @backupdir %>
##### STOP CONFIG #################################################### ##### STOP CONFIG ####################################################
PATH=/usr/bin:/usr/sbin:/bin:/sbin PATH=/usr/bin:/usr/sbin:/bin:/sbin
find $DIR -mtime +30 -exec rm -f {} \; find $DIR -mtime +30 -exec rm -f {} \;
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}/mysql_backup_`date +%Y%m%d-%H%M%S`.sql<% if backupcompress %>.bz2<% end %> --all-databases <% if @backupcompress %>| bzcat -zc <% end %>> ${DIR}/mysql_backup_`date +%Y%m%d-%H%M%S`.sql<% if @backupcompress %>.bz2<% end %>