Merge branch 'master' into 'master'

Marius Cramer

2015-09-14 35a93a75cf6eea4d93288936366481d32f63dfb9

Merge branch 'master' into 'master'

resize openvz-server with ploop enabled

See merge request !228

 server/plugins-available/openvz_plugin.inc.php

@@ -121,6 +121,11 @@
        file_put_contents('/etc/vz/conf/'.$veid.'.conf', $data['new']['config']);
        $app->log("Writing new configuration for $veid", LOGLEVEL_DEBUG);

        //* new diskspace for ploop-containers requieres "vzctl set"
        if($data['new']['diskspace'] != $data['old']['diskspace']) {
            exec("vzctl set ".$veid." --diskspace ".$data['new']['diskspace']."G --save");
        }

        //* Apply config changes to the VM
        if($data['new']['active'] == 'y' && $data['old']['active'] == 'y') {
            exec("vzctl restart $veid");