bump version

- fix ordering of monthday and month in cron

README.md

@@ -436,7 +436,7 @@ Default is:
       dbbackup_password => '',
       dumper            => 'pg_dump',
       dump_flags        => '-Fc',
-      ignore_dbs        => [],
+      ignore_dbs        => [ 'postgres' ],
     },
     misc         => {
       commands   => $::osfamily ? {

manifests/params.pp

@@ -111,7 +111,7 @@ class rsnapshot::params {
       dbbackup_password => '',
       dumper            => 'pg_dump',
       dump_flags        => '-Fc',
-      ignore_dbs        => [],
+      ignore_dbs        => [ 'postgres' ],
       compress          => 'pbzip2',
     },
     misc         => {

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "loomsen-rsnapshot",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "author": "loomsen",
   "summary": "Configures rsnapshot.",
   "license": "Apache-2.0",

templates/cron.erb

@@ -1 +1 @@
-<%= @minute %> <%= @hour %> <%= @month %> <%= @monthday %> <%= @weekday %>  root      /usr/bin/rsnapshot -c <%= @config %> <%= @level %>
+<%= @minute %> <%= @hour %> <%= @monthday %> <%= @month %> <%= @weekday %>  root      /usr/bin/rsnapshot -c <%= @config %> <%= @level %>

templates/misc.sh.erb

@@ -2,6 +2,6 @@
 #This file is managed by puppet
 #
 <%@commands.each do |command| -%>
-ssh -l <%=@backup_user-%> <%=@host-%> '<%=command-%>'
+ssh -l <%=@backup_user-%> <%=@host-%> <%=command-%>
 
 <%end-%>

templates/mysql.sh.erb

@@ -5,7 +5,6 @@
 #
 host=<%=@host%>
 user=<%=@dbbackup_user%>
-pass=<%=@dbbackup_password%>
 
 <% if (@dbbackup_user == 'root' && @dbbackup_password == '') -%>
 dbs=( 

templates/psql.sh.erb

@@ -5,14 +5,12 @@
 #
 host=<%=@host%>
 user=<%=@dbbackup_user%>
-pass=<%=@dbbackup_password%>
 
-PGPASSWORD="$pass"
 dbs=( 
-      $(ssh -l <%=@backup_user-%> "$host" "psql -U ${user} -Atc \"SELECT datname FROM pg_database WHERE NOT datistemplate AND NOT datname ~ '<%@ignore_dbs.each do |db|-%><%if db == @ignore_dbs.last-%><%=db-%><%else-%><%=db-%>|<%end-%><%end-%>'\"")  
+      $(ssh -l <%=@backup_user-%> "$host" "PGPASSWORD='<%=@dbbackup_password%>' psql -U ${user} -Atc \"SELECT datname FROM pg_database WHERE NOT datistemplate AND NOT datname ~ '<%@ignore_dbs.each do |db|-%><%if db == @ignore_dbs.last-%><%=db-%><%else-%><%=db-%>|<%end-%><%end-%>'\"")  
     )
 for db in "${dbs[@]}"; do
-  ssh -l <%=@backup_user-%> "$host" "<%=@dumper-%> -U ${user} <%=@dump_flags-%> ${db}" > "$db".sql
+  ssh -l <%=@backup_user-%> "$host" "PGPASSWORD='<%=@dbbackup_password%>' <%=@dumper-%> -U ${user} <%=@dump_flags-%> ${db}" > "$db".sql
   wait
 <% if @compress != '' -%>
   <%=@compress-%> "$db".sql