summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJannik Schönartz2018-07-31 15:42:43 +0200
committerJannik Schönartz2018-07-31 15:42:43 +0200
commit331cea8ca1f2d399f87feaf12665d5461ea962d9 (patch)
tree1ca3fdd5b1f57c59817f359029843719fb121ffc /server
parent[webapp/external-backends] Splitted the edit and delete Dialog. (diff)
downloadbas-331cea8ca1f2d399f87feaf12665d5461ea962d9.tar.gz
bas-331cea8ca1f2d399f87feaf12665d5461ea962d9.tar.xz
bas-331cea8ca1f2d399f87feaf12665d5461ea962d9.zip
[server/ipxe] Fixed the embedded ipxe script to the router restructure.
Diffstat (limited to 'server')
-rw-r--r--server/api/ipxe.js9
-rw-r--r--server/ipxe/main.ipxe2
-rw-r--r--server/router.js4
3 files changed, 12 insertions, 3 deletions
diff --git a/server/api/ipxe.js b/server/api/ipxe.js
index a19e744..3e8dd9a 100644
--- a/server/api/ipxe.js
+++ b/server/api/ipxe.js
@@ -14,6 +14,7 @@ dhcp
:start
menu Please choose a webserver to load the ipxe menu:
item pxelnx PxeLinux
+item c32boot C32Boot
item exit Exit
item exit0 Exit0
item exit1 Exit1
@@ -36,11 +37,15 @@ exit 1
set net0/next-server 192.52.3.91 ||
set netX/next-server 192.52.3.91 ||
set next-server 192.52.3.91 ||
-
# set 209:string pxelinux.cfg/default
# set 210:string bas.stfu-kthx.net
-shell ||
+# shell ||
boot tftp://bas.stfu-kthx.net/pxelinux.0 || goto start
+:c32boot
+set net0/next-server 192.52.3.91 ||
+set netX/next-server 192.52.3.91 ||
+set next-server 192.52.3.91 ||
+boot tftp://bas.stfu-kthx.net/chain.c32 || goto start
:sh
shell
diff --git a/server/ipxe/main.ipxe b/server/ipxe/main.ipxe
index fa1f492..763725a 100644
--- a/server/ipxe/main.ipxe
+++ b/server/ipxe/main.ipxe
@@ -15,7 +15,7 @@ choose target && goto ${target}
:js
set crosscert http://ca.ipxe.org/auto/
-chain https://bas.stfu-kthx.net/api/ipxe-loader/load-script
+chain https://bas.stfu-kthx.net:8888/api/ipxe/loadScript ||
goto start
:uw
chain http://10.4.9.115/boot.php
diff --git a/server/router.js b/server/router.js
index 7d5613a..e460771 100644
--- a/server/router.js
+++ b/server/router.js
@@ -10,6 +10,10 @@ router.post('/signup', auth.signup)
router.post('/logout', auth.logout)
router.post('/changepassword', auth.changePassword)
+// Public callable functions.
+var ipxe = require(path.join(__dirname, 'api', 'ipxe'))
+router.get('/ipxe/loadScript', ipxe.get.loadScript)
+
// ############ Legacy Code: TODO(Chris): Rework to api and get/post or delete! ############
// User API
var user = require(path.join(__dirname, 'api', 'user'))