diff options
| -rw-r--r-- | apis/taskmanager.inc.php | 6 | ||||
| -rw-r--r-- | inc/property.inc.php | 20 | ||||
| -rw-r--r-- | modules/main.inc.php | 2 | ||||
| -rw-r--r-- | modules/serversetup.inc.php | 4 | ||||
| -rw-r--r-- | modules/sysconfig.inc.php | 2 | ||||
| -rw-r--r-- | templates/serversetup/ipaddress.html | 7 | ||||
| -rw-r--r-- | templates/serversetup/ipxe.html | 5 |
7 files changed, 5 insertions, 41 deletions
diff --git a/apis/taskmanager.inc.php b/apis/taskmanager.inc.php index f7ee6ac1..8365aac7 100644 --- a/apis/taskmanager.inc.php +++ b/apis/taskmanager.inc.php @@ -15,12 +15,6 @@ foreach ($_POST['ids'] as $id) { continue; } $return[] = $status; - // HACK HACK - should be pluggable - if (isset($status['statusCode']) && $status['statusCode'] === TASK_FINISHED // iPXE Update - && $id === Property::getIPxeTaskId() && Property::getServerIp() !== Property::getIPxeIp()) { - Property::setIPxeIp(Property::getServerIp()); - } - // -- END HACKS -- if (!isset($status['statusCode']) || ($status['statusCode'] !== TASK_WAITING && $status['statusCode'] !== TASK_PROCESSING)) { Taskmanager::release($id); } diff --git a/inc/property.inc.php b/inc/property.inc.php index 00c8018f..81de137f 100644 --- a/inc/property.inc.php +++ b/inc/property.inc.php @@ -62,26 +62,6 @@ class Property self::set('server-ip', $value); } - public static function getIPxeIp() - { - return self::get('ipxe-ip', 'not-set'); - } - - public static function setIPxeIp($value) - { - self::set('ipxe-ip', $value); - } - - public static function getIPxeTaskId() - { - return self::get('ipxe-task'); - } - - public static function setIPxeTaskId($value) - { - self::set('ipxe-task', $value); - } - public static function getBootMenu() { return json_decode(self::get('ipxe-menu'), true); diff --git a/modules/main.inc.php b/modules/main.inc.php index 232d6a0a..42a980e3 100644 --- a/modules/main.inc.php +++ b/modules/main.inc.php @@ -17,13 +17,11 @@ class Page_Main extends Page return; } // Logged in here - $ipxe = (Property::getServerIp() !== Property::getIPxeIp()); $sysconfig = !file_exists(CONFIG_HTTP_DIR . '/default/config.tgz'); $minilinux = !file_exists(CONFIG_HTTP_DIR . '/default/kernel') || !file_exists(CONFIG_HTTP_DIR . '/default/initramfs-stage31') || !file_exists(CONFIG_HTTP_DIR . '/default/stage32.sqfs'); $vmstore = !is_array(Property::getVmStoreConfig()); Render::addTemplate('page-main', array( 'user' => User::getName(), - 'ipxe' => $ipxe, 'sysconfig' => $sysconfig, 'minilinux' => $minilinux, 'vmstore' => $vmstore diff --git a/modules/serversetup.inc.php b/modules/serversetup.inc.php index c03fe9e3..527c0940 100644 --- a/modules/serversetup.inc.php +++ b/modules/serversetup.inc.php @@ -45,7 +45,6 @@ class Page_ServerSetup extends Page 'ips' => $this->taskStatus['data']['addresses'] )); $data = $this->currentMenu; - $data['taskid'] = Property::getIPxeTaskId(); if (!isset($data['defaultentry'])) $data['defaultentry'] = 'net'; if ($data['defaultentry'] === 'net') @@ -101,7 +100,6 @@ class Page_ServerSetup extends Page } if ($valid) { Property::setServerIp($newAddress); - Trigger::ipxe(); } else { Message::addError('invalid-ip', $newAddress); } @@ -120,7 +118,7 @@ class Page_ServerSetup extends Page $this->currentMenu['timeout'] = $timeout; $this->currentMenu['custom'] = Request::post('custom', ''); Property::setBootMenu($this->currentMenu); - Trigger::ipxe(true); + Trigger::ipxe(); Util::redirect('?do=ServerSetup'); } diff --git a/modules/sysconfig.inc.php b/modules/sysconfig.inc.php index 485f2394..5e483e55 100644 --- a/modules/sysconfig.inc.php +++ b/modules/sysconfig.inc.php @@ -48,7 +48,7 @@ class Page_SysConfig extends Page if (!User::hasPermission('superadmin')) { Message::addError('no-permission'); - Util::redirect('?do=SysConfig'); + Util::redirect('?do=Main'); } $action = Request::any('action', 'list'); diff --git a/templates/serversetup/ipaddress.html b/templates/serversetup/ipaddress.html index fa0cb54c..264dc6d0 100644 --- a/templates/serversetup/ipaddress.html +++ b/templates/serversetup/ipaddress.html @@ -5,7 +5,8 @@ </div> <div class="panel-body"> <p> - Bitte wählen Sie die IP-Adresse, über die der Server von den Clients zum Booten angesprochen werden soll. + Bitte wählen Sie die primäre IP-Adresse des Servers aus. Dies ist für einige Dienste und Funktionen notwendig, + z.B. wenn Sie Authentifizierung über Active Directory nutzen wollen. </p> <form method="post" action="?do=ServerSetup"> <input type="hidden" name="action" value="ip"> @@ -27,10 +28,6 @@ </tr> {{/ips}} </table> - <p> - Das Bootmenü muss nach einer Änderung der IP-Adresse neu generiert werden. In der Regel geschieht dies - automatisch, der Vorgang kann in der Sektion <b>Bootmenü</b> allerdings auch manuell ausgelöst werden. - </p> </form> </div> </div> diff --git a/templates/serversetup/ipxe.html b/templates/serversetup/ipxe.html index 8c5d560a..c6b90c48 100644 --- a/templates/serversetup/ipxe.html +++ b/templates/serversetup/ipxe.html @@ -31,11 +31,8 @@ <strong>Benutzerdefinierter Menüzusatz</strong> <a class="btn btn-default btn-xs" data-toggle="modal" data-target="#help-custom"><span class="glyphicon glyphicon-question-sign"></span></a> <textarea class="form-control" name="custom">{{custom}}</textarea> </div> - - - <br> - <div data-tm-id="{{taskid}}" data-tm-log="error"> Status</div> </div> + <div class="panel-footer"> <button class="btn btn-primary" name="action" value="ipxe">Bootmenü erzeugen</button> </div> |