forked from coop-cloud/mediawiki
Disable parsoid, it's no longer needed.
This applies changes from coop-cloud/mediawiki#32 independently; I believe the result should be a clean merge.
This commit is contained in:
parent
cc3682ef89
commit
112bd3300f
|
@ -150,23 +150,6 @@ $wgDefaultUserOptions['visualeditor-enable'] = 1;
|
|||
|
||||
$wgVisualEditorAllowLossySwitching = false;
|
||||
|
||||
$wgVirtualRestConfig['modules']['parsoid'] = [
|
||||
// URL to the Parsoid instance - use port 8142 if you use the Debian package - the parameter 'URL' was first used but is now deprecated (string)
|
||||
'url' => 'http://parsoid:8000/',
|
||||
// Parsoid "domain" (string, optional) - MediaWiki >= 1.26
|
||||
'domain' => 'localhost',
|
||||
// Parsoid "prefix" (string, optional) - deprecated since MediaWiki 1.26, use 'domain'
|
||||
'prefix' => 'localhost',
|
||||
// Forward cookies in the case of private wikis (string or false, optional)
|
||||
'forwardCookies' => true,
|
||||
// request timeout in seconds (integer or null, optional)
|
||||
'timeout' => null,
|
||||
// Parsoid HTTP proxy (string or null, optional)
|
||||
'HTTPProxy' => null,
|
||||
// whether to parse URL as if they were meant for RESTBase (boolean or null, optional)
|
||||
'restbaseCompat' => null,
|
||||
];
|
||||
|
||||
{{ if eq (env "SAML_ENABLED") "1" }}
|
||||
wfLoadExtension( 'PluggableAuth' );
|
||||
|
||||
|
|
2
abra.sh
2
abra.sh
|
@ -1,4 +1,4 @@
|
|||
export LOCAL_SETTINGS_CONF_VERSION=v16
|
||||
export LOCAL_SETTINGS_CONF_VERSION=v17
|
||||
export HTACCESS_CONF_VERSION=v1
|
||||
export ENTRYPOINT_CONF_VERSION=v15
|
||||
export COMPOSER_LOCAL_CONF_VERSION=v5
|
||||
|
|
|
@ -63,14 +63,6 @@ services:
|
|||
networks:
|
||||
- internal
|
||||
|
||||
parsoid:
|
||||
image: thenets/parsoid:0.11.0
|
||||
hostname: parsoidserver
|
||||
networks:
|
||||
- internal
|
||||
environment:
|
||||
PARSOID_DOMAIN_localhost: http://app:80/api.php
|
||||
|
||||
volumes:
|
||||
mariadb:
|
||||
mediawiki_images:
|
||||
|
|
Loading…
Reference in New Issue