coop-cloud/mediawiki
coop-cloud
/
mediawiki
6
0
Fork 3
Code Issues 6 Pull Requests Releases Wiki Activity

Add support for SemanticMediaWiki, MobileFrontend, MsUpload, PageForms, PageSchemas, WikiMarkdown, Tweeki #31

Merged
decentral1se merged 13 commits from flancian/wiki.social.coop:main into main 2023-05-30 23:00:42 +00:00
Conversation 2 Commits 13 Files Changed 7 +1 -26
3 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 112bd3300f - Show all commits

17
LocalSettings.php.tmpl
View File

@ -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
View File

@ -1,4 +1,4 @@
export LOCAL_SETTINGS_CONF_VERSION=v16
export LOCAL_SETTINGS_CONF_VERSION=v17
decentral1se commented 2023-05-28 14:13:51 +00:00
Review
Copy Link

Usually we increment "+1" on these versions. Can imagine you did this because you have different versions on your fork? This might be confusing to folks if they see such a version increment but I think in practice nobody will notice and nobodys deploy will break. Just wanted to note this for due dilligence.

Usually we increment "+1" on these versions. Can imagine you did this because you have different versions on your fork? This might be confusing to folks if they see such a version increment but I think in practice nobody will notice and nobodys deploy will break. Just wanted to note this for due dilligence.
flancian commented 2023-05-30 21:07:33 +00:00
Review
Copy Link

This is me getting rid of the following kind of error message, step by step while running abra app deploy -C -- for ~tens of steps :)

continueFATA[0002] failed to update config wiki-alpha_social_coop_entrypoint2_v16: Error response from daemon: rpc error: code = InvalidArgument desc = only updates to Labels are allowed

I'm guessing there's a way to 'squash' these changes into minimal increments on integrating to the main branch, but I don't know what it is?

This is me getting rid of the following kind of error message, step by step while running abra app deploy -C -- for ~tens of steps :) continueFATA[0002] failed to update config wiki-alpha_social_coop_entrypoint2_v16: Error response from daemon: rpc error: code = InvalidArgument desc = only updates to Labels are allowed I'm guessing there's a way to 'squash' these changes into minimal increments on integrating to the main branch, but I don't know what it is?
decentral1se commented 2023-05-30 22:58:41 +00:00
Review
Copy Link

You would undeploy / deploy to "squash" the changes in the sense that the daemon wouldn't complain about "only updates blah blah" because it's a "fresh slate".

You would `undeploy` / `deploy` to "squash" the changes in the sense that the daemon wouldn't complain about "only updates blah blah" because it's a "fresh slate".
export HTACCESS_CONF_VERSION=v1
export ENTRYPOINT_CONF_VERSION=v15
export COMPOSER_LOCAL_CONF_VERSION=v5

8
compose.yml
View File

@ -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: