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
Packages & Registries
Packages & Registries
Container Registry
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
Game Over!
ISPConfig 3
Commits
b69bf518
Commit
b69bf518
authored
Oct 28, 2016
by
Marius Burkard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- create missing bundle file for apache (thanks to MR !479 by
@Niklas
)
parent
d0726f0e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
server/plugins-available/apache2_plugin.inc.php
server/plugins-available/apache2_plugin.inc.php
+5
-1
No files found.
server/plugins-available/apache2_plugin.inc.php
View file @
b69bf518
...
...
@@ -272,6 +272,7 @@ class apache2_plugin {
$key_file2
=
$ssl_dir
.
'/'
.
$domain
.
'.key.org'
;
$csr_file
=
$ssl_dir
.
'/'
.
$domain
.
'.csr'
;
$crt_file
=
$ssl_dir
.
'/'
.
$domain
.
'.crt'
;
$bundle_file
=
$ssl_dir
.
'/'
.
$domain
.
'.bundle'
;
//* Create a SSL Certificate, but only if this is not a mirror server.
if
(
$data
[
'new'
][
'ssl_action'
]
==
'create'
&&
$conf
[
'mirror_server_id'
]
==
0
)
{
...
...
@@ -416,7 +417,10 @@ class apache2_plugin {
if
(
version_compare
(
$app
->
system
->
getapacheversion
(
true
),
'2.4.8'
,
'>='
))
{
$tmp_data
=
''
;
if
(
trim
(
$data
[
"new"
][
"ssl_cert"
])
!=
''
)
$tmp_data
.
=
$data
[
"new"
][
"ssl_cert"
]
.
"
\n
"
;
if
(
trim
(
$data
[
"new"
][
"ssl_bundle"
])
!=
''
)
$tmp_data
.
=
$data
[
"new"
][
"ssl_bundle"
];
if
(
trim
(
$data
[
"new"
][
"ssl_bundle"
])
!=
''
)
{
$tmp_data
.
=
$data
[
"new"
][
"ssl_bundle"
];
$app
->
system
->
file_put_contents
(
$bundle_file
,
$data
[
"new"
][
"ssl_bundle"
]);
}
if
(
trim
(
$tmp_data
)
!=
''
)
$app
->
system
->
file_put_contents
(
$crt_file
,
$tmp_data
);
}
else
{
if
(
trim
(
$data
[
"new"
][
"ssl_cert"
])
!=
''
)
$app
->
system
->
file_put_contents
(
$crt_file
,
$data
[
"new"
][
"ssl_cert"
]);
...
...
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