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
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
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
lolo888
ISPConfig 3
Commits
b31bb1f2
Commit
b31bb1f2
authored
Sep 26, 2011
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed: FS#1619 - Add apache SNI / SAN support for SSL.
parent
ba3e3e48
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
interface/web/sites/lib/lang/en_web_domain.lng
interface/web/sites/lib/lang/en_web_domain.lng
+1
-0
interface/web/sites/web_domain_edit.php
interface/web/sites/web_domain_edit.php
+12
-4
No files found.
interface/web/sites/lib/lang/en_web_domain.lng
View file @
b31bb1f2
...
...
@@ -78,4 +78,5 @@ $wb["seo_redirect_txt"] = 'SEO Redirect';
$wb
[
"non_www_to_www_txt"
]
=
'Non-www -> www'
;
$wb
[
"www_to_non_www_txt"
]
=
'www -> non-www'
;
$wb
[
"php_fpm_use_socket_txt"
]
=
'Use Socket For PHP-FPM'
;
$wb
[
"error_no_sni_txt"
]
=
'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.'
;
?>
\ No newline at end of file
interface/web/sites/web_domain_edit.php
View file @
b31bb1f2
...
...
@@ -397,10 +397,9 @@ class page_action extends tform_actions {
unset
(
$tmp
);
// When the record is inserted
}
else
{
//
set the server ID to the default mail
server of the client
//
* set the server ID to the default web
server of the client
$this
->
dataRecord
[
"server_id"
]
=
$client
[
"default_webserver"
];
// Check if the user may add another web_domain
if
(
$client
[
"limit_web_domain"
]
>=
0
)
{
$tmp
=
$app
->
db
->
queryOneRecord
(
"SELECT count(domain_id) as number FROM web_domain WHERE sys_groupid =
$client_group_id
and type = 'vhost'"
);
...
...
@@ -410,7 +409,6 @@ class page_action extends tform_actions {
}
}
// Clients may not set the client_group_id, so we unset them if user is not a admin and the client is not a reseller
if
(
!
$app
->
auth
->
has_clients
(
$_SESSION
[
's'
][
'user'
][
'userid'
]))
unset
(
$this
->
dataRecord
[
"client_group_id"
]);
...
...
@@ -418,7 +416,17 @@ class page_action extends tform_actions {
//* make sure that the email domain is lowercase
if
(
isset
(
$this
->
dataRecord
[
"domain"
]))
$this
->
dataRecord
[
"domain"
]
=
strtolower
(
$this
->
dataRecord
[
"domain"
]);
//* get the server config for this server
$app
->
uses
(
"getconf"
);
$web_config
=
$app
->
getconf
->
get_server_config
(
intval
(
$this
->
dataRecord
[
"server_id"
]),
'web'
);
//* Check for duplicate ssl certs per IP if SNI is disabled
if
(
isset
(
$this
->
dataRecord
[
'ssl'
])
&&
$this
->
dataRecord
[
'ssl'
]
==
'y'
&&
$web_config
[
'enable_sni'
]
!=
'y'
)
{
$sql
=
"SELECT count(domain_id) as number FROM web_domain WHERE `ssl` = 'y' AND ip_address = '"
.
$app
->
db
->
quote
(
$this
->
dataRecord
[
'ip_address'
])
.
"' and domain_id != "
.
$this
->
id
;
$tmp
=
$app
->
db
->
queryOneRecord
(
$sql
);
if
(
$tmp
[
'number'
]
>
0
)
$app
->
tform
->
errorMessage
.
=
$app
->
tform
->
lng
(
"error_no_sni_txt"
);
}
parent
::
onSubmit
();
}
...
...
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