Terrrydactyl has uploaded a new change for review.
https://gerrit.wikimedia.org/r/152108
Change subject: Added CentralAuth url and testing databases
......................................................................
Added CentralAuth url and testing databases
Change-Id: I67fc09a18c8c63c782e381cc3e33859e8d7f6d14
---
M manifests/database.pp
M templates/db_config.yaml.erb
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/wikimetrics
refs/changes/08/152108/1
diff --git a/manifests/database.pp b/manifests/database.pp
index b4f2e86..c3968d0 100644
--- a/manifests/database.pp
+++ b/manifests/database.pp
@@ -10,7 +10,7 @@
# $db_user - username of wikimetrics database user.
Default: wikimetrics
# $db_pass - password of wikimetrics database user.
Default: wikimetrics
# $db_name_wikimetrics - name of wikimetrics database. Default:
wikimetrics
-# $db_names_testing - name of of testing databases. Default:
['wikimetrics_testing', 'wiki_testing', 'wiki2_testing']
+# $db_names_testing - name of of testing databases. Default:
['wikimetrics_testing', 'wiki_testing', 'wiki2_testing', 'centralauth_testing']
# $db_root_user - Name of user MySQL commands will be
executed as. Default: 'root'
# $db_root_pass - Password for $db_root_user. Default: no
password
# $wikimetrics_path - Path to wikimetrics source. Default:
'/srv/wikimetrics'
@@ -19,7 +19,7 @@
$db_user = 'wikimetrics',
$db_pass = 'wikimetrics', # you should really change
this one
$db_name_wikimetrics = 'wikimetrics',
- $db_names_testing = ['wikimetrics_testing', 'wiki_testing',
'wiki2_testing'],
+ $db_names_testing = ['wikimetrics_testing', 'wiki_testing',
'wiki2_testing', 'centralauth_testing'],
$db_root_user = 'root',
$db_root_pass = undef,
$wikimetrics_path = '/srv/wikimetrics',
diff --git a/templates/db_config.yaml.erb b/templates/db_config.yaml.erb
index d8433fc..66e4303 100644
--- a/templates/db_config.yaml.erb
+++ b/templates/db_config.yaml.erb
@@ -4,6 +4,7 @@
MEDIAWIKI_ENGINE_URL_TEMPLATE : 'mysql://<%= @db_user_mediawiki %>:<%=
@db_pass_mediawiki %>@<%= @db_host_mediawiki %>/<%= @db_name_mediawiki %>'
MEDIAWIKI_POOL_SIZE : <%= @db_pool_mediawiki %>
DEBUG : <%= @debug ? 'True' : 'False' %>
+CENTRALAUTH_ENGINE_URL : 'mysql://<%= @db_user_mediawiki %>:<%=
@db_pass_mediawiki %>@<%= @db_host_mediawiki %>/centralauth'
<% if @revision_tablename -%>
REVISION_TABLENAME : <%= @revision_tablename %>
<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/152108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67fc09a18c8c63c782e381cc3e33859e8d7f6d14
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Terrrydactyl <tcho...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
