Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/310021
Change subject: Citoid: Use Scap3 for config deploys
......................................................................
Citoid: Use Scap3 for config deploys
Bug: T144597
Change-Id: Ia8e93885f5f0acaac4f393f39875644fd7f8c38d
---
M modules/citoid/manifests/init.pp
D modules/citoid/templates/config.yaml.erb
2 files changed, 9 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/310021/1
diff --git a/modules/citoid/manifests/init.pp b/modules/citoid/manifests/init.pp
index 30d3aa6..08b0521 100644
--- a/modules/citoid/manifests/init.pp
+++ b/modules/citoid/manifests/init.pp
@@ -14,10 +14,14 @@
$zotero_port,
) {
service::node { 'citoid':
- port => 1970,
- config => template('citoid/config.yaml.erb'),
- healthcheck_url => '',
- has_spec => true,
- deployment => 'scap3',
+ port => 1970,
+ healthcheck_url => '',
+ has_spec => true,
+ deployment => 'scap3',
+ deployment_config => true,
+ deployment_vars => {
+ zotero_host => $zotero_host,
+ zotero_port => $zotero_port,
+ },
}
}
diff --git a/modules/citoid/templates/config.yaml.erb
b/modules/citoid/templates/config.yaml.erb
deleted file mode 100644
index ec2745e..0000000
--- a/modules/citoid/templates/config.yaml.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-# IP address to bind to, all IPs by default
-# interface: localhost # uncomment to only listen on localhost
-# User-Agent HTTP header to use for requests
-userAgent: "Citoid (Wikimedia tool; learn more at
https://www.mediawiki.org/wiki/Citoid)"
-# URL where to contact Zotero
-zoteroInterface: <%= @zotero_host %>
-# zotero's server port
-zoteroPort: <%= @zotero_port %>
-# whether the proxy should be used to contact zotero
-zoteroUseProxy: false
-# whether Citoid is allowed to scrape private IPs
-allowPrivateAddresses: false
-# maximum number of redirects allowed
-maxRedirects: 10
--
To view, visit https://gerrit.wikimedia.org/r/310021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8e93885f5f0acaac4f393f39875644fd7f8c38d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
