projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move pg-receive-file-from-backup to postgres module
[mirror/dsa-puppet.git]
/
data
/
common.yaml
diff --git
a/data/common.yaml
b/data/common.yaml
index
970397a
..
3e45e09
100644
(file)
--- a/
data/common.yaml
+++ b/
data/common.yaml
@@
-32,7
+32,7
@@
roles::dns_primary::allow_access:
- '2a01:3f0:0:28::25'
# bacula
#
- '2a01:3f0:0:28::25'
# bacula
#
-bacula::
operator_emai
l: 'bacula-reports@admin.debian.org'
+bacula::
email_al
l: 'bacula-reports@admin.debian.org'
bacula::ssl_ca_path: '/etc/ssl/debian/certs/ca.crt'
bacula::ssl_client_cert: '/etc/ssl/debian/certs/thishost.crt'
bacula::ssl_client_key: '/etc/ssl/private/thishost.key'
bacula::ssl_ca_path: '/etc/ssl/debian/certs/ca.crt'
bacula::ssl_client_cert: '/etc/ssl/debian/certs/thishost.crt'
bacula::ssl_client_key: '/etc/ssl/private/thishost.key'
@@
-71,23
+71,12
@@
apt::sources::debian::location: 'https://deb.debian.org/debian/'
# all of these should be retired in favour of including the class role
# with the host. weasel, 2019-09
roles:
# all of these should be retired in favour of including the class role
# with the host. weasel, 2019-09
roles:
- postgres_backup_server:
- # XXX - used by ferm templates/defs.conf.erb
- - backuphost.debian.org
- - storace.debian.org
postgresql_server:
postgresql_server:
- # postgresql instances not managed by puppet otherwise
- - bmdb1.debian.org
- - buxtehude.debian.org
- - danzi.debian.org
- - fasolo.debian.org
+ # these use pg-receive-file-from-backup which is defined in the
+ # postgres::backup_source class. This should be
+ # cleaned up and handled properly, including the ssh auth keys setup
- lw07.debian.org
- lw07.debian.org
- - melartin.debian.org
- - postgresql-manda-01.debian.org
- - sallinen.debian.org
- - seger.debian.org
- snapshotdb-manda-01.debian.org
- snapshotdb-manda-01.debian.org
- - vittoria.debian.org
classes:
- base::includes
classes:
- base::includes