Commit f055f5e9 authored by Florian Schaal's avatar Florian Schaal

Revert "show active for additional php-versions (#5090)"

This reverts commit c97bed44.
parent ef5c6457
......@@ -53,14 +53,6 @@ class installer_dist extends installer_base {
$cf = $conf['postfix'];
$config_dir = $cf['config_dir'];
exec('postconf mail_version', $ret);
$postfix_version=str_replace('mail_version = ', '', $ret[0]);
unset($ret);
exec('openssl version', $ret);
$openssl_version=$ret[0];
unset($ret);
$use_pfs=@(version_compare($openssl_version, 'OpenSSL 0.9', '>=') && version_compare($postfix_version, '2.6', '>='))?true:false;
if(!is_dir($config_dir)){
$this->error("The postfix configuration directory '$config_dir' does not exist.");
}
......@@ -171,19 +163,6 @@ class installer_dist extends installer_base {
'{greylisting}' => $greylisting,
'{reject_slm}' => $reject_sender_login_mismatch,
);
//* If PFS is possible, configure it
if($use_pfs && !file_exists($config_dir.'/dh_512.pem')) exec('openssl gendh -out '.$config_dir.'/dh_512.pem -2 512');
if($use_pfs && !file_exists($config_dir.'/dh_2048.pem')) exec('openssl gendh -out '.$config_dir.'/dh_2048.pem -2 2048');
if($use_pfs && file_exists($config_dir.'/dh_512.pem') && file_exists($config_dir.'/dh_2048.pem')) {
$postconf_placeholders = array_merge($postconf_placeholders, array(
'{smtpd_tls_dh512_param_file}' => $config_dir.'/dh_512.pem',
'{smtpd_tls_dh1024_param_file}' => $config_dir.'/dh_2048.pem' ));
} else {
$postconf_placeholders = array_merge($postconf_placeholders, array(
'{smtpd_tls_dh512_param_file}' => '',
'{smtpd_tls_dh1024_param_file}' => ''));
}
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_postfix.conf.master', 'tpl/fedora_postfix.conf.master');
$postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
......
......@@ -54,14 +54,6 @@ class installer extends installer_base
$cf = $conf['postfix'];
$config_dir = $cf['config_dir'];
exec('postconf mail_version', $ret);
$postfix_version=str_replace('mail_version = ', '', $ret[0]);
unset($ret);
exec('openssl version', $ret);
$openssl_version=$ret[0];
unset($ret);
$use_pfs=@(version_compare($openssl_version, 'OpenSSL 0.9', '>=') && version_compare($postfix_version, '2.6', '>='))?true:false;
if(!is_dir($config_dir)){
$this->error("The postfix configuration directory '$config_dir' does not exist.");
}
......@@ -124,19 +116,6 @@ class installer extends installer_base
'{reject_slm}' => $reject_sender_login_mismatch,
);
//* If PFS is possible, configure it
if($use_pfs && !file_exists($config_dir.'/dh_512.pem')) exec('openssl gendh -out '.$config_dir.'/dh_512.pem -2 512');
if($use_pfs && !file_exists($config_dir.'/dh_2048.pem')) exec('openssl gendh -out '.$config_dir.'/dh_2048.pem -2 2048');
if($use_pfs && file_exists($config_dir.'/dh_512.pem') && file_exists($config_dir.'/dh_2048.pem')) {
$postconf_placeholders = array_merge($postconf_placeholders, array(
'{smtpd_tls_dh512_param_file}' => $config_dir.'/dh_512.pem',
'{smtpd_tls_dh1024_param_file}' => $config_dir.'/dh_2048.pem' ));
} else {
$postconf_placeholders = array_merge($postconf_placeholders, array(
'{smtpd_tls_dh512_param_file}' => '',
'{smtpd_tls_dh1024_param_file}' => ''));
}
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/gentoo_postfix.conf.master', 'tpl/gentoo_postfix.conf.master');
$postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
$postconf_commands = array_filter(explode("\n", $postconf_tpl)); // read and remove empty lines
......
......@@ -53,14 +53,6 @@ class installer_dist extends installer_base {
$cf = $conf['postfix'];
$config_dir = $cf['config_dir'];
exec('postconf mail_version', $ret);
$postfix_version=str_replace('mail_version = ', '', $ret[0]);
unset($ret);
exec('openssl version', $ret);
$openssl_version=$ret[0];
unset($ret);
$use_pfs=@(version_compare($openssl_version, 'OpenSSL 0.9', '>=') && version_compare($postfix_version, '2.6', '>='))?true:false;
if(!is_dir($config_dir)){
$this->error("The postfix configuration directory '$config_dir' does not exist.");
}
......@@ -182,19 +174,6 @@ class installer_dist extends installer_base {
'{greylisting}' => $greylisting,
'{reject_slm}' => $reject_sender_login_mismatch,
);
//* If PFS is possible, configure it
if($use_pfs && !file_exists($config_dir.'/dh_512.pem')) exec('openssl gendh -out '.$config_dir.'/dh_512.pem -2 512');
if($use_pfs && !file_exists($config_dir.'/dh_2048.pem')) exec('openssl gendh -out '.$config_dir.'/dh_2048.pem -2 2048');
if($use_pfs && file_exists($config_dir.'/dh_512.pem') && file_exists($config_dir.'/dh_2048.pem')) {
$postconf_placeholders = array_merge($postconf_placeholders, array(
'{smtpd_tls_dh512_param_file}' => $config_dir.'/dh_512.pem',
'{smtpd_tls_dh1024_param_file}' => $config_dir.'/dh_2048.pem' ));
} else {
$postconf_placeholders = array_merge($postconf_placeholders, array(
'{smtpd_tls_dh512_param_file}' => '',
'{smtpd_tls_dh1024_param_file}' => ''));
}
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/opensuse_postfix.conf.master', 'tpl/opensuse_postfix.conf.master');
$postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
......
......@@ -44,9 +44,3 @@ smtpd_tls_protocols = !SSLv2,!SSLv3
smtp_tls_protocols = !SSLv2,!SSLv3
smtpd_tls_exclude_ciphers = RC4, aNULL
smtp_tls_exclude_ciphers = RC4, aNULL
smtpd_tls_dh512_param_file = {smtpd_tls_dh512_param_file}
smtpd_tls_dh1024_param_file = {smtpd_tls_dh1024_param_file}
smtpd_tls_eecdh_grade = strong
tls_preempt_cipherlist = yes
smtp_tls_loglevel = 1
smtpd_tls_loglevel = 1
......@@ -40,9 +40,3 @@ smtpd_tls_protocols = !SSLv2,!SSLv3
smtp_tls_protocols = !SSLv2,!SSLv3
smtpd_tls_exclude_ciphers = RC4, aNULL
smtp_tls_exclude_ciphers = RC4, aNULL
smtpd_tls_dh512_param_file = {smtpd_tls_dh512_param_file}
smtpd_tls_dh1024_param_file = {smtpd_tls_dh1024_param_file}
smtpd_tls_eecdh_grade = strong
tls_preempt_cipherlist = yes
smtp_tls_loglevel = 1
smtpd_tls_loglevel = 1
......@@ -39,9 +39,3 @@ smtpd_tls_protocols = !SSLv2,!SSLv3
smtp_tls_protocols = !SSLv2,!SSLv3
smtpd_tls_exclude_ciphers = RC4, aNULL
smtp_tls_exclude_ciphers = RC4, aNULL
smtpd_tls_dh512_param_file = {smtpd_tls_dh512_param_file}
smtpd_tls_dh1024_param_file = {smtpd_tls_dh1024_param_file}
smtpd_tls_eecdh_grade = strong
tls_preempt_cipherlist = yes
smtp_tls_loglevel = 1
smtpd_tls_loglevel = 1
......@@ -42,9 +42,3 @@ smtpd_tls_protocols = !SSLv2,!SSLv3
smtp_tls_protocols = !SSLv2,!SSLv3
smtpd_tls_exclude_ciphers = RC4, aNULL
smtp_tls_exclude_ciphers = RC4, aNULL
smtpd_tls_dh512_param_file = {smtpd_tls_dh512_param_file}
smtpd_tls_dh1024_param_file = {smtpd_tls_dh1024_param_file}
smtpd_tls_eecdh_grade = strong
tls_preempt_cipherlist = yes
smtp_tls_loglevel = 1
smtpd_tls_loglevel = 1
......@@ -102,7 +102,7 @@ php_fpm_ini_path=/etc/php5/fpm/php.ini
php_fpm_pool_dir=/etc/php5/fpm/pool.d
php_fpm_start_port=9010
php_fpm_socket_dir=/var/lib/php5-fpm
php_default_name=default
php_default_name=Default
set_folder_permissions_on_update=n
add_web_users_to_sshusers_group=y
connect_userid_to_webid=n
......
......@@ -4,5 +4,4 @@ $wb['server_id_txt'] = 'Server';
$wb['add_new_record_txt'] = 'Neue PHP Version hinzufügen';
$wb['client_id_txt'] = 'Kunde';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Aktiv';
?>
......@@ -4,5 +4,4 @@ $wb['server_id_txt'] = 'Server';
$wb['add_new_record_txt'] = 'Add new PHP version';
$wb['client_id_txt'] = 'Client';
$wb['name_txt'] = 'PHP Name';
$wb['active_txt'] = 'Active';
?>
......@@ -44,15 +44,6 @@ $liste['auth'] = 'no';
* Suchfelder
*****************************************************/
$liste['item'][] = array( 'field' => 'active',
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'op' => '=',
'prefix' => '',
'suffix' => '',
'width' => '',
'value' => array('y' => $app->lng('yes_txt'), 'n' => $app->lng('no_txt')));
$liste['item'][] = array( 'field' => 'server_id',
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
......
......@@ -15,14 +15,12 @@
<table class="table">
<thead class="dark form-group-sm">
<tr>
<th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
<th data-column="server_id"><tmpl_var name="server_id_txt"></th>
<th class="small-col" data-column="client_id"><tmpl_var name="client_id_txt"></th>
<th data-column="name"><tmpl_var name="name_txt"></th>
<th class="text-right">{tmpl_var name='search_limit'}</th>
</tr>
<tr>
<td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
<td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
<td><select class="form-control" name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
<td><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
......@@ -34,7 +32,6 @@
<tbody>
<tmpl_loop name="records">
<tr>
<td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
<td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
<td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="client_id"}</a></td>
<td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
......@@ -57,4 +54,4 @@
</table>
</div>
\ No newline at end of file
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