Commit bd68aae7 authored by Marius Cramer's avatar Marius Cramer

Resolved differences from svn merge to trunk and git master

parent 9b189665
...@@ -285,7 +285,7 @@ $inst->configure_dbserver(); ...@@ -285,7 +285,7 @@ $inst->configure_dbserver();
//if(@is_dir('/etc/Bastille')) { //if(@is_dir('/etc/Bastille')) {
//* Configure Firewall //* Configure Firewall
swriteln('Configuring Firewall'); swriteln('Configuring Firewall');
$inst->configure_firewall(); $inst->configure_bastille_firewall();
//} //}
//** Configure ISPConfig //** Configure ISPConfig
......
...@@ -260,10 +260,17 @@ if($install_mode == 'standard') { ...@@ -260,10 +260,17 @@ if($install_mode == 'standard') {
$inst->configure_apps_vhost(); $inst->configure_apps_vhost();
//* Configure Firewall //* Configure Firewall
//* Configure Bastille Firewall if($conf['ufw']['installed'] == true) {
$conf['services']['firewall'] = true; //* Configure Ubuntu Firewall
swriteln('Configuring Bastille Firewall'); $conf['services']['firewall'] = true;
$inst->configure_firewall(); swriteln('Configuring Ubuntu Firewall');
$inst->configure_ufw_firewall();
} else {
//* Configure Bastille Firewall
$conf['services']['firewall'] = true;
swriteln('Configuring Bastille Firewall');
$inst->configure_bastille_firewall();
}
//* Configure Fail2ban //* Configure Fail2ban
if($conf['fail2ban']['installed'] == true) { if($conf['fail2ban']['installed'] == true) {
...@@ -331,7 +338,7 @@ if($install_mode == 'standard') { ...@@ -331,7 +338,7 @@ if($install_mode == 'standard') {
if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null'); if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
//if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null'); //if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null'); if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
//if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null'); if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
}else{ }else{
//* In expert mode, we select the services in the following steps, only db is always available //* In expert mode, we select the services in the following steps, only db is always available
...@@ -547,18 +554,17 @@ if($install_mode == 'standard') { ...@@ -547,18 +554,17 @@ if($install_mode == 'standard') {
//** Configure Firewall //** Configure Firewall
if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') { if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {
//if($conf['bastille']['installed'] == true) { if($conf['ufw']['installed'] == true) {
//* Configure Bastille Firewall
$conf['services']['firewall'] = true;
swriteln('Configuring Bastille Firewall');
$inst->configure_firewall();
/*} elseif($conf['ufw']['installed'] == true) {
//* Configure Ubuntu Firewall //* Configure Ubuntu Firewall
$conf['services']['firewall'] = true; $conf['services']['firewall'] = true;
swriteln('Configuring Ubuntu Firewall'); swriteln('Configuring Ubuntu Firewall');
$inst->configure_ufw_firewall(); $inst->configure_ufw_firewall();
} else {
//* Configure Bastille Firewall
$conf['services']['firewall'] = true;
swriteln('Configuring Bastille Firewall');
$inst->configure_bastille_firewall();
} }
*/
} }
//** Configure Firewall //** Configure Firewall
......
...@@ -132,7 +132,7 @@ class installer_base { ...@@ -132,7 +132,7 @@ class installer_base {
if(is_installed('named') || is_installed('bind') || is_installed('bind9')) $conf['bind']['installed'] = true; if(is_installed('named') || is_installed('bind') || is_installed('bind9')) $conf['bind']['installed'] = true;
if(is_installed('squid')) $conf['squid']['installed'] = true; if(is_installed('squid')) $conf['squid']['installed'] = true;
if(is_installed('nginx')) $conf['nginx']['installed'] = true; if(is_installed('nginx')) $conf['nginx']['installed'] = true;
// if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true; if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true;
if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true; if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true;
if(is_installed('vzctl')) $conf['openvz']['installed'] = true; if(is_installed('vzctl')) $conf['openvz']['installed'] = true;
if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true; if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true;
...@@ -1387,7 +1387,6 @@ class installer_base { ...@@ -1387,7 +1387,6 @@ class installer_base {
exec('chown root:root '.$conf["squid"]["config_dir"].'/'.$configfile); exec('chown root:root '.$conf["squid"]["config_dir"].'/'.$configfile);
} }
/*
public function configure_ufw_firewall() public function configure_ufw_firewall()
{ {
$configfile = 'ufw.conf'; $configfile = 'ufw.conf';
...@@ -1397,9 +1396,8 @@ class installer_base { ...@@ -1397,9 +1396,8 @@ class installer_base {
exec('chmod 600 /etc/ufw/ufw.conf'); exec('chmod 600 /etc/ufw/ufw.conf');
exec('chown root:root /etc/ufw/ufw.conf'); exec('chown root:root /etc/ufw/ufw.conf');
} }
*/
public function configure_firewall() { public function configure_bastille_firewall() {
global $conf; global $conf;
$dist_init_scripts = $conf['init_scripts']; $dist_init_scripts = $conf['init_scripts'];
......
ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1'; ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
\ No newline at end of file ALTER TABLE `web_backup` ADD `filesize` VARCHAR(10) NOT NULL AFTER `filename`;
ALTER TABLE `client` ADD `default_slave_dnsserver` INT( 11 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `limit_dns_zone`; ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
\ No newline at end of file ALTER TABLE `mail_domain` ADD `dkim_public` MEDIUMTEXT NOT NULL AFTER `domain`;
ALTER TABLE `mail_domain` ADD `dkim_private` MEDIUMTEXT NOT NULL AFTER `domain`;
ALTER TABLE `mail_domain` ADD `dkim` ENUM( 'n', 'y' ) NOT NULL AFTER `domain`;
ALTER TABLE `client` ADD `default_slave_dnsserver` INT( 11 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `limit_dns_zone`;
ALTER TABLE `sys_datalog` ADD `error` MEDIUMTEXT NULL DEFAULT NULL; ALTER TABLE `web_backup` CHANGE `backup_type` `backup_type` enum('web','mongodb','mysql') NOT NULL DEFAULT 'web';
\ No newline at end of file ALTER TABLE `web_database_user` ADD `database_password_mongo` varchar(32) DEFAULT NULL AFTER `database_password`;
ALTER TABLE `sys_datalog` ADD `error` MEDIUMTEXT NULL DEFAULT NULL;
ALTER TABLE `client` ADD COLUMN `can_use_api` enum('n','y') NOT NULL DEFAULT 'n' AFTER `canceled`; ALTER TABLE `client` ADD COLUMN `can_use_api` enum('n','y') NOT NULL DEFAULT 'n' AFTER `canceled`;
ALTER TABLE `remote_session` ADD COLUMN `client_login` tinyint(1) unsigned NOT NULL default '0' AFTER `remote_functions`; ALTER TABLE `remote_session` ADD COLUMN `client_login` tinyint(1) unsigned NOT NULL default '0' AFTER `remote_functions`;
...@@ -267,7 +267,7 @@ CREATE TABLE `client_template` ( ...@@ -267,7 +267,7 @@ CREATE TABLE `client_template` (
`sys_groupid` int(11) unsigned NOT NULL default '0', `sys_groupid` int(11) unsigned NOT NULL default '0',
`sys_perm_user` varchar(5) default NULL, `sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL, `sys_perm_group` varchar(5) default NULL,
`sys_perm_other` varchar(5) default NULL, `sys_perm_other` varchar(5) default NULL,
`template_name` varchar(64) NOT NULL, `template_name` varchar(64) NOT NULL,
`template_type` varchar(1) NOT NULL default 'm', `template_type` varchar(1) NOT NULL default 'm',
`limit_maildomain` int(11) NOT NULL default '-1', `limit_maildomain` int(11) NOT NULL default '-1',
...@@ -682,6 +682,9 @@ CREATE TABLE `mail_domain` ( ...@@ -682,6 +682,9 @@ CREATE TABLE `mail_domain` (
`sys_perm_other` varchar(5) NOT NULL default '', `sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0', `server_id` int(11) unsigned NOT NULL default '0',
`domain` varchar(255) NOT NULL default '', `domain` varchar(255) NOT NULL default '',
`dkim` ENUM( 'n', 'y' ) NOT NULL default 'n',
`dkim_private` mediumtext NOT NULL default '',
`dkim_public` mediumtext NOT NULL default '',
`active` enum('n','y') NOT NULL, `active` enum('n','y') NOT NULL,
PRIMARY KEY (`domain_id`), PRIMARY KEY (`domain_id`),
KEY `server_id` (`server_id`,`domain`), KEY `server_id` (`server_id`,`domain`),
...@@ -1447,23 +1450,8 @@ CREATE TABLE IF NOT EXISTS `sys_cron` ( ...@@ -1447,23 +1450,8 @@ CREATE TABLE IF NOT EXISTS `sys_cron` (
-- -------------------------------------------------------- -- --------------------------------------------------------
-- --
-- Table structure for table `sys_cron`
--
CREATE TABLE IF NOT EXISTS `sys_cron` (
`name` varchar(50) NOT NULL,
`last_run` datetime NULL DEFAULT NULL,
`next_run` datetime NULL DEFAULT NULL,
`running` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
PRIMARY KEY (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
--
-- Table structure for table `sys_datalog` -- Table structure for table `sys_datalog`
-- --
CREATE TABLE `sys_datalog` ( CREATE TABLE `sys_datalog` (
`datalog_id` int(11) unsigned NOT NULL auto_increment, `datalog_id` int(11) unsigned NOT NULL auto_increment,
...@@ -1643,7 +1631,7 @@ CREATE TABLE `sys_user` ( ...@@ -1643,7 +1631,7 @@ CREATE TABLE `sys_user` (
`default_group` int(11) unsigned NOT NULL default '0', `default_group` int(11) unsigned NOT NULL default '0',
`client_id` int(11) unsigned NOT NULL default '0', `client_id` int(11) unsigned NOT NULL default '0',
`id_rsa` VARCHAR( 2000 ) NOT NULL default '', `id_rsa` VARCHAR( 2000 ) NOT NULL default '',
`ssh_rsa` VARCHAR( 600 ) NOT NULL default '', `ssh_rsa` VARCHAR( 600 ) NOT NULL default '',
PRIMARY KEY (`userid`) PRIMARY KEY (`userid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
...@@ -1680,10 +1668,11 @@ CREATE TABLE `web_backup` ( ...@@ -1680,10 +1668,11 @@ CREATE TABLE `web_backup` (
`backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`server_id` int(10) unsigned NOT NULL, `server_id` int(10) unsigned NOT NULL,
`parent_domain_id` int(10) unsigned NOT NULL, `parent_domain_id` int(10) unsigned NOT NULL,
`backup_type` enum('web','mysql') NOT NULL DEFAULT 'web', `backup_type` enum('web','mongodb','mysql') NOT NULL DEFAULT 'web',
`backup_mode` varchar(64) NOT NULL DEFAULT '', `backup_mode` varchar(64) NOT NULL DEFAULT '',
`tstamp` int(10) unsigned NOT NULL, `tstamp` int(10) unsigned NOT NULL,
`filename` varchar(255) NOT NULL, `filename` varchar(255) NOT NULL,
`filesize` VARCHAR(10) NOT NULL,
PRIMARY KEY (`backup_id`) PRIMARY KEY (`backup_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
...@@ -1735,6 +1724,7 @@ CREATE TABLE IF NOT EXISTS `web_database_user` ( ...@@ -1735,6 +1724,7 @@ CREATE TABLE IF NOT EXISTS `web_database_user` (
`database_user` varchar(64) DEFAULT NULL, `database_user` varchar(64) DEFAULT NULL,
`database_user_prefix` varchar(50) NOT NULL default '', `database_user_prefix` varchar(50) NOT NULL default '',
`database_password` varchar(64) DEFAULT NULL, `database_password` varchar(64) DEFAULT NULL,
`database_password_mongo` varchar(32) DEFAULT NULL,
PRIMARY KEY (`database_user_id`) PRIMARY KEY (`database_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
......
...@@ -75,6 +75,12 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log) ...@@ -75,6 +75,12 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
# Set the log_level to 5 for debugging # Set the log_level to 5 for debugging
$log_level = 0; # (defaults to 0) $log_level = 0; # (defaults to 0)
# DKIM
$enable_dkim_verification = 1;
$enable_dkim_signing = 1; # load DKIM signing code,
@dkim_signature_options_bysender_maps = (
{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } );
#------------ Do not modify anything below this line ------------- #------------ Do not modify anything below this line -------------
1; # insure a defined return 1; # insure a defined return
...@@ -778,5 +778,11 @@ $spam_admin = undef; ...@@ -778,5 +778,11 @@ $spam_admin = undef;
$DO_SYSLOG = 1; $DO_SYSLOG = 1;
$LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log) $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
# DKIM
$enable_dkim_verification = 1;
$enable_dkim_signing = 1; # load DKIM signing code,
@dkim_signature_options_bysender_maps = (
{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } );
1; # insure a defined return 1; # insure a defined return
...@@ -5,12 +5,13 @@ dnsserver=mydns ...@@ -5,12 +5,13 @@ dnsserver=mydns
[server] [server]
auto_network_configuration=n auto_network_configuration=n
ip_address=0.0.0.0 ip_address=0.0.0.0
netmask=255.255.255.0 netmask=255.255.255.0
gateway=0.0.0.0 v6_prefix=
hostname=server1.domain.tld gateway=0.0.0.0
nameservers=8.8.8.8,8.8.4.4 hostname=server1.domain.tld
nameservers=8.8.8.8,8.8.4.4
firewall=bastille firewall=bastille
loglevel=2 loglevel=2
admin_notify_events=1 admin_notify_events=1
...@@ -45,6 +46,7 @@ overquota_notify_admin=y ...@@ -45,6 +46,7 @@ overquota_notify_admin=y
overquota_notify_client=y overquota_notify_client=y
overquota_notify_freq=7 overquota_notify_freq=7
overquota_notify_onok=n overquota_notify_onok=n
sendmail_path=/usr/sbin/sendmail
[getmail] [getmail]
getmail_config_dir=/etc/getmail getmail_config_dir=/etc/getmail
...@@ -52,12 +54,12 @@ getmail_config_dir=/etc/getmail ...@@ -52,12 +54,12 @@ getmail_config_dir=/etc/getmail
[web] [web]
server_type=apache server_type=apache
website_basedir=/var/www website_basedir=/var/www
website_path=/var/www/clients/client[client_id]/web[website_id] website_path=/var/www/clients/client[client_id]/web[website_id]
website_symlinks=/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/ website_symlinks=/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/
website_symlinks_rel=n website_symlinks_rel=n
vhost_conf_dir=/etc/apache2/sites-available vhost_conf_dir=/etc/apache2/sites-available
vhost_conf_enabled_dir=/etc/apache2/sites-enabled vhost_conf_enabled_dir=/etc/apache2/sites-enabled
nginx_vhost_conf_dir=/etc/nginx/sites-available nginx_vhost_conf_dir=/etc/nginx/sites-available
nginx_vhost_conf_enabled_dir=/etc/nginx/sites-enabled nginx_vhost_conf_enabled_dir=/etc/nginx/sites-enabled
security_level=20 security_level=20
user=www-data user=www-data
...@@ -91,6 +93,7 @@ add_web_users_to_sshusers_group=y ...@@ -91,6 +93,7 @@ add_web_users_to_sshusers_group=y
connect_userid_to_webid=n connect_userid_to_webid=n
connect_userid_to_webid_start=10000 connect_userid_to_webid_start=10000
web_folder_protection=y web_folder_protection=y
php_ini_check_minutes=1
overquota_notify_admin=y overquota_notify_admin=y
overquota_notify_client=y overquota_notify_client=y
overquota_notify_freq=7 overquota_notify_freq=7
......
...@@ -23,6 +23,7 @@ dblist_phpmyadmin_link=y ...@@ -23,6 +23,7 @@ dblist_phpmyadmin_link=y
phpmyadmin_url=/phpmyadmin phpmyadmin_url=/phpmyadmin
webftp_url= webftp_url=
client_username_web_check_disabled=n client_username_web_check_disabled=n
reseller_can_use_options=n
[tools] [tools]
......
...@@ -344,10 +344,15 @@ if($reconfigure_services_answer == 'yes') { ...@@ -344,10 +344,15 @@ if($reconfigure_services_answer == 'yes') {
if($conf['services']['firewall']) { if($conf['services']['firewall']) {
if($conf['bastille']['installed'] == true) { if($conf['ufw']['installed'] == true) {
//* Configure Ubuntu Firewall
$conf['services']['firewall'] = true;
swriteln('Configuring Ubuntu Firewall');
$inst->configure_ufw_firewall();
} else {
//* Configure Bastille Firewall //* Configure Bastille Firewall
swriteln('Configuring Bastille Firewall'); swriteln('Configuring Bastille Firewall');
$inst->configure_firewall(); $inst->configure_bastille_firewall();
} }
} }
...@@ -429,7 +434,7 @@ if($reconfigure_services_answer == 'yes') { ...@@ -429,7 +434,7 @@ if($reconfigure_services_answer == 'yes') {
} }
if($conf['services']['firewall']) { if($conf['services']['firewall']) {
//if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null'); if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
} }
} }
......
...@@ -7,14 +7,14 @@ All rights reserved. ...@@ -7,14 +7,14 @@ All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met: are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, * Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer. this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, * Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution. and/or other materials provided with the distribution.
* Neither the name of ISPConfig nor the names of its contributors * Neither the name of ISPConfig nor the names of its contributors
may be used to endorse or promote products derived from this software without may be used to endorse or promote products derived from this software without
specific prior written permission. specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 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 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
......
...@@ -491,6 +491,40 @@ class tools_monitor { ...@@ -491,6 +491,40 @@ class tools_monitor {
return $html; return $html;
} }
function showMongoDB() {
global $app;
/* fetch the Data from the DB */
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'log_mongodb' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$html =
'<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">';
/*
* First, we have to detect, if there is any monitoring-data.
* If not (because mongodb is not installed) show this.
*/
$data = unserialize($record['data']);
if ($data == '') {
$html .= '<p>'.
'MongoDB is not installed at this server.<br />' .
'See more (for debian) <a href="http://www.howtoforge.com/fail2ban_debian_etch" target="htf">here...</a>'.
'</p>';
}
else {
$html .= nl2br($data);
}
$html .= '</div></div>';
} else {
$html = '<p>There is no data available at the moment.</p>';
}
return $html;
}
function showIPTables() { function showIPTables() {
global $app; global $app;
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'iptables_rules' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc"); $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'iptables_rules' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
......
...@@ -71,7 +71,7 @@ $wb['datepicker_prevText'] = 'Předchozí'; ...@@ -71,7 +71,7 @@ $wb['datepicker_prevText'] = 'Předchozí';
$wb['logout_txt'] = 'Odhlášení'; $wb['logout_txt'] = 'Odhlášení';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd'; $wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Opravdu chcete provést tuto akci ?'; $wb['submit_confirmation'] = 'Opravdu chcete provést tuto akci ?';
$wb['top_menu_mailuser'] = 'E-mail. uživ.'; $wb['top_menu_mailuser'] = 'E-mailový uživatel';
$wb['globalsearch_resultslimit_of_txt'] = 'z'; $wb['globalsearch_resultslimit_of_txt'] = 'z';
$wb['globalsearch_resultslimit_results_txt'] = 'výsledky'; $wb['globalsearch_resultslimit_results_txt'] = 'výsledky';
$wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.'; $wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.';
......
...@@ -133,5 +133,7 @@ $wb['datalog_status_d_web_folder_user'] = 'Verzeichnisschutz Benutzer löschen'; ...@@ -133,5 +133,7 @@ $wb['datalog_status_d_web_folder_user'] = 'Verzeichnisschutz Benutzer löschen';
$wb['login_as_txt'] = 'Anmelden als'; $wb['login_as_txt'] = 'Anmelden als';
$wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.'; $wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
$wb['no_destination_perm'] = 'Sie haben keine Berechtigung für dieses Ziel.'; $wb['no_destination_perm'] = 'Sie haben keine Berechtigung für dieses Ziel.';
$wb['client_you_are_locked'] = 'Sie haben keine Berechtigung, Einstellungen zu verändern.';
$wb['gender_m_txt'] = 'Herr';
$wb['gender_f_txt'] = 'Frau';
?> ?>
...@@ -31,4 +31,5 @@ vmail ...@@ -31,4 +31,5 @@ vmail
getmail getmail
ispconfig ispconfig
courier courier
dovecot dovecot
\ No newline at end of file mongodb
...@@ -83,22 +83,20 @@ $form["tabs"]['server'] = array( ...@@ -83,22 +83,20 @@ $form["tabs"]['server'] = array(
'errmsg' => 'netmask_error_wrong'), 'errmsg' => 'netmask_error_wrong'),
), ),
'value' => '', 'value' => '',
'width' => '15', 'width' => '15',
'maxlength' => '255' 'maxlength' => '255'
), ),
/* 'v6_prefix' => array(
'v6_prefix' => array( 'datatype' => 'VARCHAR',
'datatype' => 'VARCHAR', 'formtype' => 'TEXT',
'formtype' => 'TEXT', 'validators' => array(0 => array('type' => 'ISV6PREFIX',
'validators' => array(0 => array('type' => 'ISV6PREFIX', 'errmsg' => 'v6_prefix_wrong'),
'errmsg' => 'v6_prefix_wrong'), ),
), 'default' => ''
'default' => '' ),
), 'gateway' => array(
*/ 'datatype' => 'VARCHAR',
'gateway' => array( 'formtype' => 'TEXT',
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '192.168.0.1', 'default' => '192.168.0.1',
'validators' => array(0 => array('type' => 'ISIPV4', 'validators' => array(0 => array('type' => 'ISIPV4',
'errmsg' => 'gateway_error_wrong'), 'errmsg' => 'gateway_error_wrong'),
...@@ -119,13 +117,13 @@ $form["tabs"]['server'] = array( ...@@ -119,13 +117,13 @@ $form["tabs"]['server'] = array(
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'TEXT', 'formtype' => 'TEXT',
'default' => 'server1.domain.tld', 'default' => 'server1.domain.tld',