jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333845 )
Change subject: Remove zotero
......................................................................
Remove zotero
Zotero requires XULRunner which is not packaged for Jessie. See T107302
and T93579 for more details.
Bug: T155972
Change-Id: I956b9d92e68fd43bec3f4017f15899bcd4752505
---
M puppet/hieradata/common.yaml
M puppet/modules/citoid/manifests/init.pp
M puppet/modules/role/manifests/citoid.pp
D puppet/modules/role/manifests/zotero.pp
D puppet/modules/zotero/manifests/init.pp
D puppet/modules/zotero/templates/defaults.js.erb
D puppet/modules/zotero/templates/systemd/zotero.erb
7 files changed, 2 insertions(+), 158 deletions(-)
Approvals:
Mobrovac: Looks good to me, but someone else must approve
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 115ad42..07b01bc 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -485,6 +485,3 @@
thumbor::sentry_dsn_file: "%{hiera('sentry::dsn_file')}"
xhprofgui::dir: "%{hiera('mwv::vendor_dir')}/xhprof"
-
-zotero::base_path: "%{hiera('mwv::services_dir')}/zotero"
-zotero::log_file: /vagrant/logs/zotero.log
diff --git a/puppet/modules/citoid/manifests/init.pp
b/puppet/modules/citoid/manifests/init.pp
index dcd9fe6..abf4525 100644
--- a/puppet/modules/citoid/manifests/init.pp
+++ b/puppet/modules/citoid/manifests/init.pp
@@ -19,10 +19,8 @@
port => $port,
log_level => $log_level,
config => {
- userAgent => undef,
- zoteroInterface => '127.0.0.1',
- zoteroPort => '1969',
- zoteroUseProxy => false,
+ userAgent => undef,
+ zotero => false,
},
}
}
diff --git a/puppet/modules/role/manifests/citoid.pp
b/puppet/modules/role/manifests/citoid.pp
index de637f1..1045295 100644
--- a/puppet/modules/role/manifests/citoid.pp
+++ b/puppet/modules/role/manifests/citoid.pp
@@ -4,7 +4,6 @@
class role::citoid(
$url,
) {
- include ::role::zotero
include ::citoid
mediawiki::extension { 'Citoid':
diff --git a/puppet/modules/role/manifests/zotero.pp
b/puppet/modules/role/manifests/zotero.pp
deleted file mode 100644
index 0bdc227..0000000
--- a/puppet/modules/role/manifests/zotero.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# == Class: role::zotero
-# Provisions Zotero, a dependency of Citoid.
-class role::zotero {
- include ::zotero
-}
diff --git a/puppet/modules/zotero/manifests/init.pp
b/puppet/modules/zotero/manifests/init.pp
deleted file mode 100644
index 6cdecb3..0000000
--- a/puppet/modules/zotero/manifests/init.pp
+++ /dev/null
@@ -1,76 +0,0 @@
-# == Class: zotero
-#
-# Zotero is a service based on running the Zotero Firefox extension via
xpcshell
-# and JavaScript wrappers. It is meant to scrape URLs provided to it and return
-# metadata.
-#
-# === Parameters
-#
-# [*base_path*]
-# Path to the zotero code. (e.g. /vagrant/srv/zotero)
-#
-# [*log_file*]
-# Place where zotero should log messages.
-#
-class zotero(
- $base_path,
- $log_file,
-) {
-
- package { 'xulrunner-dev':
- ensure => present,
- before => Service['zotero'],
- }
-
- file { $base_path:
- ensure => directory,
- before => Service['zotero'],
- owner => $::share_owner,
- group => $::share_group,
- }
-
- git::clone{ 'mediawiki/services/zotero/translation-server':
- directory => "${base_path}/translation-server",
- require => File[$base_path],
- before => Service['zotero'],
- }
-
- git::clone{ 'mediawiki/services/zotero/translators':
- directory => "${base_path}/translators",
- require => File[$base_path],
- before => Service['zotero'],
- }
-
- file { '/etc/zotero':
- ensure => directory,
- }
- file { '/etc/zotero/defaults.js':
- ensure => present,
- content => template('zotero/defaults.js.erb'),
- require => Git::Clone['mediawiki/services/zotero/translation-server'],
- notify => Service['zotero'],
- }
-
- file { $log_file:
- ensure => present,
- mode => '0666',
- owner => $::share_owner,
- group => $::share_group,
- }
-
- service::gitupdate { 'zotero_translation_server':
- dir => "${base_path}/translation-server",
- restart => true,
- service_name => 'zotero',
- }
-
- service::gitupdate { 'zotero_translators':
- dir => "${base_path}/translators",
- restart => true,
- service_name => 'zotero',
- }
-
- systemd::service { 'zotero':
- ensure => 'present',
- }
-}
diff --git a/puppet/modules/zotero/templates/defaults.js.erb
b/puppet/modules/zotero/templates/defaults.js.erb
deleted file mode 100644
index 9c70fb0..0000000
--- a/puppet/modules/zotero/templates/defaults.js.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-pref("translation-server.translatorsDirectory", "<%= @base_path
%>/translators");
-pref("translation-server.httpServer.port", "1969");
-// Need to log anything at all
-pref("translation-server.debug.log", true);
-pref("translation-server.debug.time", true);
-pref("translation-server.debug.level", 3);
-
-// Don't retrieve unrequested links when performing standalone translation
-pref("network.prefetch-next", false);
-
-// Let operations run as long as necessary
-pref("dom.max_chrome_script_run_time", 0);
-
-// Use basicViewer for opening new DOM windows from content (for TinyMCE)
-pref("browser.chromeURL",
"chrome://zotero/content/standalone/basicViewer.xul");
-
-// Disable CSS and images
-pref("permissions.default.stylesheet", 2);
-pref("permissions.default.image", 2);
-
-pref("network.protocol-handler.expose-all", false);
-pref("network.protocol-handler.expose.zotero", true);
-pref("network.protocol-handler.expose.http", true);
-pref("network.protocol-handler.expose.https", true);
-
-// Never go offline
-pref("offline.autoDetect", false);
-pref("network.manage-offline-status", false);
-
-// Without this, we will throw up dialogs if asked to translate strange pages
-pref("browser.xul.error_pages.enabled", true);
-
-// Without this, scripts may decide to open popups
-pref("dom.disable_open_during_load", true);
-pref("dom.popup_allowed_events", "");
-
-// Disable places
-pref("places.history.enabled", false);
-
-
-/* debugging prefs */
-pref("browser.dom.window.dump.enabled", true);
-pref("javascript.options.showInConsole", true);
-pref("javascript.options.strict", true);
-pref("nglayout.debug.disable_xul_cache", true);
-pref("nglayout.debug.disable_xul_fastload", true);
diff --git a/puppet/modules/zotero/templates/systemd/zotero.erb
b/puppet/modules/zotero/templates/systemd/zotero.erb
deleted file mode 100644
index d4f0ecb..0000000
--- a/puppet/modules/zotero/templates/systemd/zotero.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-# NOTE: This file is managed by Puppet
-# Systemd unit for Zotero
-[Unit]
-Description="Zotero service"
-After=network.target
-
-[Service]
-# up ulimit -n a bit
-LimitNOFILE=10000
-User=www-data
-Group=www-data
-Environment="LD_LIBRARY_PATH=/usr/lib/xulrunner-24.0/"
-Restart=always
-RestartSec=2s
-# wait 60 seconds for a graceful restart before killing the master
-TimeoutStopSec=60
-# The xulrunner-dev package installs a non-executable
-# /usr/lib/xulrunner-devel-24.0/sdk/bin/xpcshell
-# Work around that by invoking ld-linux-x86-64.so.2 first.
-ExecStart=/lib64/ld-linux-x86-64.so.2
/usr/lib/xulrunner-devel-24.0/sdk/bin/xpcshell -g /usr/lib/xulrunner-24.0/ -a
<%= @base_path %>/translation-server -mn -v 180 <%= @base_path
%>/translation-server/translation-server/init.js >> <%= @log_file %> 2>&1
-
-[Install]
-WantedBy=multi-user.target
--
To view, visit https://gerrit.wikimedia.org/r/333845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I956b9d92e68fd43bec3f4017f15899bcd4752505
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
