projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9854f43
)
Use template variable from the correct scope
author
Peter Palfrader
<peter@palfrader.org>
Sat, 28 Sep 2019 19:01:41 +0000
(21:01 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Sat, 28 Sep 2019 19:01:41 +0000
(21:01 +0200)
modules/postgres/manifests/backup_server.pp
patch
|
blob
|
history
modules/postgres/templates/backup_server/postgres-make-base-backups.erb
patch
|
blob
|
history
modules/postgres/templates/backup_server/sudoers.erb
patch
|
blob
|
history
diff --git
a/modules/postgres/manifests/backup_server.pp
b/modules/postgres/manifests/backup_server.pp
index
4d78c99
..
97fabc2
100644
(file)
--- a/
modules/postgres/manifests/backup_server.pp
+++ b/
modules/postgres/manifests/backup_server.pp
@@
-1,4
+1,4
@@
-#
+
class postgres::backup_server {
include postgres::backup_server::globals
class postgres::backup_server {
include postgres::backup_server::globals
diff --git
a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
index
2141833
..
0a71049
100755
(executable)
--- a/
modules/postgres/templates/backup_server/postgres-make-base-backups.erb
+++ b/
modules/postgres/templates/backup_server/postgres-make-base-backups.erb
@@
-42,7
+42,7
@@
STATEDIR=/var/lib/dsa/postgres-make-base-backups
set -u
if [ "$(id -u)" = 0 ]; then
set -u
if [ "$(id -u)" = 0 ]; then
- echo >&2 "Do not run me as root. Probably you want sudo -u <%=
@backup_unix_user
%>."
+ echo >&2 "Do not run me as root. Probably you want sudo -u <%=
scope['postgres::backup_server::globals::backup_unix_user']
%>."
exit 1
fi
exit 1
fi
diff --git
a/modules/postgres/templates/backup_server/sudoers.erb
b/modules/postgres/templates/backup_server/sudoers.erb
index
3b31cbf
..
8dd41e6
100644
(file)
--- a/
modules/postgres/templates/backup_server/sudoers.erb
+++ b/
modules/postgres/templates/backup_server/sudoers.erb
@@
-1,3
+1,3
@@
# edit with visudo!
# edit with visudo!
-nagios ALL=(<%=
@backup_unix_user %>)
NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backuppg ""
+nagios ALL=(<%=
scope['postgres::backup_server::globals::backup_unix_user'] %>)
NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backuppg ""