LE: add "Revoke before delete" and "Delete on Site delete" options #5226 #6563

Author: d--j

install/tpl/server.ini.master

@@ -143,7 +143,9 @@ vhost_proxy_protocol_protocols=ipv4
 vhost_proxy_protocol_http_port=880
 vhost_proxy_protocol_https_port=8443
 le_signature_type=ECDSA
+le_delete_on_site_remove=y
 le_auto_cleanup=y
+le_revoke_before_delete=y
 le_auto_cleanup_denylist=[server_name]
 
 [dns]

interface/web/admin/form/server_config.tform.php

@@ -1639,6 +1639,12 @@
 			'default' => 'ECDSA',
 			'value' => array('RSA' => 'RSA (RSA encryption with SHA-256)', 'ECDSA' => 'ECDSA (Elliptic Curve Digital Signature Algorithm)')
 		),
+		'le_delete_on_site_remove' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value' => array(0 => 'n', 1 => 'y')
+		),
 		'le_auto_cleanup' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
@@ -1664,6 +1670,12 @@
 			'width' => '40',
 			'maxlength' => '255'
 		),
+		'le_revoke_before_delete' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value' => array(0 => 'n', 1 => 'y')
+		),
 		//#################################
 		// END Datatable fields
 		//#################################

interface/web/admin/lib/lang/ar_server_config.lng

@@ -368,3 +368,5 @@ $wb['le_auto_cleanup_txt'] = 'Automatically purge unused Let\'s Encrypt certific
 $wb['le_auto_cleanup_denylist_txt'] = 'Domains that should never be purged';
 $wb['le_auto_cleanup_denylist_note_txt'] = 'Comma separated list of domain globs that should not be purged. <br>E.g. <code>mail.*, externally-managed.example.com</code> <br>Placeholders:';
 $wb['le_auto_cleanup_denylist_error_custom'] = 'Invalid list of domain globs';
+$wb['le_delete_on_site_remove_txt'] = 'Delete Let\'s Encrypt certificate on website removal';
+$wb['le_revoke_before_delete_txt'] = 'Revoke a certificate before deleting it (prevents Let\'s Encrypt renewal warnings)';

interface/web/admin/lib/lang/bg_server_config.lng

@@ -368,3 +368,5 @@ $wb['le_auto_cleanup_txt'] = 'Automatically purge unused Let\'s Encrypt certific
 $wb['le_auto_cleanup_denylist_txt'] = 'Domains that should never be purged';
 $wb['le_auto_cleanup_denylist_note_txt'] = 'Comma separated list of domain globs that should not be purged. <br>E.g. <code>mail.*, externally-managed.example.com</code> <br>Placeholders:';
 $wb['le_auto_cleanup_denylist_error_custom'] = 'Invalid list of domain globs';
+$wb['le_delete_on_site_remove_txt'] = 'Delete Let\'s Encrypt certificate on website removal';
+$wb['le_revoke_before_delete_txt'] = 'Revoke a certificate before deleting it (prevents Let\'s Encrypt renewal warnings)';

interface/web/admin/lib/lang/br_server_config.lng

@@ -369,3 +369,5 @@ $wb['le_auto_cleanup_txt'] = 'Automatically purge unused Let\'s Encrypt certific
 $wb['le_auto_cleanup_denylist_txt'] = 'Domains that should never be purged';
 $wb['le_auto_cleanup_denylist_note_txt'] = 'Comma separated list of domain globs that should not be purged. <br>E.g. <code>mail.*, externally-managed.example.com</code> <br>Placeholders:';
 $wb['le_auto_cleanup_denylist_error_custom'] = 'Invalid list of domain globs';
+$wb['le_delete_on_site_remove_txt'] = 'Delete Let\'s Encrypt certificate on website removal';
+$wb['le_revoke_before_delete_txt'] = 'Revoke a certificate before deleting it (prevents Let\'s Encrypt renewal warnings)';

interface/web/admin/lib/lang/ca_server_config.lng

@@ -368,3 +368,5 @@ $wb['le_auto_cleanup_txt'] = 'Automatically purge unused Let\'s Encrypt certific
 $wb['le_auto_cleanup_denylist_txt'] = 'Domains that should never be purged';
 $wb['le_auto_cleanup_denylist_note_txt'] = 'Comma separated list of domain globs that should not be purged. <br>E.g. <code>mail.*, externally-managed.example.com</code> <br>Placeholders:';
 $wb['le_auto_cleanup_denylist_error_custom'] = 'Invalid list of domain globs';
+$wb['le_delete_on_site_remove_txt'] = 'Delete Let\'s Encrypt certificate on website removal';
+$wb['le_revoke_before_delete_txt'] = 'Revoke a certificate before deleting it (prevents Let\'s Encrypt renewal warnings)';

interface/web/admin/lib/lang/cn_server_config.lng

@@ -368,3 +368,5 @@ $wb['le_auto_cleanup_txt'] = 'Automatically purge unused Let\'s Encrypt certific
 $wb['le_auto_cleanup_denylist_txt'] = 'Domains that should never be purged';
 $wb['le_auto_cleanup_denylist_note_txt'] = 'Comma separated list of domain globs that should not be purged. <br>E.g. <code>mail.*, externally-managed.example.com</code> <br>Placeholders:';
 $wb['le_auto_cleanup_denylist_error_custom'] = 'Invalid list of domain globs';
+$wb['le_delete_on_site_remove_txt'] = 'Delete Let\'s Encrypt certificate on website removal';
+$wb['le_revoke_before_delete_txt'] = 'Revoke a certificate before deleting it (prevents Let\'s Encrypt renewal warnings)';

interface/web/admin/lib/lang/cz_server_config.lng

@@ -368,3 +368,5 @@ $wb['le_auto_cleanup_txt'] = 'Automatically purge unused Let\'s Encrypt certific
 $wb['le_auto_cleanup_denylist_txt'] = 'Domains that should never be purged';
 $wb['le_auto_cleanup_denylist_note_txt'] = 'Comma separated list of domain globs that should not be purged. <br>E.g. <code>mail.*, externally-managed.example.com</code> <br>Placeholders:';
 $wb['le_auto_cleanup_denylist_error_custom'] = 'Invalid list of domain globs';
+$wb['le_delete_on_site_remove_txt'] = 'Delete Let\'s Encrypt certificate on website removal';
+$wb['le_revoke_before_delete_txt'] = 'Revoke a certificate before deleting it (prevents Let\'s Encrypt renewal warnings)';

interface/web/admin/lib/lang/de_server_config.lng

@@ -368,3 +368,5 @@ $wb['le_auto_cleanup_txt'] = 'Entferne unbenutzte Let\'s Encrypt Zertifikate aut
 $wb['le_auto_cleanup_denylist_txt'] = 'Domains die nie entfernt werden sollen';
 $wb['le_auto_cleanup_denylist_note_txt'] = 'Komma-separierte Liste von Domain-Globs, die niemals entfernt werden sollen. <br>Z.B. <code>mail.*, externally-managed.example.com</code> <br>Platzhalter:';
 $wb['le_auto_cleanup_denylist_error_custom'] = 'Domain-Glob Liste ungültig';
+$wb['le_delete_on_site_remove_txt'] = 'Delete Let\'s Encrypt certificate on website removal';
+$wb['le_revoke_before_delete_txt'] = 'Revoke a certificate before deleting it (prevents Let\'s Encrypt renewal warnings)';

interface/web/admin/lib/lang/dk_server_config.lng

@@ -368,3 +368,5 @@ $wb['le_auto_cleanup_txt'] = 'Automatically purge unused Let\'s Encrypt certific
 $wb['le_auto_cleanup_denylist_txt'] = 'Domains that should never be purged';
 $wb['le_auto_cleanup_denylist_note_txt'] = 'Comma separated list of domain globs that should not be purged. <br>E.g. <code>mail.*, externally-managed.example.com</code> <br>Placeholders:';
 $wb['le_auto_cleanup_denylist_error_custom'] = 'Invalid list of domain globs';
+$wb['le_delete_on_site_remove_txt'] = 'Delete Let\'s Encrypt certificate on website removal';
+$wb['le_revoke_before_delete_txt'] = 'Revoke a certificate before deleting it (prevents Let\'s Encrypt renewal warnings)';