KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323500
Change subject: contenttranslation: Add CookieDomain configuration
......................................................................
contenttranslation: Add CookieDomain configuration
Change-Id: I7fa872dc2e1810b7c0e9f8f3ac715f9ac1d557aa
---
M puppet/hieradata/common.yaml
M puppet/modules/contenttranslation/manifests/init.pp
2 files changed, 16 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/00/323500/1
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 02badb6..7f955be 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -37,6 +37,7 @@
contenttranslation::action_template:
"//$1%{hiera('mediawiki::multiwiki::base_domain')}%{::port_fragment}/w/index.php?title=$2"
contenttranslation::api_template:
"//$1%{hiera('mediawiki::multiwiki::base_domain')}%{::port_fragment}/w/api.php"
contenttranslation::cx_template:
"//127.0.0.1:%{::contenttranslation::cxserver::port}/v1"
+contenttranslation::cookieDonain: 'null'
contenttranslation::database_host: "%{hiera('mysql::grant_host_name')}"
contenttranslation::database: 'contenttranslation'
contenttranslation::database_user: "%{hiera('mediawiki::multiwiki::db_user')}"
diff --git a/puppet/modules/contenttranslation/manifests/init.pp
b/puppet/modules/contenttranslation/manifests/init.pp
index 538a530..1f6f6ed 100644
--- a/puppet/modules/contenttranslation/manifests/init.pp
+++ b/puppet/modules/contenttranslation/manifests/init.pp
@@ -21,6 +21,9 @@
# [*cx_template*]
# The url template for the local cxserver service.
#
+# [*cookieDomain*]
+# Cookie domain configuration.
+#
# [*database_host*]
# The DB host for grant purposes
#
@@ -75,6 +78,7 @@
$action_template,
$api_template,
$cx_template,
+ $cookieDomain,
$database_host,
$database,
$database_user,
@@ -94,16 +98,17 @@
mediawiki::extension { 'ContentTranslation':
settings => {
- 'wgContentTranslationSiteTemplates["view"]' => $view_template,
- 'wgContentTranslationSiteTemplates["action"]' => $action_template,
- 'wgContentTranslationSiteTemplates["api"]' => $api_template,
- 'wgContentTranslationSiteTemplates["cx"]' => $cx_template,
- 'wgContentTranslationDatabase' => $database,
- 'wgContentTranslationEventLogging' => $eventlogging,
- 'wgContentTranslationTranslateInTarget' => $intarget,
- 'wgContentTranslationAsBetaFeature' => $betafeature,
- 'wgContentTranslationTargetNamespace' => $namespace,
- 'wgContentTranslationEnableSuggestions' => $suggestions,
+ 'wgContentTranslationSiteTemplates["view"]' =>
$view_template,
+ 'wgContentTranslationSiteTemplates["action"]' =>
$action_template,
+ 'wgContentTranslationSiteTemplates["api"]' =>
$api_template,
+ 'wgContentTranslationSiteTemplates["cx"]' =>
$cx_template,
+ 'wgContentTranslationSiteTemplates["cookieDomain"]' =>
$cookieDomain,
+ 'wgContentTranslationDatabase' => $database,
+ 'wgContentTranslationEventLogging' =>
$eventlogging,
+ 'wgContentTranslationTranslateInTarget' => $intarget,
+ 'wgContentTranslationAsBetaFeature' =>
$betafeature,
+ 'wgContentTranslationTargetNamespace' => $namespace,
+ 'wgContentTranslationEnableSuggestions' =>
$suggestions,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/323500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fa872dc2e1810b7c0e9f8f3ac715f9ac1d557aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: KartikMistry <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
