Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1,574
Issues
1,574
List
Boards
Labels
Milestones
Merge Requests
31
Merge Requests
31
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISPConfig
ISPConfig 3
Commits
c31703b8
Commit
c31703b8
authored
Jul 05, 2019
by
Till Brehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implements #5007 Remove SSL bundle files if present on an apache 2.4 server
parent
b7ee5f0e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
server/conf/vhost.conf.master
server/conf/vhost.conf.master
+4
-4
server/plugins-available/apache2_plugin.inc.php
server/plugins-available/apache2_plugin.inc.php
+3
-2
No files found.
server/conf/vhost.conf.master
View file @
c31703b8
...
...
@@ -75,15 +75,15 @@
# </IfModule>
SSLCertificateFile <tmpl_var name='ssl_crt_file'>
SSLCertificateKeyFile <tmpl_var name='ssl_key_file'>
<tmpl_if name='has_bundle_cert'>
<tmpl_if name='apache_version' op='<' value='2.4.8' format='version'>
SSLCertificateChainFile <tmpl_var name='ssl_bundle_file'>
</tmpl_if>
<tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
SSLUseStapling on
SSLStaplingResponderTimeout 5
SSLStaplingReturnResponderErrors off
</tmpl_if>
<tmpl_if name='has_bundle_cert'>
<tmpl_if name='apache_version' op='<' value='2.4.8' format='version'>
SSLCertificateChainFile <tmpl_var name='ssl_bundle_file'>
</tmpl_if>
</tmpl_if>
</tmpl_if>
</IfModule>
...
...
server/plugins-available/apache2_plugin.inc.php
View file @
c31703b8
...
...
@@ -1223,8 +1223,9 @@ class apache2_plugin {
$app
->
dbmaster
->
query
(
"UPDATE web_domain SET `ssl` = ?, `ssl_letsencrypt` = ? WHERE `domain` = ? AND `server_id` = ?"
,
$data
[
'new'
][
'ssl'
],
'n'
,
$data
[
'new'
][
'domain'
],
$conf
[
'server_id'
]);
}
}
if
(
@
is_file
(
$bundle_file
))
$vhost_data
[
'has_bundle_cert'
]
=
1
;
// Use separate bundle file only for apache versions < 2.4.8
if
(
@
is_file
(
$bundle_file
)
&&
version_compare
(
$app
->
system
->
getapacheversion
(
true
),
'2.4.8'
,
'<'
))
$vhost_data
[
'has_bundle_cert'
]
=
1
;
// HTTP/2.0 ?
$vhost_data
[
'enable_http2'
]
=
'n'
;
...
...
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