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
488
Issues
488
List
Boards
Labels
Service Desk
Milestones
Merge Requests
25
Merge Requests
25
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
0579c7a5
Commit
0579c7a5
authored
Jun 01, 2017
by
Marius Burkard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'stable-3.1' into 'stable-3.1'
option to disable pre-check for LE (#4658) See merge request !604
parents
4338a06e
c655e1a3
Changes
30
Hide whitespace changes
Inline
Side-by-side
Showing
30 changed files
with
55 additions
and
8 deletions
+55
-8
install/tpl/server.ini.master
install/tpl/server.ini.master
+1
-0
interface/web/admin/form/server_config.tform.php
interface/web/admin/form/server_config.tform.php
+9
-0
interface/web/admin/lib/lang/ar_server_config.lng
interface/web/admin/lib/lang/ar_server_config.lng
+1
-0
interface/web/admin/lib/lang/bg_server_config.lng
interface/web/admin/lib/lang/bg_server_config.lng
+1
-0
interface/web/admin/lib/lang/br_server_config.lng
interface/web/admin/lib/lang/br_server_config.lng
+1
-0
interface/web/admin/lib/lang/ca_server_config.lng
interface/web/admin/lib/lang/ca_server_config.lng
+1
-0
interface/web/admin/lib/lang/cz_server_config.lng
interface/web/admin/lib/lang/cz_server_config.lng
+1
-0
interface/web/admin/lib/lang/de_server_config.lng
interface/web/admin/lib/lang/de_server_config.lng
+1
-0
interface/web/admin/lib/lang/dk_server_config.lng
interface/web/admin/lib/lang/dk_server_config.lng
+1
-0
interface/web/admin/lib/lang/el_server_config.lng
interface/web/admin/lib/lang/el_server_config.lng
+1
-0
interface/web/admin/lib/lang/en_server_config.lng
interface/web/admin/lib/lang/en_server_config.lng
+1
-0
interface/web/admin/lib/lang/es_server_config.lng
interface/web/admin/lib/lang/es_server_config.lng
+1
-0
interface/web/admin/lib/lang/fi_server_config.lng
interface/web/admin/lib/lang/fi_server_config.lng
+1
-0
interface/web/admin/lib/lang/fr_server_config.lng
interface/web/admin/lib/lang/fr_server_config.lng
+1
-0
interface/web/admin/lib/lang/hr_server_config.lng
interface/web/admin/lib/lang/hr_server_config.lng
+1
-0
interface/web/admin/lib/lang/hu_server_config.lng
interface/web/admin/lib/lang/hu_server_config.lng
+1
-0
interface/web/admin/lib/lang/id_server_config.lng
interface/web/admin/lib/lang/id_server_config.lng
+1
-0
interface/web/admin/lib/lang/it_server_config.lng
interface/web/admin/lib/lang/it_server_config.lng
+1
-0
interface/web/admin/lib/lang/ja_server_config.lng
interface/web/admin/lib/lang/ja_server_config.lng
+1
-0
interface/web/admin/lib/lang/nl_server_config.lng
interface/web/admin/lib/lang/nl_server_config.lng
+1
-0
interface/web/admin/lib/lang/pl_server_config.lng
interface/web/admin/lib/lang/pl_server_config.lng
+1
-0
interface/web/admin/lib/lang/pt_server_config.lng
interface/web/admin/lib/lang/pt_server_config.lng
+1
-0
interface/web/admin/lib/lang/ro_server_config.lng
interface/web/admin/lib/lang/ro_server_config.lng
+1
-0
interface/web/admin/lib/lang/ru_server_config.lng
interface/web/admin/lib/lang/ru_server_config.lng
+1
-0
interface/web/admin/lib/lang/se_server_config.lng
interface/web/admin/lib/lang/se_server_config.lng
+1
-0
interface/web/admin/lib/lang/sk_server_config.lng
interface/web/admin/lib/lang/sk_server_config.lng
+1
-0
interface/web/admin/lib/lang/tr_server_config.lng
interface/web/admin/lib/lang/tr_server_config.lng
+1
-0
interface/web/admin/templates/server_config_web_edit.htm
interface/web/admin/templates/server_config_web_edit.htm
+4
-0
server/plugins-available/apache2_plugin.inc.php
server/plugins-available/apache2_plugin.inc.php
+8
-4
server/plugins-available/nginx_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php
+8
-4
No files found.
install/tpl/server.ini.master
View file @
0579c7a5
...
...
@@ -89,6 +89,7 @@ php_ini_path_cgi=/etc/php5/cgi/php.ini
check_apache_config=y
enable_sni=y
enable_spdy=n
skip_le_check=n
enable_ip_wildcard=y
overtraffic_notify_admin=y
overtraffic_notify_client=y
...
...
interface/web/admin/form/server_config.tform.php
View file @
0579c7a5
...
...
@@ -1228,6 +1228,15 @@ $form["tabs"]['web'] = array(
'width'
=>
'40'
,
'maxlength'
=>
'255'
),
'skip_le_check'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'CHECKBOX'
,
'default'
=>
'n'
,
'value'
=>
array
(
0
=>
'n'
,
1
=>
'y'
)
),
//#################################
// ENDE Datatable fields
//#################################
...
...
interface/web/admin/lib/lang/ar_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/bg_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/br_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Hora do backup'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/ca_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb
[
'disable_bind_log_txt'
]
=
'Disable bind9 messages for Loglevel WARN'
;
$wb
[
'apps_vhost_enabled_txt'
]
=
'Apps-vhost enabled'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/cz_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['hostname_txt'] = 'Název hostitele';
$wb
[
'hostname_error_empty'
]
=
'Název hostitele je prázdný'
;
$wb
[
'hostname_error_regex'
]
=
'Neplatný název hostitele.'
;
$wb
[
'backup_time_txt'
]
=
'Spustit zálohovaní v'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/de_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_http_txt'] = 'HTTP';
$wb
[
'xmpp_port_https_txt'
]
=
'HTTPS'
;
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/dk_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'disable_bind_log_txt'
]
=
'Disable bind9 messages for Loglevel WARN'
;
$wb
[
'apps_vhost_enabled_txt'
]
=
'Apps-vhost enabled'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/el_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/en_server_config.lng
View file @
0579c7a5
...
...
@@ -284,4 +284,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
"disable_bind_log_txt"
]
=
"Disable bind9 messages for Loglevel WARN"
;
$wb
[
"apps_vhost_enabled_txt"
]
=
"Apps-vhost enabled"
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/es_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_server_admins_txt'] = 'Administradores del Servidor (JIDs)';
$wb
[
'xmpp_server_txt'
]
=
'Servidor XMPP'
;
$wb
[
'xmpp_use_ipv6_txt'
]
=
'Usar IPv6'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/fi_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/fr_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb
[
'disable_bind_log_txt'
]
=
'Disable bind9 messages for Loglevel WARN'
;
$wb
[
'apps_vhost_enabled_txt'
]
=
'Apps-vhost enabled'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/hr_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/hu_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/id_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/it_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_bosh_txt'] = 'BOSH';
$wb
[
'disable_bind_log_txt'
]
=
'Disable bind9 messages for Loglevel WARN'
;
$wb
[
'apps_vhost_enabled_txt'
]
=
'Apps-vhost enabled'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/ja_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/nl_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/pl_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/pt_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/ro_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/ru_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Время копирования'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/se_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/sk_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_https_txt'] = 'HTTPS';
$wb
[
'xmpp_port_pastebin_txt'
]
=
'Pastebin'
;
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'backup_time_txt'
]
=
'Backup time'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/lib/lang/tr_server_config.lng
View file @
0579c7a5
...
...
@@ -281,4 +281,5 @@ $wb['xmpp_port_pastebin_txt'] = 'Pastebin';
$wb
[
'xmpp_port_bosh_txt'
]
=
'BOSH'
;
$wb
[
'disable_bind_log_txt'
]
=
'Disable bind9 messages for Loglevel WARN'
;
$wb
[
'apps_vhost_enabled_txt'
]
=
'Apps-vhost enabled'
;
$wb
[
'skip_le_check_txt'
]
=
'Skip Lets Encrypt Check'
;
?>
interface/web/admin/templates/server_config_web_edit.htm
View file @
0579c7a5
...
...
@@ -183,6 +183,10 @@
<div
class=
"form-group"
>
<label
for=
"CA_pass"
class=
"col-sm-3 control-label"
>
{tmpl_var name='CA_pass_txt'}
</label>
<div
class=
"col-sm-9"
><input
type=
"password"
name=
"CA_pass"
id=
"CA_pass"
value=
"{tmpl_var name='CA_pass'}"
autocomplete=
"new-password"
class=
"form-control"
/></div></div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
><tmpl_var
name=
"skip_le_check_txt"
></label>
<div
class=
"col-sm-9"
><tmpl_var
name=
"skip_le_check"
></div>
</div>
<!-- End content -->
</div>
</div>
...
...
server/plugins-available/apache2_plugin.inc.php
View file @
0579c7a5
...
...
@@ -1226,12 +1226,16 @@ class apache2_plugin {
$le_domains
=
array
();
foreach
(
$temp_domains
as
$temp_domain
)
{
$le_hash_check
=
trim
(
@
file_get_contents
(
'http://'
.
$temp_domain
.
'/.well-known/acme-challenge/'
.
$le_rnd_file
));
if
(
$le_hash_check
==
$le_rnd_hash
)
{
if
(
isset
(
$web_config
[
'skip_le_check'
])
&&
$web_config
[
'skip_le_check'
]
==
'y'
)
{
$le_domains
[]
=
$temp_domain
;
$app
->
log
(
"Verified domain "
.
$temp_domain
.
" should be reachable for letsencrypt."
,
LOGLEVEL_DEBUG
);
}
else
{
$app
->
log
(
"Could not verify domain "
.
$temp_domain
.
", so excluding it from letsencrypt request."
,
LOGLEVEL_WARN
);
$le_hash_check
=
trim
(
@
file_get_contents
(
'http://'
.
$temp_domain
.
'/.well-known/acme-challenge/'
.
$le_rnd_file
));
if
(
$le_hash_check
==
$le_rnd_hash
)
{
$le_domains
[]
=
$temp_domain
;
$app
->
log
(
"Verified domain "
.
$temp_domain
.
" should be reachable for letsencrypt."
,
LOGLEVEL_DEBUG
);
}
else
{
$app
->
log
(
"Could not verify domain "
.
$temp_domain
.
", so excluding it from letsencrypt request."
,
LOGLEVEL_WARN
);
}
}
}
$temp_domains
=
$le_domains
;
...
...
server/plugins-available/nginx_plugin.inc.php
View file @
0579c7a5
...
...
@@ -1299,12 +1299,16 @@ class nginx_plugin {
$le_domains
=
array
();
foreach
(
$temp_domains
as
$temp_domain
)
{
$le_hash_check
=
trim
(
@
file_get_contents
(
'http://'
.
$temp_domain
.
'/.well-known/acme-challenge/'
.
$le_rnd_file
));
if
(
$le_hash_check
==
$le_rnd_hash
)
{
if
(
isset
(
$web_config
[
'skip_le_check'
])
&&
$web_config
[
'skip_le_check'
]
==
'y'
)
{
$le_domains
[]
=
$temp_domain
;
$app
->
log
(
"Verified domain "
.
$temp_domain
.
" should be reachable for letsencrypt."
,
LOGLEVEL_DEBUG
);
}
else
{
$app
->
log
(
"Could not verify domain "
.
$temp_domain
.
", so excluding it from letsencrypt request."
,
LOGLEVEL_WARN
);
$le_hash_check
=
trim
(
@
file_get_contents
(
'http://'
.
$temp_domain
.
'/.well-known/acme-challenge/'
.
$le_rnd_file
));
if
(
$le_hash_check
==
$le_rnd_hash
)
{
$le_domains
[]
=
$temp_domain
;
$app
->
log
(
"Verified domain "
.
$temp_domain
.
" should be reachable for letsencrypt."
,
LOGLEVEL_DEBUG
);
}
else
{
$app
->
log
(
"Could not verify domain "
.
$temp_domain
.
", so excluding it from letsencrypt request."
,
LOGLEVEL_WARN
);
}
}
}
$temp_domains
=
$le_domains
;
...
...
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