From: Peter Palfrader Date: Sat, 28 Sep 2019 15:58:09 +0000 (+0200) Subject: whitespace/quoting: postgres::backup_source X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4db291c7e4cccf35b5bc2b22081880111abfbdbc;p=mirror%2Fdsa-puppet.git whitespace/quoting: postgres::backup_source --- diff --git a/modules/postgres/manifests/backup_source.pp b/modules/postgres/manifests/backup_source.pp index 363c8905e..4941bfb55 100644 --- a/modules/postgres/manifests/backup_source.pp +++ b/modules/postgres/manifests/backup_source.pp @@ -2,70 +2,69 @@ # See dsa-wiki input/howto/postgres-backup.creole for some documentation # class postgres::backup_source { - file { "/usr/local/bin/pg-backup-file": - mode => '0555', - source => "puppet:///modules/roles/postgresql_server/pg-backup-file", - } - file { "/usr/local/bin/pg-receive-file-from-backup": - mode => '0555', - source => "puppet:///modules/roles/postgresql_server/pg-receive-file-from-backup", - } - file { "/etc/dsa/pg-backup-file.conf": - content => template('roles/postgresql_server/pg-backup-file.conf.erb'), - } + file { '/usr/local/bin/pg-backup-file': + mode => '0555', + source => 'puppet:///modules/roles/postgresql_server/pg-backup-file', + } + file { '/usr/local/bin/pg-receive-file-from-backup': + mode => '0555', + source => 'puppet:///modules/roles/postgresql_server/pg-receive-file-from-backup', + } + file { '/etc/dsa/pg-backup-file.conf': + content => template('roles/postgresql_server/pg-backup-file.conf.erb'), + } - ssh::keygen {'postgres': } + ssh::keygen {'postgres': } - if $::hostname in [melartin, vittoria] { - postgres::backup_cluster { $::hostname: - pg_version => '9.6', - } - } - if $::hostname in [buxtehude] { - postgres::backup_cluster { $::hostname: - pg_version => '11', - pg_port => 5433, - } - postgres::backup_cluster { "${::hostname}-debbugs": - pg_version => '11', - pg_port => 5441, - pg_cluster => 'debbugs', - } - } - if $::hostname in [danzi] { - postgres::backup_cluster { $::hostname: - pg_version => '9.6', - pg_port => 5433, - } - postgres::backup_cluster { "${::hostname}-tracker": - pg_version => '9.6', - pg_port => 5432, - pg_cluster => 'tracker', - } - postgres::backup_cluster { "${::hostname}-debconf": - pg_version => '9.6', - pg_port => 5434, - pg_cluster => 'debconf', - } - postgres::backup_cluster { "${::hostname}-wannabuild": - pg_version => '9.6', - pg_port => 5436, - pg_cluster => 'wannabuild', - } - } + if $::hostname in [melartin, vittoria] { + postgres::backup_cluster { $::hostname: + pg_version => '9.6', + } + } + if $::hostname in [buxtehude] { + postgres::backup_cluster { $::hostname: + pg_version => '11', + pg_port => 5433, + } + postgres::backup_cluster { "${::hostname}-debbugs": + pg_version => '11', + pg_port => 5441, + pg_cluster => 'debbugs', + } + } + if $::hostname in [danzi] { + postgres::backup_cluster { $::hostname: + pg_version => '9.6', + pg_port => 5433, + } + postgres::backup_cluster { "${::hostname}-tracker": + pg_version => '9.6', + pg_port => 5432, + pg_cluster => 'tracker', + } + postgres::backup_cluster { "${::hostname}-debconf": + pg_version => '9.6', + pg_port => 5434, + pg_cluster => 'debconf', + } + postgres::backup_cluster { "${::hostname}-wannabuild": + pg_version => '9.6', + pg_port => 5436, + pg_cluster => 'wannabuild', + } + } - if $::hostname in [postgresql-manda-01] { - postgres::backup_cluster { "${::hostname}-bacula": - pg_version => '11', - pg_port => 5432, - pg_cluster => 'bacula', - } - } - - if $::hostname in [melartin, vittoria, godard, buxtehude, danzi, postgresql-manda-01] { - postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}": - } - } + if $::hostname in [postgresql-manda-01] { + postgres::backup_cluster { "${::hostname}-bacula": + pg_version => '11', + pg_port => 5432, + pg_cluster => 'bacula', + } + } + if $::hostname in [melartin, vittoria, godard, buxtehude, danzi, postgresql-manda-01] { + postgres::backup_server::register_backup_clienthost { "backup-clienthost-${::fqdn}}": + } + } }