From 86ecd058b13baaaa35d7f725872c8f9ed81ceec3 Mon Sep 17 00:00:00 2001 From: Eric Meehan Date: Mon, 13 Jan 2025 16:04:24 -0500 Subject: [PATCH] Updated to 1.39 --- build/Dockerfile | 25 +++--- build/include/install_wiki.sh | 2 - .../include/settings.d/LocalSettings.LDAP.php | 78 +++++++++++-------- 3 files changed, 57 insertions(+), 48 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 66bb23d..29727ae 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM mediawiki:1.35.8 +FROM mediawiki:lts RUN apt-get update && apt-get -y install libldb-dev git && rm -rf /var/lib/apt/lists/* @@ -7,18 +7,17 @@ ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/do RUN chmod +x /usr/local/bin/install-php-extensions && \ install-php-extensions ldap -RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-Math.git /var/www/html/extensions/Math -RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-ExternalData.git /var/www/html/extensions/ExternalData -RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-PageForms.git /var/www/html/extensions/PageForms -RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-Cargo.git /var/www/html/extensions/Cargo -RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-LDAPAuthentication2.git /var/www/html/extensions/LDAPAuthentication2 -RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-LDAPAuthorization.git /var/www/html/extensions/LDAPAuthorization -RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-LDAPGroups.git /var/www/html/extensions/LDAPGroups -RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-LDAPProvider.git /var/www/html/extensions/LDAPProvider -RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-LDAPSyncAll.git /var/www/html/extensions/LDAPSyncAll -RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-LDAPUserInfo.git /var/www/html/extensions/LDAPUserInfo -RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-PluggableAuth.git /var/www/html/extensions/PluggableAuth -RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-Auth_remoteuser.git /var/www/html/extensions/Auth_remoteuser +RUN git clone --branch REL1_39 https://github.com/wikimedia/mediawiki-extensions-ExternalData.git /var/www/html/extensions/ExternalData +RUN git clone --branch REL1_39 https://github.com/wikimedia/mediawiki-extensions-PageForms.git /var/www/html/extensions/PageForms +RUN git clone --branch REL1_39 https://github.com/wikimedia/mediawiki-extensions-Cargo.git /var/www/html/extensions/Cargo +RUN git clone --branch REL1_39 https://github.com/wikimedia/mediawiki-extensions-LDAPAuthentication2.git /var/www/html/extensions/LDAPAuthentication2 +RUN git clone --branch REL1_39 https://github.com/wikimedia/mediawiki-extensions-LDAPAuthorization.git /var/www/html/extensions/LDAPAuthorization +RUN git clone --branch REL1_39 https://github.com/wikimedia/mediawiki-extensions-LDAPGroups.git /var/www/html/extensions/LDAPGroups +RUN git clone --branch REL1_39 https://github.com/wikimedia/mediawiki-extensions-LDAPProvider.git /var/www/html/extensions/LDAPProvider +RUN git clone --branch REL1_39 https://github.com/wikimedia/mediawiki-extensions-LDAPSyncAll.git /var/www/html/extensions/LDAPSyncAll +RUN git clone --branch REL1_39 https://github.com/wikimedia/mediawiki-extensions-LDAPUserInfo.git /var/www/html/extensions/LDAPUserInfo +RUN git clone --branch REL1_39 https://github.com/wikimedia/mediawiki-extensions-PluggableAuth.git /var/www/html/extensions/PluggableAuth +RUN git clone --branch REL1_39 https://github.com/wikimedia/mediawiki-extensions-Auth_remoteuser.git /var/www/html/extensions/Auth_remoteuser diff --git a/build/include/install_wiki.sh b/build/include/install_wiki.sh index ada5925..bee67e2 100644 --- a/build/include/install_wiki.sh +++ b/build/include/install_wiki.sh @@ -13,8 +13,6 @@ do echo "$ext activated" done -cp /var/www/html/resources/assets/mediawiki.png /var/www/html/resources/assets/wiki.png - sed -i "s/LDAP_DOMAINNAME/$LDAP_DOMAINNAME/g" /var/www/html/settings.d/LocalSettings.LDAP.php sed -i "s/LDAP_SERVER_NAME/$LDAP_SERVER_NAME/g" /var/www/html/settings.d/LocalSettings.LDAP.php sed -i "s/LDAP_SERVER_PORT/$LDAP_SERVER_PORT/g" /var/www/html/settings.d/LocalSettings.LDAP.php diff --git a/build/include/settings.d/LocalSettings.LDAP.php b/build/include/settings.d/LocalSettings.LDAP.php index fd6102f..57e2ea8 100644 --- a/build/include/settings.d/LocalSettings.LDAP.php +++ b/build/include/settings.d/LocalSettings.LDAP.php @@ -44,13 +44,6 @@ $wgLdapAuthIsActiveDirectory = 'false'; $wgLdapAuthSearchTree = true ; -#PluggableAuth -$wgPluggableAuth_EnableAutoLogin = false ; -$wgPluggableAuth_EnableLocalProperties = false ; -$wgPluggableAuth_EnableLocalLogin = false ; -$wgPluggableAuth_ButtonLabel = "LDAP Log In"; # defaults to "Login with PluggableAuth " - - #LDAPAuthentication2 $LDAPAuthenticationAllowLocalLogin = true; $LDAPAuthenticationUsernameNormalizer = 'strtolower'; @@ -102,6 +95,44 @@ $LDAPProviderCacheType = "CACHE_NONE" ; $LDAPProviderDefaultDomain = "LDAP_DOMAINNAME" ; $wgLdapAuthSearchFilter = 'LDAP_SEARCH_FILTER'; +#PluggableAuth +$wgPluggableAuth_EnableAutoLogin = false ; +$wgPluggableAuth_EnableLocalProperties = false ; +$wgPluggableAuth_EnableLocalLogin = false ; +$wgPluggableAuth_Config = array( + array( + 'plugin' => 'LDAPAuthentication2', + 'buttonLabelMessage' => 'pt-login-button', + 'data' => ['domain'=> $LDAPProviderDefaultDomain] + ), + array('plugin' => 'LDAPAuthorization'), + ); + + +# Group Permissions + +$wgGroupPermissions['*']['edit'] = false; + +$wgGroupPermissions['*']['createaccount'] = false; +$wgGroupPermissions['*']['autocreateaccount'] = true; + + + + +## Visual Editor Stuff + +#wfLoadExtension( 'VisualEditor' ); +#wfLoadExtension( 'WikiEditor' ); + +## Eric's extensions +$wgFavicon = "$wgResourceBasePath/resources/assets/mediawiki.png"; +$wgLogos = [ '1x' => "$wgResourceBasePath/resources/assets/mediawiki.png" ]; +$wgAllowExternalImages = true; +$wgUseInstantCommons = true; +$wgLocaltimezone = 'America/New_York'; +$wgFragmentMode = [ 'html5' ]; +$wgCapitalLinks = false; + $wgExternalDataSources['LDAP_SERVER_NAME'] = [ 'server' => 'LDAP_SERVER_NAME', 'base dn' => 'LDAP_BASE', @@ -109,34 +140,15 @@ $wgExternalDataSources['LDAP_SERVER_NAME'] = [ 'password' => 'LDAP_BIND_PASS' ]; -# Group Permissions - -$wgGroupPermissions['*']['edit'] = false; - -$wgGroupPermissions['*']['createaccount'] = false; -$wgGroupPermissions['*']['autocreateaccount'] = false; - -$wgGroupPermissions['wiki-admins']['delete'] = true; -$wgGroupPermissions['wiki-admins']['undelete'] = true; -$wgGroupPermissions['wiki-admins']['undelete'] = true; -$wgGroupPermissions['wiki-admins']['editprotected'] = true; -$wgGroupPermissions['wiki-admins']['protect'] = true; - - - - -## Visual Editor Stuff - -wfLoadExtension( 'VisualEditor' ); -wfLoadExtension( 'WikiEditor' ); - -## Eric's extensions -$wgFavicon = "$wgResourceBasePath/resources/assets/wiki.png"; - wfLoadExtension( 'Cargo' ); +wfLoadExtension( 'CategoryTree' ); wfLoadExtension( 'Cite' ); +wfLoadExtension( 'CiteThisPage' ); wfLoadExtension( 'ExternalData' ); -wfLoadExtension( 'Math' ); +wfLoadExtension( 'Interwiki' ); +wfLoadExtension( 'MultimediaViewer' ); wfLoadExtension( 'PageForms' ); - +wfLoadExtension( 'ParserFunctions' ); +wfLoadExtension( 'TemplateData' ); +wfLoadExtension( 'TextExtracts' );