summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJannik Schönartz2019-04-16 23:57:49 +0200
committerJannik Schönartz2019-04-16 23:57:49 +0200
commit5631f0950f7310dea14e492fd8e758433d50a359 (patch)
tree6b718070386e8d870ae87fbbec51857af4efacdf /server
parent[server/external-backends] Fix iDoIT parent id String -> INT (diff)
downloadbas-5631f0950f7310dea14e492fd8e758433d50a359.tar.gz
bas-5631f0950f7310dea14e492fd8e758433d50a359.tar.xz
bas-5631f0950f7310dea14e492fd8e758433d50a359.zip
[server] Add public file directory
Diffstat (limited to 'server')
-rw-r--r--server/app.js2
-rw-r--r--server/ipxe/embedded_bios.ipxe4
-rw-r--r--server/ipxe/embedded_efi.ipxe4
-rw-r--r--server/lib/shell.js3
-rw-r--r--server/public_files/ipxe_wallpaper.pngbin0 -> 74099 bytes
5 files changed, 8 insertions, 5 deletions
diff --git a/server/app.js b/server/app.js
index 8c38faa..2751a9a 100644
--- a/server/app.js
+++ b/server/app.js
@@ -34,6 +34,8 @@ app.use(fileUpload())
var apiRouter = require(path.join(__dirname, 'router'))
app.use('/api', apiRouter)
+app.use('/files', express.static('public_files'))
+
app.use(express.static('public'))
app.use('*', express.static('public'))
diff --git a/server/ipxe/embedded_bios.ipxe b/server/ipxe/embedded_bios.ipxe
index 30dcc60..9bf92f2 100644
--- a/server/ipxe/embedded_bios.ipxe
+++ b/server/ipxe/embedded_bios.ipxe
@@ -7,8 +7,8 @@
ifopen
# Wallpaper
-set img https://bas.intra.uni-freiburg.de/ipxeWallpaper3_scale.png || shell
-console --picture ${img} --x 800 --y 600 || shell
+set img https://bas.intra.uni-freiburg.de/files/ipxe_wallpaper.png
+console --picture ${img} --x 800 --y 600
:loop
chain https://bas.intra.uni-freiburg.de/api/configloader/${uuid}
diff --git a/server/ipxe/embedded_efi.ipxe b/server/ipxe/embedded_efi.ipxe
index 140550f..09d3aaa 100644
--- a/server/ipxe/embedded_efi.ipxe
+++ b/server/ipxe/embedded_efi.ipxe
@@ -8,8 +8,8 @@ ifopen
dhcp
# Wallpaper
-set img https://bas.intra.uni-freiburg.de/ipxeWallpaper3_scale.png || shell
-console --picture ${img} --x 800 --y 600 || shell
+set img https://bas.intra.uni-freiburg.de/files/ipxe_wallpaper.png
+console --picture ${img} --x 800 --y 600
:loop
chain https://bas.intra.uni-freiburg.de/api/configloader/${uuid}
diff --git a/server/lib/shell.js b/server/lib/shell.js
index 7265d09..bc6a216 100644
--- a/server/lib/shell.js
+++ b/server/lib/shell.js
@@ -2,7 +2,8 @@
var path = require('path')
var shell = require('shelljs')
// var child = require('child_process')
-var ipxeGIT = 'git://git.ipxe.org/ipxe.git'
+//var ipxeGIT = 'git://git.ipxe.org/ipxe.git'
+var ipxeGIT = 'http://git.ipxe.org/ipxe.git'
var io = require(path.join(__appdir, 'lib', 'socketio'))
const fs = require('fs')
diff --git a/server/public_files/ipxe_wallpaper.png b/server/public_files/ipxe_wallpaper.png
new file mode 100644
index 0000000..019b73f
--- /dev/null
+++ b/server/public_files/ipxe_wallpaper.png
Binary files differ