upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

security/acme-client: merge version 1.14 from master

Browse source
This commit is contained in:
Franco Fichtner 2018-04-26 11:15:53 +02:00
parent 9f37166cd7
commit b6c2ec3d87
5 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
security/acme-client/Makefile
View file

@ -1,5 +1,5 @@
PLUGIN_NAME= acme-client
PLUGIN_VERSION= 1.13
PLUGIN_VERSION= 1.14
PLUGIN_COMMENT= Let's Encrypt client
PLUGIN_MAINTAINER= opnsense@moov.de
PLUGIN_DEPENDS= acme.sh bind911

20
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
View file

@ -149,6 +149,26 @@
<label>CF Key</label>
<type>text</type>
</field>
<field>
<label>ClouDNS</label>
<type>header</type>
<style>table_dns table_dns_cloudns</style>
</field>
<field>
<id>validation.dns_cloudns_auth_id</id>
<label>Auth ID</label>
<type>text</type>
</field>
<field>
<id>validation.dns_cloudns_sub_auth_id</id>
<label>Sub Auth ID</label>
<type>text</type>
</field>
<field>
<id>validation.dns_cloudns_auth_password</id>
<label>Auth Password</label>
<type>text</type>
</field>
<field>
<label>CloudXNS</label>
<type>header</type>

10
security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
View file

@ -331,6 +331,7 @@
<dns_ali>aliyun.com API</dns_ali>
<dns_aws>AWS Route 53</dns_aws>
<dns_cf>CloudFlare.com API</dns_cf>
<dns_cloudns>ClouDNS API</dns_cloudns>
<dns_cx>CloudXNS.com API</dns_cx>
<dns_cyon>cyon.ch API</dns_cyon>
<dns_dgon>DigitalOcean API</dns_dgon>
@ -387,6 +388,15 @@
<dns_cf_key type="TextField">
<Required>N</Required>
</dns_cf_key>
<dns_cloudns_auth_id type="TextField">
<Required>N</Required>
</dns_cloudns_auth_id>
<dns_cloudns_sub_auth_id type="TextField">
<Required>N</Required>
</dns_cloudns_sub_auth_id>
<dns_cloudns_auth_password type="TextField">
<Required>N</Required>
</dns_cloudns_auth_password>
<dns_cx_key type="TextField">
<Required>N</Required>
</dns_cx_key>

5
security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
View file

@ -603,6 +603,11 @@ function run_acme_validation($certObj, $valObj, $acctObj)
$proc_env['CF_Key'] = (string)$valObj->dns_cf_key;
$proc_env['CF_Email'] = (string)$valObj->dns_cf_email;
break;
case 'dns_cloudns':
$proc_env['CLOUDNS_AUTH_ID'] = (string)$valObj->dns_cloudns_auth_id;
$proc_env['CLOUDNS_SUB_AUTH_ID'] = (string)$valObj->dns_cloudns_sub_auth_id;
$proc_env['CLOUDNS_AUTH_PASSWORD'] = (string)$valObj->dns_cloudns_auth_password;
break;
case 'dns_cx':
$proc_env['CX_Key'] = (string)$valObj->dns_cx_key;
$proc_env['CX_Secret'] = (string)$valObj->dns_cx_secret;

3
security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/lighttpd-acme-challenge.conf
View file

@ -64,9 +64,6 @@ server.bind = "127.0.0.1"
server.port = {{OPNsense.AcmeClient.settings.challengePort}}
$SERVER["socket"] == "127.0.0.1:{{OPNsense.AcmeClient.settings.challengePort}}" { }
# ssl configuration
ssl.engine = "disable"
# to help the rc.scripts
server.pid-file = "/var/run/lighttpd-acme-challenge.pid"