Commit 796661c5 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'master' into 'master'

FS#2403 - Disable apps vhost in server config

See merge request !235
parents 6495dda1 abee9093
......@@ -168,3 +168,9 @@ CREATE TABLE `server_ip_map` (
ALTER TABLE `web_domain` ADD COLUMN `rewrite_to_https` ENUM('y','n') NOT NULL DEFAULT 'n' AFTER `seo_redirect`;
ALTER TABLE openvz_ip ADD COLUMN `additional` VARCHAR(255) NOT NULL DEFAULT 'n';
ALTER TABLE openvz_template ADD COLUMN `custom` text;
ALTER TABLE openvz_vm
ADD COLUMN `bootorder` INT(11) NOT NULL DEFAULT '1' AFTER `start_boot`,
ADD COLUMN `custom` text;
......@@ -1093,6 +1093,7 @@ CREATE TABLE IF NOT EXISTS `openvz_template` (
`capability` varchar(255) DEFAULT NULL,
`features` varchar(255) DEFAULT NULL,
`iptables` varchar(255) DEFAULT NULL,
`custom` text,
PRIMARY KEY (`template_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
......@@ -1100,7 +1101,7 @@ CREATE TABLE IF NOT EXISTS `openvz_template` (
-- Dumping data for table `openvz_template`
--
INSERT INTO `openvz_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `template_name`, `diskspace`, `traffic`, `bandwidth`, `ram`, `ram_burst`, `cpu_units`, `cpu_num`, `cpu_limit`, `io_priority`, `active`, `description`, `numproc`, `numtcpsock`, `numothersock`, `vmguarpages`, `kmemsize`, `tcpsndbuf`, `tcprcvbuf`, `othersockbuf`, `dgramrcvbuf`, `oomguarpages`, `privvmpages`, `lockedpages`, `shmpages`, `physpages`, `numfile`, `avnumproc`, `numflock`, `numpty`, `numsiginfo`, `dcachesize`, `numiptent`, `swappages`, `hostname`, `nameserver`, `create_dns`, `capability`, `features`, `iptables`) VALUES(1, 1, 1, 'riud', 'riud', '', 'small', 10, -1, -1, 256, 512, 1000, 4, 400, 4, 'y', '', '999999:999999', '7999992:7999992', '7999992:7999992', '65536:65536', '2147483646:2147483646', '214748160:396774400', '214748160:396774400', '214748160:396774400', '214748160:396774400', '65536:65536', '131072:131072', '999999:999999', '65536:65536', '0:2147483647', '23999976:23999976', '180:180', '999999:999999', '500000:500000', '999999:999999', '2147483646:2147483646', '999999:999999', '256000:256000', 'v{VEID}.test.tld', '8.8.8.8 8.8.4.4', 'n', '', '', '');
INSERT INTO `openvz_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `template_name`, `diskspace`, `traffic`, `bandwidth`, `ram`, `ram_burst`, `cpu_units`, `cpu_num`, `cpu_limit`, `io_priority`, `active`, `description`, `numproc`, `numtcpsock`, `numothersock`, `vmguarpages`, `kmemsize`, `tcpsndbuf`, `tcprcvbuf`, `othersockbuf`, `dgramrcvbuf`, `oomguarpages`, `privvmpages`, `lockedpages`, `shmpages`, `physpages`, `numfile`, `avnumproc`, `numflock`, `numpty`, `numsiginfo`, `dcachesize`, `numiptent`, `swappages`, `hostname`, `nameserver`, `create_dns`, `capability`, `features`, `iptables`, `custom`) VALUES(1, 1, 1, 'riud', 'riud', '', 'small', 10, -1, -1, 256, 512, 1000, 4, 400, 4, 'y', '', '999999:999999', '7999992:7999992', '7999992:7999992', '65536:65536', '2147483646:2147483646', '214748160:396774400', '214748160:396774400', '214748160:396774400', '214748160:396774400', '65536:65536', '131072:131072', '999999:999999', '65536:65536', '0:2147483647', '23999976:23999976', '180:180', '999999:999999', '500000:500000', '999999:999999', '2147483646:2147483646', '999999:999999', '256000:256000', 'v{VEID}.test.tld', '8.8.8.8 8.8.4.4', 'n', '', '', '', '');
-- --------------------------------------------------------
......@@ -1141,6 +1142,7 @@ CREATE TABLE IF NOT EXISTS `openvz_vm` (
`hostname` varchar(255) DEFAULT NULL,
`vm_password` varchar(255) DEFAULT NULL,
`start_boot` varchar(255) NOT NULL DEFAULT 'y',
`bootorder` int(11) NOT NULL DEFAULT '1',
`active` varchar(255) NOT NULL DEFAULT 'y',
`active_until_date` date NOT NULL DEFAULT '0000-00-00',
`description` text,
......@@ -1159,6 +1161,7 @@ CREATE TABLE IF NOT EXISTS `openvz_vm` (
`features` text,
`iptabless` text,
`config` mediumtext,
`custom` text,
PRIMARY KEY (`vm_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
......
......@@ -72,6 +72,7 @@ user=www-data
group=www-data
nginx_user=www-data
nginx_group=www-data
apps_vhost_enabled=y
apps_vhost_port=8081
apps_vhost_ip=_default_
apps_vhost_servername=
......
<?php
/**
Copyright (c) 2015, Florian Schaal, schaal @it
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of ISPConfig nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@author Florian Schaal, info@schaal-24.de
@copyrighth Florian Schaal, info@schaal-24.de
*/
class validate_openvz {
function get_error($errmsg, $additional='') {
global $app;
if(isset($app->tform->wordbook[$errmsg])) {
return $app->tform->wordbook[$errmsg].$additional."<br>\r\n";
} else {
return $errmsg."<br>".$additional."<br>\r\n";
}
}
function check_custom($field_name, $field_value, $validator) {
$template = file('../vm/templates/openvz.conf.tpl', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
$custom_array = explode("\n", $field_value);
$used_parameters = array();
foreach ($template as $line) {
$line = trim ($line);
if (preg_match('/^[^#].*=\".*\"/', $line)) {
$line = explode('=', $line, 2);
$used_parameters[] = $line[0];
}
}
foreach ($custom_array as $check) {
$check = trim(strtoupper($check));
$check = explode('=', trim($check), 2);
$check = trim($check[0]);
if (in_array($check, $used_parameters)) {
return $this->get_error($validator['errmsg'], $check);
}
}
}
}
......@@ -130,10 +130,10 @@ class vm_openvz_plugin {
global $app, $conf;
//* Free the IP address
$tmp = $app->db->queryOneRecord("SELECT ip_address_id FROM openvz_ip WHERE vm_id = ?", $page_form->id);
$app->db->datalogUpdate('openvz_ip', array('vm_id' => 0), 'ip_address_id', $tmp['ip_address_id']);
unset($tmp);
$tmp_rec = $app->db->queryAllRecords("SELECT ip_address_id FROM openvz_ip WHERE vm_id = ?", $page_form->id);
foreach ($tmp_rec as $tmp) {
$app->db->datalogUpdate('openvz_ip', array('vm_id' => 0), 'ip_address_id', $tmp['ip_address_id']);
}
}
private function applyTemplate() {
......@@ -154,8 +154,9 @@ class vm_openvz_plugin {
$sql .= "capability = ?, ";
$sql .= "features = ?, ";
$sql .= "iptables = ? ";
$sql .= "custom = ? ";
$sql .= "WHERE vm_id = ?";
$app->db->query($sql, $tpl['diskspace'], $tpl['ram'], $tpl['ram_burst'], $tpl['cpu_units'], $tpl['cpu_num'], $tpl['cpu_limit'], $tpl['io_priority'], $tpl['nameserver'], $tpl['create_dns'], $tpl['capability'], $tpl['features'], $tpl['iptables'], $this->id);
$app->db->query($sql, $tpl['diskspace'], $tpl['ram'], $tpl['ram_burst'], $tpl['cpu_units'], $tpl['cpu_num'], $tpl['cpu_limit'], $tpl['io_priority'], $tpl['nameserver'], $tpl['create_dns'], $tpl['capability'], $tpl['features'], $tpl['iptables'], $tpl['custom'], $this->id);
}
......@@ -174,6 +175,7 @@ class vm_openvz_plugin {
$onboot = ($vm['start_boot'] == 'y')?'yes':'no';
$tpl->setVar('onboot', $onboot);
$tpl->setVar('bootorder', $vm['bootorder']);
$tpl->setVar('kmemsize', $vm_template['kmemsize']);
$tpl->setVar('lockedpages', $vm_template['lockedpages']);
$tpl->setVar('privvmpages', $burst_ram.':'.$burst_ram);
......@@ -228,6 +230,8 @@ class vm_openvz_plugin {
$tpl->setVar('features', $vm['features']);
$tpl->setVar('iptables', $vm['iptables']);
$tpl->setVar('custom', $vm['custom']);
$tmp = $app->db->queryOneRecord("SELECT template_file FROM openvz_ostemplate WHERE ostemplate_id = ?", $app->functions->intval($vm['ostemplate_id']));
$tpl->setVar('ostemplate', $tmp['template_file']);
unset($tmp);
......
......@@ -1038,6 +1038,12 @@ $form["tabs"]['web'] = array(
1 => 'y'
)
),
'apps_vhost_enabled' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'y',
'value' => array (0 => 'n', 1 => 'y')
),
'apps_vhost_port' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
......
......@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
$wb['network_filesystem_txt'] = 'Network Filesystem';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
......@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
$wb['network_filesystem_txt'] = 'Network Filesystem';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
......@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
$wb['network_filesystem_txt'] = 'Network Filesystem';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
......@@ -253,5 +253,6 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
$wb['network_filesystem_txt'] = 'Network Filesystem';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
......@@ -266,4 +266,5 @@ $wb['php_ini_check_minutes_info_txt'] = '0 = keine Prüfung';
$wb['php_handler_txt'] = 'Standard-PHP-Handler';
$wb['enable_spdy_txt'] = 'Stellt SPDY zur Verfügung';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
......@@ -250,4 +250,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
$wb['network_filesystem_txt'] = 'Network Filesystem';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
......@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
......@@ -253,4 +253,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
$wb['network_filesystem_txt'] = 'Network Filesystem';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
......@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
$wb['network_filesystem_txt'] = 'Network Filesystem';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
......@@ -252,5 +252,6 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
$wb['network_filesystem_txt'] = 'Network Filesystem';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
......@@ -256,6 +256,7 @@ $wb['crontab_dir_error_regex'] = 'Neispravan crontab direktorij.';
$wb['cron_wget_error_regex'] = 'Neispravna cron wget putanja.';
$wb['network_filesystem_txt'] = 'Network Filesystem';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
......@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
$wb['network_filesystem_txt'] = 'Network Filesystem';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
......@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
$wb['network_filesystem_txt'] = 'Network Filesystem';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
......@@ -255,4 +255,5 @@ $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
$wb['network_filesystem_txt'] = 'Network Filesystem';
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
?>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment