Просмотр исходного кода

feat(vhserver): enable crossplay support (#4544)

* Install valheim dependencies for crossplay on Ubuntu

* Setup minimal required dependencies for valheim crossplay

* will set crossplay to default on and add instance id

* add ubuntu 24.04

---------

Co-authored-by: Daniel Gibbs <me@danielgibbs.co.uk>
Maciej Głowacki 2 лет назад
Родитель
Сommit
a2bea8d791

+ 2 - 4
lgsm/config-default/config-lgsm/vhserver/_default.cfg

@@ -21,9 +21,7 @@ saveinterval="1800"
 backups="4"
 backups="4"
 backupshort="7200"
 backupshort="7200"
 backuplong="43200"
 backuplong="43200"
-# If crossplay is empty, it's off. Fill with any text to make true
-# Crossplay is currently not working on Linux dedicated servers, so for now the default is false (empty)
-crossplay=""
+instanceid="1"
 
 
 # INSTRUCTIONS FOR WORLD MODIFIERS (from Valheim Dedicated Server Manual.pdf located in serverfiles)
 # INSTRUCTIONS FOR WORLD MODIFIERS (from Valheim Dedicated Server Manual.pdf located in serverfiles)
 # World modifiers can only be set in the start parameters and can be a combination of the following
 # World modifiers can only be set in the start parameters and can be a combination of the following
@@ -53,7 +51,7 @@ crossplay=""
 worldmodifiers=""
 worldmodifiers=""
 
 
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 ## Server Parameters | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
-startparameters="-name '${servername}' -password ${serverpassword} -port ${port} -world ${worldname} -public ${public} -savedir '${savedir}' -saveinterval ${saveinterval} -backups ${backups} -backupshort ${backupshort} -backuplong ${backuplong}${logFile:+ -logFile '${logFile}'}${crossplay:+ -crossplay}${worldmodifiers:+ ${worldmodifiers}}"
+startparameters="-name '${servername}' -password ${serverpassword} -port ${port} -world ${worldname} -public ${public} -savedir '${savedir}' -saveinterval ${saveinterval} -backups ${backups} -backupshort ${backupshort} -backuplong ${backuplong} -crossplay -instanceid ${instanceid} ${logFile:+ -logFile '${logFile}'} ${worldmodifiers:+ ${worldmodifiers}}"
 
 
 #### LinuxGSM Settings ####
 #### LinuxGSM Settings ####
 
 

+ 1 - 1
lgsm/data/almalinux-8.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,glibc-devel
+vh,glibc-devel,libatomic,pulseaudio-libs-devel
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,java-21-openjdk
 vpmc,java-21-openjdk
 vs
 vs

+ 1 - 1
lgsm/data/almalinux-9.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,glibc-devel
+vh,glibc-devel,libatomic,pulseaudio-libs-devel
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,java-21-openjdk
 vpmc,java-21-openjdk
 vs
 vs

+ 1 - 1
lgsm/data/centos-7.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,glibc-devel
+vh,glibc-devel,libatomic,pulseaudio-libs-devel
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,java-11-openjdk
 vpmc,java-11-openjdk
 vs
 vs

+ 1 - 1
lgsm/data/centos-8.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,glibc-devel
+vh,glibc-devel,libatomic,pulseaudio-libs-devel
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,java-17-openjdk
 vpmc,java-17-openjdk
 vs
 vs

+ 1 - 1
lgsm/data/centos-9.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,glibc-devel
+vh,glibc-devel,libatomic,pulseaudio-libs-devel
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,java-17-openjdk
 vpmc,java-17-openjdk
 vs
 vs

+ 1 - 1
lgsm/data/debian-10.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,libc6-dev
+vh,libc6-dev,libatomic1,libpulse-dev
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,openjdk-11-jre
 vpmc,openjdk-11-jre
 vs
 vs

+ 1 - 1
lgsm/data/debian-11.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,libc6-dev
+vh,libc6-dev,libatomic1,libpulse-dev
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,openjdk-11-jre
 vpmc,openjdk-11-jre
 vs
 vs

+ 1 - 1
lgsm/data/debian-12.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,libc6-dev
+vh,libc6-dev,libatomic1,libpulse-dev
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,openjdk-17-jre
 vpmc,openjdk-17-jre
 vs
 vs

+ 1 - 1
lgsm/data/debian-9.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,libc6-dev
+vh,libc6-dev,libatomic1,libpulse-dev
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,openjdk-8-jre
 vpmc,openjdk-8-jre
 vs
 vs

+ 1 - 1
lgsm/data/rhel-7.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,glibc-devel
+vh,glibc-devel,libatomic,pulseaudio-libs-devel
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,java-11-openjdk
 vpmc,java-11-openjdk
 vs
 vs

+ 1 - 1
lgsm/data/rhel-8.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,glibc-devel
+vh,glibc-devel,libatomic,pulseaudio-libs-devel
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,java-21-openjdk
 vpmc,java-21-openjdk
 vs
 vs

+ 1 - 1
lgsm/data/rhel-9.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,glibc-devel
+vh,glibc-devel,libatomic,pulseaudio-libs-devel
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,java-21-openjdk
 vpmc,java-21-openjdk
 vs
 vs

+ 1 - 1
lgsm/data/rocky-8.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,glibc-devel
+vh,glibc-devel,libatomic,pulseaudio-libs-devel
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,java-21-openjdk
 vpmc,java-21-openjdk
 vs
 vs

+ 1 - 1
lgsm/data/rocky-9.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,glibc-devel
+vh,glibc-devel,libatomic,pulseaudio-libs-devel
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,java-21-openjdk
 vpmc,java-21-openjdk
 vs
 vs

+ 1 - 1
lgsm/data/ubuntu-16.04.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,libc6-dev
+vh,libc6-dev,libatomic1,libpulse-dev
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,openjdk-8-jre
 vpmc,openjdk-8-jre
 vs
 vs

+ 1 - 1
lgsm/data/ubuntu-18.04.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,libc6-dev
+vh,libc6-dev,libatomic1,libpulse-dev
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,openjdk-11-jre
 vpmc,openjdk-11-jre
 vs
 vs

+ 1 - 1
lgsm/data/ubuntu-20.04.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,libc6-dev
+vh,libc6-dev,libatomic1,libpulse-dev
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,openjdk-11-jre
 vpmc,openjdk-11-jre
 vs
 vs

+ 1 - 1
lgsm/data/ubuntu-22.04.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,libc6-dev
+vh,libc6-dev,libatomic1,libpulse-dev
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,openjdk-21-jre
 vpmc,openjdk-21-jre
 vs
 vs

+ 1 - 1
lgsm/data/ubuntu-23.04.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,libc6-dev
+vh,libc6-dev,libatomic1,libpulse-dev
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,openjdk-21-jre
 vpmc,openjdk-21-jre
 vs
 vs

+ 1 - 1
lgsm/data/ubuntu-23.10.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,libc6-dev
+vh,libc6-dev,libatomic1,libpulse-dev
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,openjdk-21-jre
 vpmc,openjdk-21-jre
 vs
 vs

+ 1 - 1
lgsm/data/ubuntu-24.04.csv

@@ -126,7 +126,7 @@ ut
 ut2k4
 ut2k4
 ut3
 ut3
 ut99
 ut99
-vh,libc6-dev
+vh,libc6-dev,libatomic1,libpulse-dev
 vints,aspnetcore-runtime-7.0
 vints,aspnetcore-runtime-7.0
 vpmc,openjdk-21-jre
 vpmc,openjdk-21-jre
 vs
 vs