[MediaWiki-commits] [Gerrit] Revert "Postgresql: init database with Puppet" - change (operations/puppet)

2016-06-21 Thread Gehel (Code Review) 
Gehel has submitted this change and it was merged.

Change subject: Revert "Postgresql: init database with Puppet"
..


Revert "Postgresql: init database with Puppet"

This reverts commit 230c9fd41dc7536b7a45a01a3641b56ec081a98e.

Change-Id: I00f12c4a9c11ec065fa6378608f95d74d0190083
---
M modules/postgresql/manifests/master.pp
1 file changed, 0 insertions(+), 12 deletions(-)

Approvals:
  Gehel: Verified; Looks good to me, approved



diff --git a/modules/postgresql/manifests/master.pp 
b/modules/postgresql/manifests/master.pp
index 5a273ed..148a67c 100644
--- a/modules/postgresql/manifests/master.pp
+++ b/modules/postgresql/manifests/master.pp
@@ -43,8 +43,6 @@
 $root_dir='/var/lib/postgresql',
 ) {
 
-$data_dir = "${root_dir}/${pgversion}/main"
-
 class { 'postgresql::server':
 ensure=> $ensure,
 pgversion => $pgversion,
@@ -59,15 +57,5 @@
 mode=> '0444',
 content => template('postgresql/master.conf.erb'),
 require => Class['postgresql::server'],
-}
-
-if $ensure == 'present' {
-exec { 'pg-initdb':
-command => "/usr/lib/postgresql/${pgversion}/bin/initdb -D 
${data_dir}",
-user=> 'postgres',
-unless  => "/usr/bin/test -f ${data_dir}/PG_VERSION",
-require => Class['postgresql::server'],
-notify  => Exec['pgreload'],
-}
 }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/295373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I00f12c4a9c11ec065fa6378608f95d74d0190083
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Revert "Postgresql: init database with Puppet" - change (operations/puppet)

2016-06-21 Thread Gehel (Code Review) 
Gehel has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295373

Change subject: Revert "Postgresql: init database with Puppet"
..

Revert "Postgresql: init database with Puppet"

This reverts commit 230c9fd41dc7536b7a45a01a3641b56ec081a98e.

Change-Id: I00f12c4a9c11ec065fa6378608f95d74d0190083
---
M modules/postgresql/manifests/master.pp
1 file changed, 0 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/295373/1

diff --git a/modules/postgresql/manifests/master.pp 
b/modules/postgresql/manifests/master.pp
index 5a273ed..148a67c 100644
--- a/modules/postgresql/manifests/master.pp
+++ b/modules/postgresql/manifests/master.pp
@@ -43,8 +43,6 @@
 $root_dir='/var/lib/postgresql',
 ) {
 
-$data_dir = "${root_dir}/${pgversion}/main"
-
 class { 'postgresql::server':
 ensure=> $ensure,
 pgversion => $pgversion,
@@ -59,15 +57,5 @@
 mode=> '0444',
 content => template('postgresql/master.conf.erb'),
 require => Class['postgresql::server'],
-}
-
-if $ensure == 'present' {
-exec { 'pg-initdb':
-command => "/usr/lib/postgresql/${pgversion}/bin/initdb -D 
${data_dir}",
-user=> 'postgres',
-unless  => "/usr/bin/test -f ${data_dir}/PG_VERSION",
-require => Class['postgresql::server'],
-notify  => Exec['pgreload'],
-}
 }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/295373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00f12c4a9c11ec065fa6378608f95d74d0190083
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits