From bf84b78f6ec8ef2e61e672eec81d3cd98067f6d2 Mon Sep 17 00:00:00 2001 From: bergware Date: Sat, 14 May 2016 15:28:57 +0200 Subject: [PATCH] Update Docker/VM to reference $eth0 --- plugins/dynamix.docker.manager/include/DockerClient.php | 4 +++- plugins/dynamix.vm.manager/classes/libvirt_helpers.php | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php index 0a49f81ae..c80d86030 100644 --- a/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/plugins/dynamix.docker.manager/include/DockerClient.php @@ -29,6 +29,8 @@ if (!isset($var)) { if (!is_file("/usr/local/emhttp/state/var.ini")) shell_exec("wget -qO /dev/null localhost:$(lsof -nPc emhttp | grep -Po 'TCP[^\d]*\K\d+')"); $var = @parse_ini_file("/usr/local/emhttp/state/var.ini"); } +if (!isset($eth0) && is_file("/usr/local/emhttp/state/network.ini")) { +} $docker_cfg_defaults = [ "DOCKER_ENABLED" => "no", @@ -232,7 +234,7 @@ class DockerTemplates { public function getControlURL($name) { - global $var; + global $var,$eth0; $DockerClient = new DockerClient(); $Repository = ""; diff --git a/plugins/dynamix.vm.manager/classes/libvirt_helpers.php b/plugins/dynamix.vm.manager/classes/libvirt_helpers.php index 846a16ca7..edf40b4b9 100644 --- a/plugins/dynamix.vm.manager/classes/libvirt_helpers.php +++ b/plugins/dynamix.vm.manager/classes/libvirt_helpers.php @@ -19,6 +19,9 @@ $disks = @parse_ini_file("/usr/local/emhttp/state/disks.ini", true); extract(parse_plugin_cfg("dynamix",true)); } + if (!isset($eth0) && is_file("/usr/local/emhttp/state/network.ini")) { + extract(parse_ini_file('/usr/local/emhttp/state/network.ini',true)); + } // Check if program is running and $libvirt_running = trim(shell_exec( "[ -f /proc/`cat /var/run/libvirt/libvirtd.pid 2> /dev/null`/exe ] && echo 'yes' || echo 'no' 2> /dev/null" ));