diff --git a/abra.sh b/abra.sh index 7e3f225..166bfc0 100644 --- a/abra.sh +++ b/abra.sh @@ -1,7 +1,7 @@ -export LOCAL_SETTINGS_CONF_VERSION=v7 +export LOCAL_SETTINGS_CONF_VERSION=v12 export HTACCESS_CONF_VERSION=v1 -export ENTRYPOINT_CONF_VERSION=v4 -export COMPOSER_LOCAL_CONF_VERSION=v1 +export ENTRYPOINT_CONF_VERSION=v11 +export COMPOSER_LOCAL_CONF_VERSION=v5 export PHP_INI_VERSION=v1 export SAML_ENTRYPOINT_CONF_VERSION=v3 diff --git a/composer.local.json.tmpl b/composer.local.json.tmpl index 6a93b46..6027113 100644 --- a/composer.local.json.tmpl +++ b/composer.local.json.tmpl @@ -1,4 +1,9 @@ { +{{ if eq (env "SEMANTICMW_ENABLED") "1" }} + "require": { + "mediawiki/semantic-media-wiki": "^4.1.0" + }, +{{ end }} "extra": { "merge-plugin": { "include": [ diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index 5278260..8a470c5 100755 --- a/entrypoint.sh.tmpl +++ b/entrypoint.sh.tmpl @@ -17,6 +17,9 @@ composer_install() { set -eu cd /var/www/html/ && composer update && composer install + + # SMW needs this; some other extensions brought in by composer might as well. + php /var/www/html/maintenance/update.php --quick } init_db() { @@ -96,18 +99,10 @@ init_extensions() { fi fi - if [ -n "${SEMANTICMW_ENABLED-}" ]; then - if [ ! -d /var/www/html/extensions/SemanticMediaWiki ]; then - git clone --depth 1 -b REL1_39 \ - https://gerrit.wikimedia.org/r/mediawiki/extensions/SemanticMediaWiki \ - /var/www/html/extensions/SemanticMediaWiki - fi - fi - if [ -n "${MARKDOWN_ENABLED-}" ]; then if [ ! -d /var/www/html/extensions/WikiMarkdown ]; then - git clone --depth 1 -b REL1_39 \ - https://gerrit.wikimedia.org/r/mediawiki/extensions/WikiMarkdown \ + git clone --depth 1 \ + https://github.com/kuenzign/WikiMarkdown \ /var/www/html/extensions/WikiMarkdown fi fi