Skip to content

Prepare NEO #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Prepare NEO #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be07569
Prepare NEO
Jun 17, 2025
a2ac20c
Add more NEO switches
Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion root-fs/app/bin/config/runJobs_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
environment:
php: "/usr/bin/php"
wiki:
type: "###EDITION###"
# BlueSpice Neo is a farm. But paralle-runjobs-service has no setting for neo. Therefore we hardode it.
# This must be changed in a unified image for classic/neo
type: "farm"
path: "/app/bluespice/w"
database:
dbserver: "###DB_HOST###"
Expand Down
2 changes: 1 addition & 1 deletion root-fs/app/bin/init-datadirectory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ directories=(
/data/simplesamlphp/logs
)

if [ "${EDITION}" == "farm" ]; then
if [ "${EDITION}" == "farm" ] || [ "${EDITION}" == "neo" ]; then
directories=(
/data/bluespice/cache
/data/bluespice/extensions/BlueSpiceFoundation/data
Expand Down
2 changes: 1 addition & 1 deletion root-fs/app/bin/instancestats-show
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

run-maintenance BlueSpiceUsageTracker:showInstanceStats
# Conditionally run for farm setups
if [ "${EDITION}" == "farm" ]; then
if [ "${EDITION}" == "farm" ] || [ "${EDITION}" == "neo" ]; then
run-maintenance BlueSpiceWikiFarm:RunForAll \
--script='extensions/BlueSpiceUsageTracker/maintenance/showInstanceStats.php'
fi
2 changes: 1 addition & 1 deletion root-fs/app/bin/instancestats-update
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

run-maintenance BlueSpiceUsageTracker:usageTrackerUpdate
# Conditionally run for farm setups
if [ "${EDITION}" == "farm" ]; then
if [ "${EDITION}" == "farm" ] || [ "${EDITION}" == "neo" ]; then
run-maintenance BlueSpiceWikiFarm:RunForAll \
--script='extensions/BlueSpiceUsageTracker/maintenance/usageTrackerUpdate.php'
fi
2 changes: 1 addition & 1 deletion root-fs/app/bin/run-updates
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ run-maintenance update \

echo $version > /data/bluespice/logs/baseversion

if [ "${EDITION}" == "farm" ]; then
if [ "${EDITION}" == "farm" ] || [ "${EDITION}" == "neo" ]; then
run-maintenance BlueSpiceWikiFarm:RunForAll \
--script='maintenance/update.php' \
--args='--quick --doshared' \
Expand Down
14 changes: 11 additions & 3 deletions root-fs/app/conf/LocalSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
$GLOBALS['wgCacheDirectory'] = "/data/bluespice/cache";
define( 'BSROOTDIR', '/data/bluespice/extensions/BlueSpiceFoundation' );

if ( getenv( 'EDITION' ) === 'farm' ) {
if ( getenv( 'EDITION' ) === 'farm' || getenv( 'EDITION' ) === 'neo' ) {
$GLOBALS['wgWikiFarmConfig_instanceDirectory'] = '/data/bluespice/farm-instances/';
$GLOBALS['wgWikiFarmConfig_archiveDirectory'] = '/data/bluespice/farm-archives/';
$GLOBALS['wgWikiFarmConfig_dbAdminUser'] = trim( getenv( 'DB_ROOT_USER' ) ?: $GLOBALS['wgDBuser'] );
Expand All @@ -174,8 +174,16 @@
$GLOBALS['wgSharedTables'] = [ 'bs_translationtransfer_translations' ];
}

if ( getenv( 'EDITION' ) === 'neo' ) {
$GLOBALS['wgWikiFarmConfig_shareUsers'] = true;
$GLOBALS['wgWikiFarmConfig_useUnifiedSearch'] = true;
$GLOBALS['wgWikiFarmConfig_useGlobalAccessControl'] =true;
$GLOBALS['wgWikiFarmConfig_shareUserSessions'] = true;
$GLOBALS['wgWikiFarmConfig_useSharedResources'] = true;
}

require_once '/data/bluespice/pre-init-settings.php';
if ( getenv( 'EDITION' ) === 'farm' ) {
if ( getenv( 'EDITION' ) === 'farm' || getenv( 'EDITION' ) === 'neo' ) {
require_once "$IP/extensions/BlueSpiceWikiFarm/WikiFarm.setup.php";
}
else {
Expand All @@ -187,7 +195,7 @@
}

$GLOBALS['wgArticlePath'] = '/wiki/$1';
if ( getenv( 'EDITION' ) === 'farm' ) {
if ( getenv( 'EDITION' ) === 'farm' || getenv( 'EDITION' ) === 'neo' ) {
if( FARMER_IS_ROOT_WIKI_CALL === false ) {
$GLOBALS['wgArticlePath'] = '/' . FARMER_CALLED_INSTANCE . '/wiki/$1';
$GLOBALS['wgWebDAVBaseUri'] = '/' . FARMER_CALLED_INSTANCE . '/webdav/';
Expand Down