Skip to content

Commit 8f6e62f

Browse files
author
Marius Burkard
committed
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
2 parents 386c93a + cee6f9f commit 8f6e62f

File tree

6 files changed

+30
-15
lines changed

6 files changed

+30
-15
lines changed

‎install/dist/lib/debian60.lib.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,10 @@ public function configure_dovecot()
111111
}
112112
if(version_compare($dovecot_version,2.2) >= 0) {
113113
// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
114-
replaceLine($config_dir.'/'.$configfile, 'ssl_protocols = !SSLv2 !SSLv3', 'ssl_protocols = !SSLv3', 1, 0);
114+
$content = file_get_contents($config_dir.'/'.$configfile);
115+
$content = str_replace('!SSLv2','',$content);
116+
file_put_contents($config_dir.'/'.$configfile,$content);
117+
unset($content);
115118
}
116119
} else {
117120
if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian6_dovecot.conf.master')) {

‎install/dist/lib/fedora.lib.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,13 @@ public function configure_dovecot()
443443
if(version_compare($dovecot_version,2.1) < 0) {
444444
removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');
445445
}
446+
if(version_compare($dovecot_version,2.2) >= 0) {
447+
// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
448+
$content = file_get_contents($config_dir.'/'.$configfile);
449+
$content = str_replace('!SSLv2','',$content);
450+
file_put_contents($config_dir.'/'.$configfile,$content);
451+
unset($content);
452+
}
446453
replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
447454
replaceLine($config_dir.'/'.$configfile, 'postmaster_address = webmaster@localhost', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
448455
} else {

‎install/lib/installer_base.lib.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1292,7 +1292,10 @@ public function configure_dovecot() {
12921292
}
12931293
if(version_compare($dovecot_version,2.2) >= 0) {
12941294
// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
1295-
replaceLine($config_dir.'/'.$configfile, 'ssl_protocols = !SSLv2 !SSLv3', 'ssl_protocols = !SSLv3', 1, 0);
1295+
$content = file_get_contents($config_dir.'/'.$configfile);
1296+
$content = str_replace('!SSLv2','',$content);
1297+
file_put_contents($config_dir.'/'.$configfile,$content);
1298+
unset($content);
12961299
}
12971300
}
12981301

‎install/tpl/system.ini.master‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ mailbox_show_custom_rules_tab=y
1414
mailboxlist_webmail_link=y
1515
webmail_url=/webmail
1616
dkim_path=/var/lib/amavis/dkim
17+
smtp_enabled=y
18+
smtp_host=localhost
1719

1820
[monitor]
1921

‎interface/web/admin/form/system_config.tform.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
311311
'smtp_enabled' => array (
312312
'datatype' => 'VARCHAR',
313313
'formtype' => 'CHECKBOX',
314-
'default' => 'n',
314+
'default' => 'y',
315315
'value' => array(0 => 'n', 1 => 'y')
316316
),
317317
'smtp_host' => array (
@@ -328,7 +328,7 @@
328328
'type' => 'STRIPNL')
329329
),
330330
'formtype' => 'TEXT',
331-
'default' => '',
331+
'default' => 'localhost',
332332
'value' => '',
333333
'width' => '30',
334334
'maxlength' => '255'

‎server/conf/vhost.conf.master‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,16 @@
252252
</tmpl_if>
253253
<tmpl_if name='php' op='==' value='cgi'>
254254
# php as cgi enabled
255-
ScriptAlias /php5-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
256-
Action php5-cgi /php5-cgi
255+
ScriptAlias /php-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
256+
Action php-cgi /php-cgi
257257
<Directory {tmpl_var name='web_document_root_www'}>
258258
<FilesMatch "\.php[345]?$">
259-
SetHandler php5-cgi
259+
SetHandler php-cgi
260260
</FilesMatch>
261261
</Directory>
262262
<Directory {tmpl_var name='web_document_root'}>
263263
<FilesMatch "\.php[345]?$">
264-
SetHandler php5-cgi
264+
SetHandler php-cgi
265265
</FilesMatch>
266266
</Directory>
267267
<Directory {tmpl_var name='cgi_starter_path'}>
@@ -346,21 +346,21 @@
346346
</Directory>
347347
<Directory {tmpl_var name='web_document_root_www'}>
348348
<FilesMatch "\.php[345]?$">
349-
SetHandler php5-fcgi
349+
SetHandler php-fcgi
350350
</FilesMatch>
351351
</Directory>
352352
<Directory {tmpl_var name='web_document_root'}>
353353
<FilesMatch "\.php[345]?$">
354-
SetHandler php5-fcgi
354+
SetHandler php-fcgi
355355
</FilesMatch>
356356
</Directory>
357-
Action php5-fcgi /php5-fcgi virtual
358-
Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
357+
Action php-fcgi /php-fcgi virtual
358+
Alias /php-fcgi {tmpl_var name='document_root'}/cgi-bin/php-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
359359
<tmpl_if name='use_tcp'>
360-
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization -pass-header Content-Type
360+
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization -pass-header Content-Type
361361
</tmpl_if>
362362
<tmpl_if name='use_socket'>
363-
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket <tmpl_var name='fpm_socket'> -pass-header Authorization -pass-header Content-Type
363+
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket <tmpl_var name='fpm_socket'> -pass-header Authorization -pass-header Content-Type
364364
</tmpl_if>
365365
</IfModule>
366366
<IfModule mod_proxy_fcgi.c>
@@ -468,7 +468,7 @@
468468
</tmpl_if>
469469
<tmpl_if name="rewrite_is_url" op="==" value="n">
470470
RewriteCond %{REQUEST_URI} !^/webdav/
471-
RewriteCond %{REQUEST_URI} !^/php5-fcgi/
471+
RewriteCond %{REQUEST_URI} !^/php-fcgi/
472472
RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
473473
</tmpl_if>
474474

0 commit comments

Comments
 (0)