From 88319639cf0d32ad609d155bc6c882cb994eb14c Mon Sep 17 00:00:00 2001
From: Lens0021 / Leslie <lorentz0021@gmail.com>
Date: Fri, 2 Aug 2024 21:55:04 +0900
Subject: [PATCH] femiwiki: Use luaSandbox (#861)

---
 dockers/femiwiki/Dockerfile        | 2 +-
 dockers/femiwiki/LocalSettings.php | 8 +++-----
 dockers/femiwiki/README.md         | 5 +++++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dockers/femiwiki/Dockerfile b/dockers/femiwiki/Dockerfile
index 40e17ef4..ae3a43b5 100644
--- a/dockers/femiwiki/Dockerfile
+++ b/dockers/femiwiki/Dockerfile
@@ -10,7 +10,7 @@ FROM --platform=$TARGETPLATFORM ghcr.io/femiwiki/caddy:1.0.0 AS caddy
 
 FROM --platform=$TARGETPLATFORM ghcr.io/femiwiki/femiwiki-extensions:1.5.2 AS extensions
 
-FROM --platform=$TARGETPLATFORM ghcr.io/femiwiki/mediawiki:3.0.0
+FROM --platform=$TARGETPLATFORM ghcr.io/femiwiki/mediawiki:3.1.0
 
 # Set timezone
 ENV TZ=Asia/Seoul
diff --git a/dockers/femiwiki/LocalSettings.php b/dockers/femiwiki/LocalSettings.php
index 3e6f9228..316274a5 100644
--- a/dockers/femiwiki/LocalSettings.php
+++ b/dockers/femiwiki/LocalSettings.php
@@ -797,11 +797,9 @@
 
 // Scribunto
 wfLoadExtension( 'Scribunto' );
-$wgScribuntoDefaultEngine = 'luastandalone';
-if ( php_uname( 'm' ) == 'aarch64' ) {
-	$wgScribuntoEngineConf['luastandalone']['luaPath'] = '/usr/bin/lua';
-}
-$wgScribuntoEngineConf['luastandalone']['cpuLimit'] = 3;
+$wgScribuntoDefaultEngine = 'luasandbox';
+$wgScribuntoEngineConf['luasandbox']['cpuLimit'] = 3;
+$wgScribuntoEngineConf['luasandbox']['memoryLimit'] = 10485760;
 
 // SecureLinkFixer
 wfLoadExtension( 'SecureLinkFixer' );
diff --git a/dockers/femiwiki/README.md b/dockers/femiwiki/README.md
index e5481901..3f347f67 100644
--- a/dockers/femiwiki/README.md
+++ b/dockers/femiwiki/README.md
@@ -1,5 +1,10 @@
 # femiwiki
 
+## v1.3.0
+
+- Bump femiwiki/mediawiki to v3.1.0
+- Use luaSandbox and set luastandalone
+
 ## v1.2.3
 
 - Bump femiwiki/femiwiki-extensions to v1.5.2