Gehel has submitted this change and it was merged. Change subject: Remove obsolete graphoid settings ......................................................................
Remove obsolete graphoid settings Change-Id: I0ecd1740e392041f6f3b94ab4cff2fd1a396da91 --- M hieradata/labs/deployment-prep/common.yaml M hieradata/role/common/scb.yaml M modules/graphoid/manifests/init.pp 3 files changed, 11 insertions(+), 49 deletions(-) Approvals: Gehel: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 01e7cce..d35b0db 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -16,21 +16,6 @@ citoid::zotero_port: 1969 changeprop::mwapi_uri: http://deployment-mediawiki02.deployment-prep.eqiad.wmflabs/w/api.php changeprop::restbase_uri: http://deployment-restbase02.deployment-prep.eqiad.wmflabs:7231 -graphoid::domains: - - wmflabs.org - - mediawiki.org - - wikibooks.org - - wikidata.org - - wikimedia.org - - wikimediafoundation.org - - wikinews.org - - wikipedia.org - - wikiquote.org - - wikisource.org - - wikiversity.org - - wikivoyage.org - - wiktionary.org -graphoid::protocol: http graphoid::allowed_domains: http: - wmflabs.org diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml index 84e0c10..433a27f 100644 --- a/hieradata/role/common/scb.yaml +++ b/hieradata/role/common/scb.yaml @@ -11,19 +11,6 @@ - mobileapps-admin - changeprop-admin service::configuration::log_dir: /srv/log -graphoid::domains: -- mediawiki.org -- wikibooks.org -- wikidata.org -- wikimedia.org -- wikimediafoundation.org -- wikinews.org -- wikipedia.org -- wikiquote.org -- wikisource.org -- wikiversity.org -- wikivoyage.org -- wiktionary.org graphoid::allowed_domains: https: - mediawiki.org diff --git a/modules/graphoid/manifests/init.pp b/modules/graphoid/manifests/init.pp index e1b32ac..487cf31 100644 --- a/modules/graphoid/manifests/init.pp +++ b/modules/graphoid/manifests/init.pp @@ -5,29 +5,21 @@ # # === Parameters # -# [*domains*] -# The list of enabled domains. Default: [] -# -# [*domain_map*] -# The domain-to-domain alias map. Default: {} -# -# [*protocol*] -# The default protocol to use when connecting to the MW api. Default: https -# -# [*timeout*] -# The timeout (in ms) for requests. Default: 5000 -# # [*allowed_domains*] # The protocol-to-list-of-domains map. Default: {} # The protocols include http, https, as well as some custom graph-specific protocols. # See https://www.mediawiki.org/wiki/Extension:Graph?venotify=restored#External_data # +# [*domain_map*] +# The domain-to-domain alias map. Default: {} +# +# [*timeout*] +# The timeout (in ms) for requests. Default: 5000 +# class graphoid( - $domains = [], - $domain_map = {}, - $protocol = 'https', - $timeout = 5000, $allowed_domains = {}, + $domain_map = {}, + $timeout = 5000, ) { require ::graphoid::packages @@ -37,11 +29,9 @@ service::node { 'graphoid': port => 19000, config => { - domains => $domains, - domainMap => $domain_map, - defaultProtocol => $protocol, - timeout => $timeout, - allowedDomains => $allowed_domains, + allowedDomains => $allowed_domains, + domainMap => $domain_map, + timeout => $timeout, }, has_spec => true, healthcheck_url => '', -- To view, visit https://gerrit.wikimedia.org/r/288020 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ecd1740e392041f6f3b94ab4cff2fd1a396da91 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yurik <[email protected]> Gerrit-Reviewer: BBlack <[email protected]> Gerrit-Reviewer: Gehel <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
