From a980baac104ab000e5e6ba5f3e7e01e307304959 Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Mon, 15 Apr 2019 19:07:13 +0200 Subject: [server] Small bug fixes on the production server --- server/api/events.js | 2 +- server/ipxe/default.ipxe | 2 +- server/ipxe/registration.ipxe | 4 ++++ server/migrations/20190413172133-change-externalid-type.js | 4 ++-- server/models/backend.js | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) (limited to 'server') diff --git a/server/api/events.js b/server/api/events.js index 5cea09b..47ab94b 100644 --- a/server/api/events.js +++ b/server/api/events.js @@ -38,7 +38,7 @@ router.getAsync('', async (req, res) => { */ router.postAsync('/blacklist', async (req, res) => { if (req.body.groups) { - var blacklist = await groupHelper.getAllChildren(req.body.groupHelper) + var blacklist = await groupHelper.getAllChildren(req.body.groups) res.send(blacklist) } else res.status(404).end() }) diff --git a/server/ipxe/default.ipxe b/server/ipxe/default.ipxe index 0be460a..8ed6c1f 100644 --- a/server/ipxe/default.ipxe +++ b/server/ipxe/default.ipxe @@ -7,7 +7,7 @@ item bwlehrpool_efi bwLehrpool_efi item bwlehrpool_tpm bwLehrpool_tpm item --key r registration Registration item --key s sh [Shell] -choose target && goto ${target} +choose --default automatic --timeout 25000 target && goto ${target} :bwlehrpool #chain --replace http://132.230.4.2/tftp/ipxelinux.0 diff --git a/server/ipxe/registration.ipxe b/server/ipxe/registration.ipxe index 1fe2217..3101483 100644 --- a/server/ipxe/registration.ipxe +++ b/server/ipxe/registration.ipxe @@ -13,6 +13,7 @@ item --key a automatic Automatic Registration item --key s semiautomatic Semi-Automatic Registration item --key m manual Manual Registration item --key k key Replace Secure Boot Keys +item --key b bwlehrpool bwLehrpool item --key l localboot Localboot item --key r reboot Reboot item --key p poweroff Power Off @@ -20,6 +21,9 @@ item --key s sh [Shell] item --key u update Reload Menufile choose --default automatic --timeout 25000 target && goto ${target} || goto automatic +:bwlehrpool +chain --replace http://132.230.4.2/boot/ipxe + :localboot exit0 || exit1 || diff --git a/server/migrations/20190413172133-change-externalid-type.js b/server/migrations/20190413172133-change-externalid-type.js index e1a0c33..665dcb0 100644 --- a/server/migrations/20190413172133-change-externalid-type.js +++ b/server/migrations/20190413172133-change-externalid-type.js @@ -4,11 +4,11 @@ module.exports = { return Promise.all([ queryInterface.changeColumn('backend_x_client', 'externalId', { allowNull: false, - type: Sequelize.STRING + type: Sequelize.STRING(128) }), queryInterface.changeColumn('backend_x_group', 'externalId', { allowNull: false, - type: Sequelize.STRING + type: Sequelize.STRING(128) }) ]) }) diff --git a/server/models/backend.js b/server/models/backend.js index 705cd0f..2a039e6 100644 --- a/server/models/backend.js +++ b/server/models/backend.js @@ -34,13 +34,13 @@ module.exports = (sequelize, DataTypes) => { var BackendXGroup = sequelize.define('backend_x_group', { backendId: { type: DataTypes.INTEGER, primaryKey: true }, groupId: { type: DataTypes.INTEGER, primaryKey: false }, - externalId: { type: DataTypes.STRING, primaryKey: true }, + externalId: { type: DataTypes.STRING(128), primaryKey: true }, externalType: DataTypes.STRING }, { timestamps: false, freezeTableName: true }) var BackendXClient = sequelize.define('backend_x_client', { backendId: { type: DataTypes.INTEGER, primaryKey: true }, clientId: { type: DataTypes.INTEGER, primaryKey: false }, - externalId: { type: DataTypes.STRING, primaryKey: true }, + externalId: { type: DataTypes.STRING(128), primaryKey: true }, externalType: DataTypes.STRING }, { timestamps: false, freezeTableName: true }) -- cgit v1.2.3-55-g7522