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 +23 -2
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7ca11b8bc9 - Show all commits

7
LocalSettings.php.tmpl
View File

@ -118,13 +118,20 @@ $wgGroupPermissions['*']['read'] = true;
## Default skin: you can change the default skin. Use the internal symbolic
## names, ie 'vector', 'monobook':
{{ if eq (env "TWEEKI_ENABLED") "1" }}
wfLoadSkin( 'Tweeki' );
$wgDefaultSkin = "tweeki";
{{ else }}
$wgDefaultSkin = "vector";
{{ end }}
# Enabled skins.
# The following skins were automatically enabled:
wfLoadSkin( 'MonoBook' );
wfLoadSkin( 'Timeless' );
wfLoadSkin( 'Vector' );
wfLoadSkin( 'MinervaNeue' );
# Enabled extensions. Most of the extensions are enabled by adding
# wfLoadExtensions('ExtensionName');

4
abra.sh
View File

@ -1,6 +1,6 @@
export LOCAL_SETTINGS_CONF_VERSION=v12
export LOCAL_SETTINGS_CONF_VERSION=v16
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=v11
export ENTRYPOINT_CONF_VERSION=v15
export COMPOSER_LOCAL_CONF_VERSION=v5
export PHP_INI_VERSION=v2

14
entrypoint.sh.tmpl
View File

@ -109,10 +109,24 @@ init_extensions() {
}
init_skins() {
if [ -n "${TWEEKI_ENABLED-}" ]; then
if [ ! -d /var/www/html/skins/Tweeki ]; then
git clone --depth 1 \
https://github.com/thaider/Tweeki \
/var/www/html/skins/Tweeki
fi
fi
}
main() {
set -eu
init_extensions
init_skins
decentral1se marked this conversation as resolved
decentral1se commented 2023-05-28 14:14:41 +00:00
Review
Copy Link

Indentation looks a bit off but whatevs.

Indentation looks a bit off but whatevs.
flancian commented 2023-05-30 21:07:45 +00:00
Review
Copy Link

Yes, thank you, fixed :)

Yes, thank you, fixed :)
init_composer
composer_install
init_db