Merge github.com:justmwa/acme.sh

Conflicts:
	dnsapi/README.md
	dnsapi/dns_nsone.sh
This commit is contained in:
nytral
2017-05-08 16:02:31 +02:00
3 changed files with 8 additions and 2 deletions

View File

@ -494,7 +494,8 @@ be reused when needed.
If you have any issues with this integration please report them to
https://github.com/pho3nixf1re/acme.sh/issues.
## 26. Use NS1.com API
<<<<<<< HEAD
## 28. Use NS1.com API
```
export NS1_Key="fdmlfsdklmfdkmqsdfk"
@ -504,6 +505,8 @@ Ok, let's issue a cert now:
```
acme.sh --issue --dns dns_nsone -d example.com -d www.example.com
```
=======
>>>>>>> 9201e0a5b905812da1157efa075dd1ab52362c09
# Use custom API

View File

@ -1,4 +1,6 @@
#!/bin/bash
<<<<<<< HEAD
#!/usr/bin/env sh
>>>>>>> 9201e0a5b905812da1157efa075dd1ab52362c09
# bug reports to dev@1e.ca