From 2a4940b36114b9165135f7fe1f67ade24c2373b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Thu, 24 Jan 2019 19:23:09 +0100 Subject: [PATCH] Install Ruby in the backup cookbook Also switch to the 5.0 beta version, it works with modern Rubies --- site-cookbooks/backup/metadata.rb | 2 ++ site-cookbooks/backup/templates/default/config.rb.erb | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/site-cookbooks/backup/metadata.rb b/site-cookbooks/backup/metadata.rb index 5cd3ae7..3e854e3 100644 --- a/site-cookbooks/backup/metadata.rb +++ b/site-cookbooks/backup/metadata.rb @@ -8,3 +8,5 @@ name "backup" depends 'logrotate' depends 'mysql' +depends 'postgresql' +depends 'build-essential' diff --git a/site-cookbooks/backup/templates/default/config.rb.erb b/site-cookbooks/backup/templates/default/config.rb.erb index dec61a8..ee07022 100644 --- a/site-cookbooks/backup/templates/default/config.rb.erb +++ b/site-cookbooks/backup/templates/default/config.rb.erb @@ -1,7 +1,7 @@ # encoding: utf-8 ## -# Backup v4.x Configuration +# Backup v5.x Configuration # # Documentation: http://backup.github.io/backup # Issue Tracker: https://github.com/backup/backup/issues @@ -56,8 +56,8 @@ end <%- if node["backup"]["postgresql"] -%> Database::PostgreSQL.defaults do |db| - db.username = "<%= node["backup"]["postgresql"]["username"] %>" - db.password = "<%= node["backup"]["postgresql"]["password"] %>" + db.username = "postgres" + db.password = "<%= node['postgresql']['password']['postgres'] %>" db.host = "<%= node["backup"]["postgresql"]["host"] %>" db.port = "<%= node["backup"]["postgresql"]["port"] %>" # db.socket = "/var/run/postgresql/.s.PGSQL.5432"