Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
492
Issues
492
List
Boards
Labels
Service Desk
Milestones
Merge Requests
32
Merge Requests
32
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISPConfig
ISPConfig 3
Commits
8f6e62fe
Commit
8f6e62fe
authored
Feb 23, 2018
by
Marius Burkard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
parents
386c93a7
cee6f9f9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
15 deletions
+30
-15
install/dist/lib/debian60.lib.php
install/dist/lib/debian60.lib.php
+4
-1
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+7
-0
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+4
-1
install/tpl/system.ini.master
install/tpl/system.ini.master
+2
-0
interface/web/admin/form/system_config.tform.php
interface/web/admin/form/system_config.tform.php
+2
-2
server/conf/vhost.conf.master
server/conf/vhost.conf.master
+11
-11
No files found.
install/dist/lib/debian60.lib.php
View file @
8f6e62fe
...
...
@@ -111,7 +111,10 @@ class installer extends installer_base {
}
if
(
version_compare
(
$dovecot_version
,
2.2
)
>=
0
)
{
// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
replaceLine
(
$config_dir
.
'/'
.
$configfile
,
'ssl_protocols = !SSLv2 !SSLv3'
,
'ssl_protocols = !SSLv3'
,
1
,
0
);
$content
=
file_get_contents
(
$config_dir
.
'/'
.
$configfile
);
$content
=
str_replace
(
'!SSLv2'
,
''
,
$content
);
file_put_contents
(
$config_dir
.
'/'
.
$configfile
,
$content
);
unset
(
$content
);
}
}
else
{
if
(
is_file
(
$conf
[
'ispconfig_install_dir'
]
.
'/server/conf-custom/install/debian6_dovecot.conf.master'
))
{
...
...
install/dist/lib/fedora.lib.php
View file @
8f6e62fe
...
...
@@ -443,6 +443,13 @@ class installer_dist extends installer_base {
if
(
version_compare
(
$dovecot_version
,
2.1
)
<
0
)
{
removeLine
(
$config_dir
.
'/'
.
$configfile
,
'ssl_protocols ='
);
}
if
(
version_compare
(
$dovecot_version
,
2.2
)
>=
0
)
{
// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
$content
=
file_get_contents
(
$config_dir
.
'/'
.
$configfile
);
$content
=
str_replace
(
'!SSLv2'
,
''
,
$content
);
file_put_contents
(
$config_dir
.
'/'
.
$configfile
,
$content
);
unset
(
$content
);
}
replaceLine
(
$config_dir
.
'/'
.
$configfile
,
'postmaster_address = postmaster@example.com'
,
'postmaster_address = postmaster@'
.
$conf
[
'hostname'
],
1
,
0
);
replaceLine
(
$config_dir
.
'/'
.
$configfile
,
'postmaster_address = webmaster@localhost'
,
'postmaster_address = postmaster@'
.
$conf
[
'hostname'
],
1
,
0
);
}
else
{
...
...
install/lib/installer_base.lib.php
View file @
8f6e62fe
...
...
@@ -1292,7 +1292,10 @@ class installer_base {
}
if
(
version_compare
(
$dovecot_version
,
2.2
)
>=
0
)
{
// Dovecot > 2.2 does not recognize !SSLv2 anymore on Debian 9
replaceLine
(
$config_dir
.
'/'
.
$configfile
,
'ssl_protocols = !SSLv2 !SSLv3'
,
'ssl_protocols = !SSLv3'
,
1
,
0
);
$content
=
file_get_contents
(
$config_dir
.
'/'
.
$configfile
);
$content
=
str_replace
(
'!SSLv2'
,
''
,
$content
);
file_put_contents
(
$config_dir
.
'/'
.
$configfile
,
$content
);
unset
(
$content
);
}
}
...
...
install/tpl/system.ini.master
View file @
8f6e62fe
...
...
@@ -14,6 +14,8 @@ mailbox_show_custom_rules_tab=y
mailboxlist_webmail_link=y
webmail_url=/webmail
dkim_path=/var/lib/amavis/dkim
smtp_enabled=y
smtp_host=localhost
[monitor]
...
...
interface/web/admin/form/system_config.tform.php
View file @
8f6e62fe
...
...
@@ -311,7 +311,7 @@ $form["tabs"]['mail'] = array (
'smtp_enabled'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'CHECKBOX'
,
'default'
=>
'
n
'
,
'default'
=>
'
y
'
,
'value'
=>
array
(
0
=>
'n'
,
1
=>
'y'
)
),
'smtp_host'
=>
array
(
...
...
@@ -328,7 +328,7 @@ $form["tabs"]['mail'] = array (
'type'
=>
'STRIPNL'
)
),
'formtype'
=>
'TEXT'
,
'default'
=>
''
,
'default'
=>
'
localhost
'
,
'value'
=>
''
,
'width'
=>
'30'
,
'maxlength'
=>
'255'
...
...
server/conf/vhost.conf.master
View file @
8f6e62fe
...
...
@@ -252,16 +252,16 @@
</tmpl_if>
<tmpl_if name='php' op='==' value='cgi'>
# php as cgi enabled
ScriptAlias /php
5
-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
Action php
5-cgi /php5
-cgi
ScriptAlias /php-cgi <tmpl_var name='cgi_starter_path'><tmpl_var name='cgi_starter_script'>
Action php
-cgi /php
-cgi
<Directory {tmpl_var name='web_document_root_www'}>
<FilesMatch "\.php[345]?$">
SetHandler php
5
-cgi
SetHandler php-cgi
</FilesMatch>
</Directory>
<Directory {tmpl_var name='web_document_root'}>
<FilesMatch "\.php[345]?$">
SetHandler php
5
-cgi
SetHandler php-cgi
</FilesMatch>
</Directory>
<Directory {tmpl_var name='cgi_starter_path'}>
...
...
@@ -346,21 +346,21 @@
</Directory>
<Directory {tmpl_var name='web_document_root_www'}>
<FilesMatch "\.php[345]?$">
SetHandler php
5
-fcgi
SetHandler php-fcgi
</FilesMatch>
</Directory>
<Directory {tmpl_var name='web_document_root'}>
<FilesMatch "\.php[345]?$">
SetHandler php
5
-fcgi
SetHandler php-fcgi
</FilesMatch>
</Directory>
Action php
5-fcgi /php5
-fcgi virtual
Alias /php
5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5
-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
Action php
-fcgi /php
-fcgi virtual
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'}
<tmpl_if name='use_tcp'>
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php
5
-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
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
</tmpl_if>
<tmpl_if name='use_socket'>
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php
5
-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
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
</tmpl_if>
</IfModule>
<IfModule mod_proxy_fcgi.c>
...
...
@@ -468,7 +468,7 @@
</tmpl_if>
<tmpl_if name="rewrite_is_url" op="==" value="n">
RewriteCond %{REQUEST_URI} !^/webdav/
RewriteCond %{REQUEST_URI} !^/php
5
-fcgi/
RewriteCond %{REQUEST_URI} !^/php-fcgi/
RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
</tmpl_if>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment