Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISPConfig
ISPConfig 3
Commits
5fa7b215
Commit
5fa7b215
authored
Jun 16, 2017
by
Marius Burkard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- fallback to ww. on letsencrypt path
- typo
parent
0579c7a5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
interface/web/sites/ajax_get_json.php
interface/web/sites/ajax_get_json.php
+1
-1
server/plugins-available/apache2_plugin.inc.php
server/plugins-available/apache2_plugin.inc.php
+5
-0
server/plugins-available/nginx_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php
+4
-0
No files found.
interface/web/sites/ajax_get_json.php
View file @
5fa7b215
...
...
@@ -50,7 +50,7 @@ if($type == 'getservertype'){
$web_config
=
$app
->
getconf
->
get_server_config
(
$server_id
,
'web'
);
if
(
!
empty
(
$web_config
[
'server_type'
]))
$server_type
=
$web_config
[
'server_type'
];
$json
.
=
$server_type
;
unset
(
$webconfig
);
unset
(
$web
_
config
);
$json
.
=
'"}'
;
}
...
...
server/plugins-available/apache2_plugin.inc.php
View file @
5fa7b215
...
...
@@ -1254,6 +1254,11 @@ class apache2_plugin {
$crt_tmp_file
=
"/etc/letsencrypt/live/"
.
$domain
.
"/cert.pem"
;
$key_tmp_file
=
"/etc/letsencrypt/live/"
.
$domain
.
"/privkey.pem"
;
$bundle_tmp_file
=
"/etc/letsencrypt/live/"
.
$domain
.
"/chain.pem"
;
if
(
!
is_dir
(
"/etc/letsencrypt/live/"
.
$domain
))
{
$crt_tmp_file
=
"/etc/letsencrypt/live/www."
.
$domain
.
"/fullchain.pem"
;
$key_tmp_file
=
"/etc/letsencrypt/live/www."
.
$domain
.
"/privkey.pem"
;
$bundle_tmp_file
=
"/etc/letsencrypt/live/www."
.
$domain
.
"/chain.pem"
;
}
$webroot
=
$data
[
'new'
][
'document_root'
]
.
"/web"
;
//* check if we have already a Let's Encrypt cert
...
...
server/plugins-available/nginx_plugin.inc.php
View file @
5fa7b215
...
...
@@ -1328,6 +1328,10 @@ class nginx_plugin {
//* TODO: check dns entry is correct
$crt_tmp_file
=
"/etc/letsencrypt/live/"
.
$domain
.
"/fullchain.pem"
;
$key_tmp_file
=
"/etc/letsencrypt/live/"
.
$domain
.
"/privkey.pem"
;
if
(
!
is_dir
(
"/etc/letsencrypt/live/"
.
$domain
))
{
$crt_tmp_file
=
"/etc/letsencrypt/live/www."
.
$domain
.
"/fullchain.pem"
;
$key_tmp_file
=
"/etc/letsencrypt/live/www."
.
$domain
.
"/privkey.pem"
;
}
$webroot
=
$data
[
'new'
][
'document_root'
]
.
"/web"
;
//* check if we have already a Let's Encrypt 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