diff options
| author | Micah Anderson <micah@riseup.net> | 2009-12-07 16:17:04 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-12-07 16:17:04 -0500 |
| commit | bd68fde7adaf7dbe82dd7842dbfd9734d3e5c688 (patch) | |
| tree | a6539457bfb248d86e060a591e6750a2590c2a80 /templates | |
| parent | ad99d7611f716eada0620417f7d62c095ef38fd1 (diff) | |
| parent | b380f1de1fe62d34f0788fedfb53c1354b0a31a3 (diff) | |
| download | puppet-backupninja-bd68fde7adaf7dbe82dd7842dbfd9734d3e5c688.tar.gz puppet-backupninja-bd68fde7adaf7dbe82dd7842dbfd9734d3e5c688.tar.bz2 | |
Merge remote branch 'anarcat/master'
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/mysql.conf.erb | 4 | ||||
| -rw-r--r-- | templates/rdiff.conf.erb | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/templates/mysql.conf.erb b/templates/mysql.conf.erb index 9d22ab0..14905fd 100644 --- a/templates/mysql.conf.erb +++ b/templates/mysql.conf.erb @@ -12,3 +12,7 @@ end -%> hotcopy = <%= hotcopy ? 'yes' : 'no' %> sqldump = <%= sqldump ? 'yes' : 'no' %> compress = <%= compress ? 'yes' : 'no' %> + +<% if real_configfile %> +configfile = <%= real_configfile %> +<% end %> diff --git a/templates/rdiff.conf.erb b/templates/rdiff.conf.erb index a41e969..23c336f 100644 --- a/templates/rdiff.conf.erb +++ b/templates/rdiff.conf.erb @@ -5,6 +5,8 @@ <%= 'options = ' + options if options %> +<%= extras if extras %> + [source] type = local <%= 'keep = ' + keep if keep %> |