Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/151864
Change subject: Allow overriding postgres datadir
......................................................................
Allow overriding postgres datadir
Also honour the version specified in postgresql.conf.erb
Change-Id: Ia2bbced2dccd504a30774ce846a24a74d1dd6af1
---
M modules/postgresql/manifests/master.pp
M modules/postgresql/manifests/server.pp
M modules/postgresql/manifests/slave.pp
M modules/postgresql/templates/postgresql.conf.erb
4 files changed, 13 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/151864/1
diff --git a/modules/postgresql/manifests/master.pp
b/modules/postgresql/manifests/master.pp
index bfb16f2..3aee185 100644
--- a/modules/postgresql/manifests/master.pp
+++ b/modules/postgresql/manifests/master.pp
@@ -34,12 +34,14 @@
$max_wal_senders=3,
$checkpoint_segments=64,
$wal_keep_segments=128
+ $datadir=undef,
) {
class { 'postgresql::server':
pgversion => $pgversion,
ensure => $ensure,
includes => [ $includes, 'master.conf'],
+ datadir => $datadir,
}
file { "/etc/postgresql/${pgversion}/main/master.conf":
diff --git a/modules/postgresql/manifests/server.pp
b/modules/postgresql/manifests/server.pp
index 242b6ed..21be8a9 100644
--- a/modules/postgresql/manifests/server.pp
+++ b/modules/postgresql/manifests/server.pp
@@ -25,6 +25,7 @@
$includes=[],
$listen_addresses='*',
$port='5432'
+ $datadir=undef,
) {
package { [
diff --git a/modules/postgresql/manifests/slave.pp
b/modules/postgresql/manifests/slave.pp
index d73e7bb..133a430 100644
--- a/modules/postgresql/manifests/slave.pp
+++ b/modules/postgresql/manifests/slave.pp
@@ -30,12 +30,14 @@
$includes=[],
$pgversion='9.1',
$ensure='present',
+ $datadir=undef,
) {
class { 'postgresql::server':
pgversion => $pgversion,
ensure => $ensure,
includes => [ $includes, 'slave.conf'],
+ datadir => $datadir,
}
file { "/etc/postgresql/${pgversion}/main/slave.conf":
diff --git a/modules/postgresql/templates/postgresql.conf.erb
b/modules/postgresql/templates/postgresql.conf.erb
index 58757f4..f25cee1 100644
--- a/modules/postgresql/templates/postgresql.conf.erb
+++ b/modules/postgresql/templates/postgresql.conf.erb
@@ -38,15 +38,19 @@
# The default values of these variables are driven from the -D command-line
# option or PGDATA environment variable, represented here as ConfigDir.
-data_directory = '/var/lib/postgresql/9.1/main' # use data in
another directory
+<% if @datadir %>
+data_directory = <%= @datadir %> # use data in another directory
+<% else %>
+data_directory = '/var/lib/postgresql/<%= @pgversion %>/main' # use
data in another directory
+<% end %>
# (change requires restart)
-hba_file = '/etc/postgresql/9.1/main/pg_hba.conf' # host-based
authentication file
+hba_file = '/etc/postgresql/<%= @pgversion %>> /main/pg_hba.conf' #
host-based authentication file
# (change requires restart)
-ident_file = '/etc/postgresql/9.1/main/pg_ident.conf' # ident configuration
file
+ident_file = '/etc/postgresql/<%= @pgversion %>/main/pg_ident.conf' # ident
configuration file
# (change requires restart)
# If external_pid_file is not explicitly set, no extra PID file is written.
-external_pid_file = '/var/run/postgresql/9.1-main.pid' # write an
extra PID file
+external_pid_file = '/var/run/postgresql/<%= @pgversion %>-main.pid'
# write an extra PID file
# (change requires restart)
--
To view, visit https://gerrit.wikimedia.org/r/151864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2bbced2dccd504a30774ce846a24a74d1dd6af1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
