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();
//if(@is_dir('/etc/Bastille')) {
//* Configure Firewall
swriteln('Configuring Firewall');
$inst->configure_firewall();
$inst->configure_bastille_firewall();
//}
//** Configure ISPConfig
......
......@@ -260,10 +260,17 @@ if($install_mode == 'standard') {
$inst->configure_apps_vhost();
//* Configure Firewall
if($conf['ufw']['installed'] == true) {
//* Configure Ubuntu Firewall
$conf['services']['firewall'] = true;
swriteln('Configuring Ubuntu Firewall');
$inst->configure_ufw_firewall();
} else {
//* Configure Bastille Firewall
$conf['services']['firewall'] = true;
swriteln('Configuring Bastille Firewall');
$inst->configure_firewall();
$inst->configure_bastille_firewall();
}
//* Configure Fail2ban
if($conf['fail2ban']['installed'] == true) {
......@@ -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['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['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{
//* In expert mode, we select the services in the following steps, only db is always available
......@@ -547,18 +554,17 @@ if($install_mode == 'standard') {
//** Configure Firewall
if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {
//if($conf['bastille']['installed'] == true) {
//* Configure Bastille Firewall
$conf['services']['firewall'] = true;
swriteln('Configuring Bastille Firewall');
$inst->configure_firewall();
/*} elseif($conf['ufw']['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
$conf['services']['firewall'] = true;
swriteln('Configuring Bastille Firewall');
$inst->configure_bastille_firewall();
}
*/
}
//** Configure Firewall
......
......@@ -132,7 +132,7 @@ class installer_base {
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('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('vzctl')) $conf['openvz']['installed'] = true;
if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true;
......@@ -1387,7 +1387,6 @@ class installer_base {
exec('chown root:root '.$conf["squid"]["config_dir"].'/'.$configfile);
}
/*
public function configure_ufw_firewall()
{
$configfile = 'ufw.conf';
......@@ -1397,9 +1396,8 @@ class installer_base {
exec('chmod 600 /etc/ufw/ufw.conf');
exec('chown root:root /etc/ufw/ufw.conf');
}
*/
public function configure_firewall() {
public function configure_bastille_firewall() {
global $conf;
$dist_init_scripts = $conf['init_scripts'];
......
ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
ALTER TABLE `web_backup` ADD `filesize` VARCHAR(10) NOT NULL AFTER `filename`;
ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
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 `web_backup` CHANGE `backup_type` `backup_type` enum('web','mongodb','mysql') NOT NULL DEFAULT 'web';
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 `remote_session` ADD COLUMN `client_login` tinyint(1) unsigned NOT NULL default '0' AFTER `remote_functions`;
......@@ -682,6 +682,9 @@ CREATE TABLE `mail_domain` (
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0',
`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,
PRIMARY KEY (`domain_id`),
KEY `server_id` (`server_id`,`domain`),
......@@ -1444,21 +1447,6 @@ CREATE TABLE IF NOT EXISTS `sys_cron` (
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
--
-- 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;
-- --------------------------------------------------------
--
......@@ -1680,10 +1668,11 @@ CREATE TABLE `web_backup` (
`backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`server_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 '',
`tstamp` int(10) unsigned NOT NULL,
`filename` varchar(255) NOT NULL,
`filesize` VARCHAR(10) NOT NULL,
PRIMARY KEY (`backup_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
......@@ -1735,6 +1724,7 @@ CREATE TABLE IF NOT EXISTS `web_database_user` (
`database_user` varchar(64) DEFAULT NULL,
`database_user_prefix` varchar(50) NOT NULL default '',
`database_password` varchar(64) DEFAULT NULL,
`database_password_mongo` varchar(32) DEFAULT NULL,
PRIMARY KEY (`database_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
......
......@@ -75,6 +75,12 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
# Set the log_level to 5 for debugging
$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 -------------
1; # insure a defined return
......@@ -778,5 +778,11 @@ $spam_admin = undef;
$DO_SYSLOG = 1;
$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
......@@ -8,6 +8,7 @@ dnsserver=mydns
auto_network_configuration=n
ip_address=0.0.0.0
netmask=255.255.255.0
v6_prefix=
gateway=0.0.0.0
hostname=server1.domain.tld
nameservers=8.8.8.8,8.8.4.4
......@@ -45,6 +46,7 @@ overquota_notify_admin=y
overquota_notify_client=y
overquota_notify_freq=7
overquota_notify_onok=n
sendmail_path=/usr/sbin/sendmail
[getmail]
getmail_config_dir=/etc/getmail
......@@ -91,6 +93,7 @@ add_web_users_to_sshusers_group=y
connect_userid_to_webid=n
connect_userid_to_webid_start=10000
web_folder_protection=y
php_ini_check_minutes=1
overquota_notify_admin=y
overquota_notify_client=y
overquota_notify_freq=7
......
......@@ -23,6 +23,7 @@ dblist_phpmyadmin_link=y
phpmyadmin_url=/phpmyadmin
webftp_url=
client_username_web_check_disabled=n
reseller_can_use_options=n
[tools]
......
......@@ -344,10 +344,15 @@ if($reconfigure_services_answer == 'yes') {
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
swriteln('Configuring Bastille Firewall');
$inst->configure_firewall();
$inst->configure_bastille_firewall();
}
}
......@@ -429,7 +434,7 @@ if($reconfigure_services_answer == 'yes') {
}
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');
}
}
......
......@@ -491,6 +491,40 @@ class tools_monitor {
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() {
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");
......
......@@ -71,7 +71,7 @@ $wb['datepicker_prevText'] = 'Předchozí';
$wb['logout_txt'] = 'Odhlášení';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$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_results_txt'] = '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';
$wb['login_as_txt'] = 'Anmelden als';
$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['client_you_are_locked'] = 'Sie haben keine Berechtigung, Einstellungen zu verändern.';
$wb['gender_m_txt'] = 'Herr';
$wb['gender_f_txt'] = 'Frau';
?>
......@@ -32,3 +32,4 @@ getmail
ispconfig
courier
dovecot
mongodb
......@@ -86,7 +86,6 @@ $form["tabs"]['server'] = array(
'width' => '15',
'maxlength' => '255'
),
/*
'v6_prefix' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
......@@ -95,7 +94,6 @@ $form["tabs"]['server'] = array(
),
'default' => ''
),
*/
'gateway' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
......@@ -819,6 +817,17 @@ $form["tabs"]['web'] = array(
'width' => '40',
'maxlength' => '4000'
),
'php_ini_check_minutes' => array(
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
'default' => '1',
'validators' => array(0 => array('type' => 'NOTEMPTY',
'errmsg' => 'php_ini_check_minutes_error_empty'),
),
'value' => '',
'width' => '10',
'maxlength' => '255'
),
'nginx_cgi_socket' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
......@@ -1297,6 +1306,12 @@ $form["tabs"]['rescue'] = array(
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'do_not_try_rescue_mongodb' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'do_not_try_rescue_mysql' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
......
......@@ -160,6 +160,12 @@ $form["tabs"]['sites'] = array (
'default' => 'n',
'value' => array(0 => 'n',1 => 'y')
),
'reseller_can_use_options' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array(0 => 'n',1 => 'y')
),
##################################
# ENDE Datatable fields
##################################
......@@ -180,6 +186,24 @@ $form["tabs"]['mail'] = array (
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'mailbox_show_autoresponder_tab' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'y',
'value' => array(0 => 'n',1 => 'y')
),
'mailbox_show_mail_filter_tab' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'y',
'value' => array(0 => 'n',1 => 'y')
),
'mailbox_show_custom_rules_tab' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'y',
'value' => array(0 => 'n',1 => 'y')
),
'mailboxlist_webmail_link' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
......
......@@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select
$wb['action_scheduled'] = 'The action is scheduled for execution';
$wb['select_all_server'] = 'All server';
$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructions</a>';
?>
......@@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'Това действие прави ISPConfig 3 о
$wb['action_scheduled'] = 'Това действие е насрочено за изпълнение';
$wb['select_all_server'] = 'Целия сървър';
$wb['ispconfig_update_title'] = 'ISPConfig ъпдейт инструкции';
$wb['ispconfig_update_text'] = 'Логнете се като root потребител през шелла на вашият сървър използвайте командата<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />за да стартирате ISPConfig обновяване.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
$wb['ispconfig_update_text'] = 'Логнете се като root потребител през шелла на вашият сървър използвайте командата<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />за да стартирате ISPConfig обновяване.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructions</a>';
?>
......@@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'Esta ação fará uma atualização do ISPConfig3 n
$wb['action_scheduled'] = 'Esta ação está agendada para execução';
$wb['select_all_server'] = 'Todos os servidores';
$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructions</a>';
?>
......@@ -48,4 +48,3 @@ $wb['Remote Actions'] = 'Wartung';
$wb['Do OS-Update'] = 'Betriebssystem Update';
$wb['Do ISPConfig-Update'] = 'ISPConfig Update';
?>
......@@ -5,6 +5,5 @@ $wb['type_txt'] = 'Typ';
$wb['snippet_txt'] = 'Schnipsel';
$wb['active_txt'] = 'Aktiv';
$wb['directive_snippets_name_empty'] = 'Bitte geben Sie einen Namen für den Schnipsel an.';
$wb['directive_snippets_name_error_unique'] = 'Es existiert schon ein Direktiven Schnipsel mit diesem Namen.';
$wb['directive_snippets_name_error_unique'] = 'Es existiert schon ein Direktiven-Schnipsel mit diesem Namen.';
?>
......@@ -5,4 +5,3 @@ $wb['name_txt'] = 'Name des Schnipsels';
$wb['type_txt'] = 'Typ';
$wb['add_new_record_txt'] = 'Direktiven Schnipsel hinzufügen';
?>
......@@ -9,4 +9,3 @@ $wb['firewall_error_unique'] = 'Es gibt bereits einen Firewalldatensatz für die
$wb['tcp_ports_error_regex'] = 'Zeichen nicht erlaubt in TCP Port Definition. Erlaubte Zeichen sind Nummern, : und ,.';
$wb['udp_ports_error_regex'] = 'Zeichen nicht erlaubt in UDP Port Definition. Erlaubte Zeichen sind Nummern, : und ,.';
?>
......@@ -6,4 +6,3 @@ $wb['tcp_port_txt'] = 'Offene TCP Ports';
$wb['udp_port_txt'] = 'Offene UDP Ports';
$wb['add_new_record_txt'] = 'Firewalleintrag hinzufügen';
?>
......@@ -3,4 +3,3 @@ $wb['description_txt'] = 'Beschreibung';
$wb['name_txt'] = 'Gruppe';
$wb['name_err'] = 'Der Gruppenname muss min. 1, max. 30 Zeichen lang sein.';
?>
......@@ -5,4 +5,3 @@ $wb['name_txt'] = 'Gruppe';
$wb['add_new_record_txt'] = 'Neue Gruppe hinzufügen';
$wb['warning_txt'] = '<b>WARNUNG:</b> Bitte hier keine Benutzereinstellungen verändern. Benutzen Sie die Kunden- und Resellereinstellungen im Kundenmodul. Modifizieren der Benutzer oder Gruppen hier könnte zum Datenverlust führen!';
?>
......@@ -11,4 +11,3 @@ $wb['source_ip_txt'] = 'Ausgangs Adresse';
$wb['active_txt'] = 'Aktiv';
$wb['iptables_error_unique'] = 'Es besteht bereits eine Firewall Regel für diesen Server.';
?>
......@@ -13,4 +13,3 @@ $wb['source_ip_txt'] = 'Ausgangs Adresse';
$wb['active_txt'] = 'Aktiv';
$wb['iptables_error_unique'] = 'Es besteht bereits eine Firewall Regel für diesen Server.';
?>
......@@ -6,4 +6,3 @@ $wb['language_new_hint_txt'] = '2 Buchstaben ISO 639-1 Sprachcode (siehe http://
$wb['btn_save_txt'] = 'Neues Sprachdateiset erstellen';
$wb['btn_cancel_txt'] = 'Abbrechen';
?>
......@@ -5,4 +5,3 @@ $wb['language_select_txt'] = 'Sprache auswählen';
$wb['btn_save_txt'] = 'Dateien jetzt zusammenführen';
$wb['btn_cancel_txt'] = 'Abbrechen';
?>
......@@ -6,4 +6,3 @@ $wb['lang_file_txt'] = 'Sprachdatei';
$wb['btn_save_txt'] = 'Speichern';
$wb['btn_cancel_txt'] = 'Abbrechen';
?>
......@@ -4,4 +4,3 @@ $wb['language_select_txt'] = 'Sprache auswählen';
$wb['btn_save_txt'] = 'Ausgewähltes Sprachdateiset exportieren';
$wb['btn_cancel_txt'] = 'Abbrechen';
?>
......@@ -5,5 +5,5 @@ $wb['btn_save_txt'] = 'Ausgewählte Sprache importieren';
$wb['language_overwrite_txt'] = 'Datei überschreiben, falls diese schon existiert.';
$wb['btn_cancel_txt'] = 'Abbrechen';
$wb['ignore_version_txt'] = 'ISPConfig Versionsüberprüfung überspringen';
$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.';
?>
......@@ -5,4 +5,3 @@ $wb['module_txt'] = 'Modul';
$wb['lang_file_txt'] = 'Sprachdatei';
$wb['lang_file_date_txt'] = 'Letzte Änderung';
?>
......@@ -9,4 +9,3 @@ $wb['firewall_error_unique'] = 'Es gibt bereits einen Firewalleintrag für diese
$wb['tcp_ports_error_regex'] = 'Es sind nur Zahlen in der TCP Port Definition erlaubt. ';
$wb['udp_ports_error_regex'] = 'Es sind nur Zahlen in der UDP Port Definition erlaubt., ';
?>
......@@ -5,4 +5,3 @@ $wb['repo_username_txt'] = 'Benutzername (optional)';
$wb['repo_password_txt'] = 'Passwort (optional)';
$wb['active_txt'] = 'Aktiv';
?>
......@@ -10,4 +10,3 @@ $wb['select_all_server'] = 'Alle Server';
$wb['ispconfig_update_title'] = 'ISPConfig 3 Update Anweisungen';
$wb['ispconfig_update_text'] = 'Melden Sie sich auf Ihrem Server als root an und führen Sie folgendes Kommando auf der Shell aus<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />um das ISPConfig Update zu starten.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Klicken Sie hier um eine detailierte Beschreibung zu erhalten</a>';
?>
......@@ -45,4 +45,3 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen';
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
?>
......@@ -5,4 +5,3 @@ $wb['add_new_record_txt'] = 'Neuen Benutzer hinzufügen';
$wb['parent_remote_userid_txt'] = 'Benutzer ID';
$wb['username_txt'] = 'Benutzername';
?>
......@@ -13,4 +13,3 @@ $wb['- None -'] = '- Nichts ausgewählt -';
$wb['proxy_server_txt'] = 'Proxy Server';
$wb['firewall_server_txt'] = 'Firewall Server';
?>
......@@ -148,6 +148,7 @@ $wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM Socket Verzeichnis ist leer.';
$wb['fastcgi_config_syntax_txt'] = 'FastCGI Konfigurations Syntax';
$wb['try_rescue_txt'] = 'Aktiviere Service Monitoring und Neustart bei Unerreichbarkeit';
$wb['do_not_try_rescue_httpd_txt'] = 'Deaktiviere HTTPD Monitoring';
$wb['do_not_try_rescue_mongodb_txt'] = 'Deaktiviere MongoDB Monitoring';
$wb['do_not_try_rescue_mysql_txt'] = 'Deaktiviere MySQL Monitoring';
$wb['do_not_try_rescue_mail_txt'] = 'Deaktiviere E-Mail Monitoring';
$wb['rescue_description_txt'] = '<b>Information:</b> Falls Sie MySQL stoppen möchten, wählen Sie die Funktion \'Deaktiviere MySQL Monitoring\' und warten Sie 2 bis 3 Minuten. Wenn Sie nicht 2 bis 3 Miunten warten wird ISPConfig versuchen MySQL wieder zu starten.';
......@@ -191,4 +192,3 @@ $wb['munin_password_txt'] = 'Munin Passwort';
$wb['munin_url_error_regex'] = 'Ungültige Munin URL';
$wb['munin_url_note_txt'] = 'Platzhalter:';
?>
......@@ -2,4 +2,3 @@
$wb['list_head_txt'] = 'Serverkonfiguration';
$wb['server_name_txt'] = 'Server';
?>