@@ -261,13 +253,13 @@ function array_moveitemsbefore(&$items, $before, $selected) {
- =acmeicon("edit", gettext("edit frontend"))?>
+ =acmeicon("edit", gettext("edit"))?>
- =acmeicon("delete", gettext("delete frontend"))?>
+ =acmeicon("delete", gettext("delete"))?>
- =acmeicon("clone", gettext("clone frontend"))?>
+ =acmeicon("clone", gettext("clone"))?>
|
addInput(new \Form_Input('name', 'Name', 'text', $pconfig['name']
-))->setHelp('');
+))->setHelp('The name set here will also be used to create or overwrite a certificate that might already exist with this name in the pfSense certificate m.');
$section->addInput(new \Form_Input('desc', 'Description', 'text', $pconfig['desc']));
$activedisable = array();
$activedisable['active'] = "Active";
@@ -330,7 +322,6 @@ function updatevisibility()
$activedisable
));
$a_accountkeys = &$config['installedpackages']['acme']['accountkeys']['item'];
-//$a_frontendmode['http'] = array('name' => "http / https(offloading)", 'shortname' => "http/https");
$section->addInput(new \Form_Select(
'acmeaccount',
'Acme Account',
@@ -338,15 +329,26 @@ function updatevisibility()
form_name_array($a_accountkeys)
));
+$a_accountkeys = &$config['installedpackages']['acme']['accountkeys']['item'];
+$section->addInput(new \Form_Select(
+ 'keylength',
+ 'Key Size',
+ $pconfig['keylength'],
+ form_name_array($a_keylength)
+));
+
$section->addInput(new \Form_StaticText(
'Domain SAN list',
- "List all domain names that should be included in the certificate here".
-$domainslist->Draw($a_domains)
+ "List all domain names that should be included in the certificate here, and how to validate ownership by use of a wenroot or dns challenge
"
+ . "Examples:
"
+ . "/usr/local/www/.well-known/acme-challenge/
"
+ . "/tmp/haproxy_chroot/.well-known/acme-challenge/"
+ . $domainslist->Draw($a_domains)
));
$section->addInput(new \Form_StaticText(
'Actions list',
- "Used to restart webserver provesses after certificates have been renewed".
+ "Used to restart webserver processes this certificate has been renewed
Examples:
/etc/rc.restart_webgui
/usr/local/etc/rc.d/haproxy.sh restart".
$actionslist->Draw($a_actions)
));
diff --git a/security/pfSense-pkg-acme/files/usr/local/www/acme/acme_generalsettings.php b/security/pfSense-pkg-acme/files/usr/local/www/acme/acme_generalsettings.php
index 905ba5a96d10..45230630c543 100644
--- a/security/pfSense-pkg-acme/files/usr/local/www/acme/acme_generalsettings.php
+++ b/security/pfSense-pkg-acme/files/usr/local/www/acme/acme_generalsettings.php
@@ -1,31 +1,23 @@