[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Minor fixes to the wikilabels role
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405035 ) Change subject: Minor fixes to the wikilabels role .. Minor fixes to the wikilabels role Change-Id: I1182e76d094eca9a2ea3ede425d32e349b3e4132 --- M puppet/modules/wikilabels/manifests/init.pp 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/wikilabels/manifests/init.pp b/puppet/modules/wikilabels/manifests/init.pp index fb8ee4c..1e13f22 100644 --- a/puppet/modules/wikilabels/manifests/init.pp +++ b/puppet/modules/wikilabels/manifests/init.pp @@ -8,13 +8,13 @@ # Path where Wikilabels should be installed (example: '/vagrant/srv/wikilabels'). # # [*db_name*] -# Logical MySQL database name (example: 'wikilabels'). +# Logical PostgreSQL database name (example: 'wikilabels'). # # [*db_user*] -# MySQL user to use to connect to the database (example: 'wikidb'). +# PostgreSQL user to use to connect to the database (example: 'wikidb'). # # [*db_pass*] -# Password for MySQL account (example: 'secret123'). +# Password for PostgreSQL account (example: 'secret123'). # # [*vhost_name*] # Hostname of the Wikilabels server (example: 'wikilabels.local.wmftest.net'). @@ -82,7 +82,7 @@ exec { 'initialize wikilabels database': # puppet does not allow specifying separate users for command and unless so sudoing ensues command => "echo y | sudo -u www-data ${deploy_dir}/bin/wikilabels load_schema --reload-test-data", -unless => "sudo -u postgres psql -d ${db_name} -c \"SELECT 'campaign'::regclass\"", +unless => "sudo -u postgres psql -d ${db_name} -c \"SELECT 'campaign'::regclass\" >& /dev/null", cwd => $repo_dir, require => [ Exec['create wikilabels database'], -- To view, visit https://gerrit.wikimedia.org/r/405035 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1182e76d094eca9a2ea3ede425d32e349b3e4132 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: AwightGerrit-Reviewer: BryanDavis Gerrit-Reviewer: Dduvall Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Minor fixes to the wikilabels role
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405035 ) Change subject: Minor fixes to the wikilabels role .. Minor fixes to the wikilabels role Change-Id: I1182e76d094eca9a2ea3ede425d32e349b3e4132 --- M puppet/modules/wikilabels/manifests/init.pp 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/35/405035/1 diff --git a/puppet/modules/wikilabels/manifests/init.pp b/puppet/modules/wikilabels/manifests/init.pp index fb8ee4c..1e13f22 100644 --- a/puppet/modules/wikilabels/manifests/init.pp +++ b/puppet/modules/wikilabels/manifests/init.pp @@ -8,13 +8,13 @@ # Path where Wikilabels should be installed (example: '/vagrant/srv/wikilabels'). # # [*db_name*] -# Logical MySQL database name (example: 'wikilabels'). +# Logical PostgreSQL database name (example: 'wikilabels'). # # [*db_user*] -# MySQL user to use to connect to the database (example: 'wikidb'). +# PostgreSQL user to use to connect to the database (example: 'wikidb'). # # [*db_pass*] -# Password for MySQL account (example: 'secret123'). +# Password for PostgreSQL account (example: 'secret123'). # # [*vhost_name*] # Hostname of the Wikilabels server (example: 'wikilabels.local.wmftest.net'). @@ -82,7 +82,7 @@ exec { 'initialize wikilabels database': # puppet does not allow specifying separate users for command and unless so sudoing ensues command => "echo y | sudo -u www-data ${deploy_dir}/bin/wikilabels load_schema --reload-test-data", -unless => "sudo -u postgres psql -d ${db_name} -c \"SELECT 'campaign'::regclass\"", +unless => "sudo -u postgres psql -d ${db_name} -c \"SELECT 'campaign'::regclass\" >& /dev/null", cwd => $repo_dir, require => [ Exec['create wikilabels database'], -- To view, visit https://gerrit.wikimedia.org/r/405035 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1182e76d094eca9a2ea3ede425d32e349b3e4132 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Awight___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits