From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Jun 2022 16:33:22 +0000 (+0100)
Subject: Drop separate parsoid service for mediawiki
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/395bc48986b07dfcaee86aa176dc52ede3b69f1b?ds=sidebyside

Drop separate parsoid service for mediawiki
---

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index fc61a2236..fc511a981 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -63,36 +63,11 @@ package %w[
 # Mediawiki packages for VisualEditor support
 package %w[
   curl
-  parsoid
 ]
 
 # Mediawiki packages for SyntaxHighight support
 package "python3-pygments"
 
-file "/etc/mediawiki/parsoid/settings.js" do
-  action :delete
-end
-
-template "/etc/mediawiki/parsoid/config.yaml" do
-  action :nothing
-  source "parsoid-config.yaml.erb"
-  owner "root"
-  group "root"
-  mode "644"
-end
-
-notify_group "parsoid-config" do
-  action :run
-  notifies :create, "template[/etc/mediawiki/parsoid/config.yaml]"
-end
-
-service "parsoid" do
-  action [:enable]
-  supports :status => false, :restart => true, :reload => false
-  subscribes :restart, "file[/etc/mediawiki/parsoid/settings.js]"
-  subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
-end
-
 link "/etc/php/#{node[:php][:version]}/fpm/conf.d/20-wikidiff2.ini" do
   to "../../mods-available/wikidiff2.ini"
 end
diff --git a/cookbooks/mediawiki/templates/default/mw-ext-VisualEditor.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-VisualEditor.inc.php.erb
index ed9740571..2b7dd90ab 100644
--- a/cookbooks/mediawiki/templates/default/mw-ext-VisualEditor.inc.php.erb
+++ b/cookbooks/mediawiki/templates/default/mw-ext-VisualEditor.inc.php.erb
@@ -1,17 +1,2 @@
 <?php
-$wgVirtualRestConfig['modules']['parsoid'] = array(
-  'url' => 'http://localhost:8142'
-);
-$wgVirtualRestConfig['modules']['parsoid']['forwardCookies'] = true;
-
-<% if @version >= "1.37" -%>
 wfLoadExtension( 'VisualEditor' );
-<% else -%>
-require_once($IP .'/extensions/VisualEditor/VisualEditor.php');
-<% end -%>
-
-// Enable by default for everybody
-$wgDefaultUserOptions['visualeditor-enable'] = 1;
-
-// Don't allow users to disable it
-// $wgHiddenPrefs[] = 'visualeditor-enable';
diff --git a/cookbooks/mediawiki/templates/default/parsoid-config.yaml.erb b/cookbooks/mediawiki/templates/default/parsoid-config.yaml.erb
deleted file mode 100644
index e0a4e96db..000000000
--- a/cookbooks/mediawiki/templates/default/parsoid-config.yaml.erb
+++ /dev/null
@@ -1,92 +0,0 @@
-# DO NOT EDIT - This file is being maintained by Chef
-
-worker_heartbeat_timeout: 300000
-
-logging:
-    level: info
-
-#metrics:
-#    type: log
-
-services:
-  - module: src/lib/index.js
-    entrypoint: apiServiceWorker
-    conf:
-        # For backwards compatibility, and to continue to support non-static
-        # configs for the time being, optionally provide a path to a
-        # localsettings.js file.  See localsettings.example.js
-        #localsettings: ./localsettings.js
-
-        # Set your own user-agent string
-        # Otherwise, defaults to:
-        #   'Parsoid/<current-version-defined-in-package.json>'
-        #userAgent: 'My-User-Agent-String'
-
-        # Configure Parsoid to point to your MediaWiki instances.
-        mwApis:
-        # - # This is the only required parameter,
-          # the URL of you MediaWiki API endpoint.
-        #  uri: 'http://localhost/w/api.php'
-          # The "domain" is used for communication with Visual Editor
-          # and RESTBase.  It defaults to the hostname portion of
-          # the `uri` property below, but you can manually set it
-          # to an arbitrary string.
-        #  domain: 'localhost'  # optional
-          # To specify a proxy (or proxy headers) specific to this prefix
-          # (which overrides defaultAPIProxyURI). Alternatively, set `proxy`
-          # to `null` to override and force no proxying when a default proxy
-          # has been set.
-          #proxy:
-          #    uri: 'http://my.proxy:1234/'
-          #    headers:  # optional
-          #        'X-Forwarded-Proto': 'https'
-<% node[:mediawiki][:sites].keys.sort.each do |site_url| -%>
-        - # This is the only required parameter,
-          uri: 'https://<%= site_url %>/w/api.php'
-<% end -%>
-
-        # We pre-define wikipedias as 'enwiki', 'dewiki' etc. Similarly
-        # for other projects: 'enwiktionary', 'enwikiquote', 'enwikibooks',
-        # 'enwikivoyage' etc.
-        # The default for this is false. Uncomment the line below if you want
-        # to load WMF's config for wikipedias, etc.
-        #loadWMF: true
-
-        # A default proxy to connect to the API endpoints.
-        # Default: undefined (no proxying).
-        # Overridden by per-wiki proxy config in setMwApi.
-        #defaultAPIProxyURI: 'http://proxy.example.org:8080'
-
-        # Enable debug mode (prints extra debugging messages)
-        #debug: true
-
-        # Use the PHP preprocessor to expand templates via the MW API (default true)
-        #usePHPPreProcessor: false
-
-        # Use selective serialization (default false)
-        useSelser: true
-
-        # Allow cross-domain requests to the API (default '*')
-        # Sets Access-Control-Allow-Origin header
-        # disable:
-        #allowCORS: false
-        # restrict:
-        #allowCORS: 'some.domain.org'
-
-        # Allow override of port/interface:
-        #serverPort: 8000
-        #serverInterface: '127.0.0.1'
-
-        # Enable linting of some wikitext errors to the log
-        #linting: true
-        # Send lint errors to MW API instead of to the log
-        #linterSendAPI: false
-
-        # Require SSL certificates to be valid (default true)
-        # Set to false when using self-signed SSL certificates
-        #strictSSL: false
-
-        # Use a different server for CSS style modules.
-        # Leaving it undefined (the default) will use the same URI as the MW API,
-        # changing api.php for load.php.
-        #modulesLoadURI: 'http://example.org/load.php'