Skip to content

Commit 51f507e

Browse files
author
Marius Burkard
committed
Merge branch 'automatic-caa-creation' into 'develop'
Add an option to disable automatic creation of CAA record on issuing LE Closes #6372 See merge request ispconfig/ispconfig3!1624
2 parents 2ac3055 + 7dc6868 commit 51f507e

29 files changed

+49
-10
lines changed

‎install/tpl/system.ini.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ web_php_options=no,fast-cgi,mod,php-fpm
3939
show_aps_menu=n
4040
client_protection=y
4141
ssh_authentication=
42+
le_caa_autocreate_options=y
4243

4344

4445
[tools]

‎interface/lib/plugins/system_config_dns_ca_plugin.inc.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,11 @@ function caa_update($event_name, $page_form) {
6565
}
6666

6767
function web_vhost_domain_edit($event_name, $page_form) {
68-
global $app;
68+
global $app, $conf;
69+
70+
$global_config = $app->getconf->get_global_config('sites');
6971

70-
if($page_form->dataRecord['ssl_letsencrypt'] == 'y') {
72+
if(($page_form->dataRecord['ssl_letsencrypt'] == 'y') && ($global_config['le_caa_autocreate_options'] != 'n')) {
7173
$domain = $page_form->dataRecord['domain'];
7274
$subdomain = $page_form->dataRecord['subdomain'];
7375
$temp=$app->db->queryAllRecords("SELECT * FROM dns_rr WHERE type = 'CAA' AND (name = ? OR name = ?) AND data like ?", $domain.'.', $subdomain.'.'.$domain.'.', '%letsencrypt%');

‎interface/web/admin/form/system_config.tform.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,13 @@
246246
'formtype' => 'SELECT',
247247
'default' => '',
248248
'value' => array('' => 'ssh_authentication_password_key', 'password' => 'ssh_authentication_password', 'key' => 'ssh_authentication_key')
249-
)
249+
),
250+
'le_caa_autocreate_options' => array (
251+
'datatype' => 'VARCHAR',
252+
'formtype' => 'CHECKBOX',
253+
'default' => 'y',
254+
'value' => array(0 => 'n', 1 => 'y')
255+
),
250256
//#################################
251257
// END Datatable fields
252258
//#################################

‎interface/web/admin/lib/lang/ar_system_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
106106
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108108
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';
109+
$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
109110
?>

‎interface/web/admin/lib/lang/bg_system_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
106106
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108108
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';
109+
$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
109110
?>

‎interface/web/admin/lib/lang/br_system_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,4 @@ $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108108
$wb['monitor_key_txt'] = 'Senha do Monitor';
109109
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';
110+
$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';

‎interface/web/admin/lib/lang/ca_system_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
106106
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108108
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';
109+
$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
109110
?>

‎interface/web/admin/lib/lang/cz_system_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,4 @@ $wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108108
$wb['monitor_key_txt'] = 'Monitor keyword';
109109
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';
110+
$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';

‎interface/web/admin/lib/lang/de_system_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
106106
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108108
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';
109+
$wb['le_caa_autocreate_options_txt'] = 'Automatische Erstellung des CAA-Records bei LE Ausstellung aktivieren';
109110
?>

‎interface/web/admin/lib/lang/dk_system_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,5 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
106106
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108108
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';
109+
$wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
109110
?>

0 commit comments

Comments
 (0)