diff --git a/cmd/a_main-packr.go b/cmd/a_main-packr.go index 79cd8c2e..20330af8 100644 --- a/cmd/a_main-packr.go +++ b/cmd/a_main-packr.go @@ -7,5 +7,5 @@ import "github.com/gobuffalo/packr" // You can use the "packr clean" command to clean up this, // and any other packr generated files. func init() { - packr.PackJSONBytes("static", "default-config.toml", "\"IyMgQVRURU5USU9OCiMgaXQgaXMgZXhhbXBsZSBmaWxlIG9ubHkuIEl0IGJ1aWx0aW4gaW4gYmluYXJ5IGFuZCBkb24ndCByZWFkIGZyb20gZmlsZSBzeXN0ZW0uCiMgY2hhbmdlcyBpbiBjb25maWdfZGVmYXVsdC50b21sIGhhdmUgbm8gcmVhbCBlZmZlY3QuCgpbR2VuZXJhbF0KCiMgU2Vjb25kcyBmb3IgaXNzdWUgZXZlcnkgY2VydGlmaWNhdGUuIENhbmNlbCBpc3N1ZSBhbmQgcmV0dXJuIGVycm9yIGlmIHRpbWVvdXQuCklzc3VlVGltZW91dCA9IDMwMAoKIyBQYXRoIHRvIGRpciwgd2hpY2ggd2lsbCBzdG9yZSBzdGF0ZSBhbmQgY2VydGlmaWNhdGVzClN0b3JhZ2VEaXIgPSAic3RvcmFnZSIKCiMgU3RvcmUgLmpzb24gaW5mbyB3aXRoIGNlcnRpZmljYXRlIG1ldGFkYXRhIG5lYXIgY2VydGlmaWNhdGUuClN0b3JlSlNPTk1ldGFkYXRhID0gdHJ1ZQoKIyBEaXJlY3RvcnkgdXJsIG9mIGFjbWUgc2VydmVyLgojVGVzdCBzZXJ2ZXI6IGh0dHBzOi8vYWNtZS1zdGFnaW5nLXYwMi5hcGkubGV0c2VuY3J5cHQub3JnL2RpcmVjdG9yeQpBY21lU2VydmVyID0gImh0dHBzOi8vYWNtZS12MDEuYXBpLmxldHNlbmNyeXB0Lm9yZy9kaXJlY3RvcnkiCgojIEluY2x1ZGUgb3RoZXIgY29uZmlnIGZpbGVzCiMgSXQgc3VwcG9ydCBnbG9iIHN5bnRheAojIElmIGl0IGhhcyBwYXRoIHdpdGhvdXQgdGVtcGxhdGUgLSB0aGUgZmlsZSBtdXN0IGV4aXN0LgojIEZvciBhbGxvdyBvcHRpb25hbCBpbmNsdWRlIGZpbGUgLSBpdCBjYW4gY29udGFpbiBzb21lIGdsb2Igc3ltYm9sCiMgSW5jbHVkZWQgY29uZmlncyBtZXJnZSB3aXRoIGN1cnJlbnQgcmVhZGVkIHN0YXRlLgojIGV4YW1wbGU9WyAiY29uZmlnLnRvbVtsXSIgXQpJbmNsdWRlQ29uZmlncyA9IFtdCgojIEZvciBwcmV2ZW50IGluZmluaXRlIGxvb3AgYW5kIGNvbnN1bWUgYWxsIG1lbW9yeSBpZiBjeWNsZSBpbiBpbmNsdWRlcwpNYXhDb25maWdGaWxlc1JlYWQgPSAxMDAwMAoKW0xvZ10KRW5hYmxlTG9nVG9GaWxlID0gdHJ1ZQpFbmFibGVMb2dUb1N0ZEVyciA9IHRydWUKCiMgdmVyYm9zZSBsZXZlbCBvZiBsb2csIG9uZSBvZjogZGVidWcsIGluZm8sIHdhcm5pbmcsIGVycm9yLCBmYXRhbApMb2dMZXZlbCA9ICJpbmZvIgoKIyBFbmFibGUgc2VsZiBsb2cgcm90YXRpbmcKRW5hYmxlUm90YXRlID0gdHJ1ZQoKIyBFbmFibGUgZGV2ZWxvcGVyIG1vZGU6IG1vcmUgc3RhY2t0cmFjZXMgYW5kIHBhbmljIChzdG9wIHByb2dyYW0pIG9uIHNvbWUgaW50ZXJuYWwgZXJyb3JzLgpEZXZlbG9wZXJNb2RlID0gZmFsc2UKCiMgUGF0aCB0byBsb2cgZmlsZQpGaWxlID0gImxldHMtcHJveHkubG9nIgoKIyBSb3RhdGUgbG9nIGlmIGN1cnJlbnQgZmlsZSBzaXplIG1vcmUgdGhhbiBYIE1CClJvdGF0ZUJ5U2l6ZU1CID0gMTAwCgojIENvbXByZXNzIG9sZCBsb2cgd2l0aCBnemlwIGFmdGVyIHJvdGF0ZQpDb21wcmVzc1JvdGF0ZWQgPSBmYWxzZQoKIyBEZWxldGUgb2xkIGJhY2t1cHMgYWZ0ZXIgWCBkYXlzLiAwIGZvciBkaXNhYmxlLgpNYXhEYXlzID0gMTAKCiMgRGVsZXRlIG9sZCBiYWNrdXBzIGlmIG9sZCBmaWxlIG51bWJlciBtb3JlIHRoZW4gWC4gMCBmb3IgZGlzYWJsZS4KTWF4Q291bnQgPSAxMAoKW1Byb3h5XQoKIyBEZWZhdWx0IHJ1bGUgb2Ygc2VsZWN0IGRlc3RpbmF0aW9uIGFkZHJlc3MuCiNJdCBjYW4gYmU6IElQICh3aXRoIGRlZmF1bHQgcG9ydCA4MCksIDpQb3J0IChkZWZhdWx0IC0gc2FtZSBJUCBhcyByZWNlaXZlIGNvbm5lY3Rpb24pLCBJUHY0OlBvcnQgb3IgW0lQdjZdOlBvcnQKRGVmYXVsdFRhcmdldCA9ICI6ODAiCgojIEFycmF5IG9mICctJyBzZXBhcmF0ZWQgcGFpcnMgb3IgSVA6UG9ydC4gRm9yIGV4YW1wbGU6CiMgWwojICAgIjEuMi4zLjQ6NDQzLTIuMi4yLjI6MTIzNCIsCiMgICAiMy4zLjMuMzozMzMtWzo6MV06OTQiCiMgIl0KIyBNZWFuOiBjb25uZWN0aW9ucywgYWNjZXB0ZWQgb24gMS4yLjMuNDo0NDMgc2VuZCB0byBzZXJ2ZXIgMi4yLjIuMjoxMjM0CiMgYW5kIGNvbm5lY3Rpb25zIGFjY2VwdGVkIG9uIDMuMy4zLjM6MzMzIHNlbmQgdG8gaXB2NiA6OjEgcG9ydCA5NApUYXJnZXRNYXAgPSBbXQoKIyBBcnJheSBvZiBjb2xvbiBzZXBhcmF0ZWQgSGVhZGVyTmFtZTpIZWFkZXJWYWx1ZSBmb3IgYWRkIHRvIHJlcXVlc3QgZm9yIGJhY2tlbmQuIHt7VmFsdWV9fSBpcyBzcGVjaWFsIGZvcm1zLCB3aGljaCBjYW4KIyBpbnRlcm5hbGx5IHBhcnNpbmcuIE5vdyBpdCBzdXBwb3J0IG9ubHkgc3BlY2lhbCB2YWx1ZXM6CiMge3tDT05ORUNUSU9OX0lEfX0gLSBJZCBvZiBhY2NlcHRlZCBjb25uZWN0aW9uLCBnZW5lcmF0ZWQgYnkgbGV0cy1wcm94eQojIHt7SFRUUF9QUk9UT319IC0gc2V0IHRvIGh0dHAvaHR0cHMgZGVwZW5kZW5jZSBpbmNvbWluZyBjb25uZWN0aW9ucyBoYW5kbGVkCiMge3tTT1VSQ0VfSVB9fSAtIFJlbW90ZSBJUCBvZiBpbmNvbWluZyBjb25uZWN0aW9uCiMge1NPVVJDRV9QT1JUfX0gLSBSZW1vdGUgcG9ydCBvZiBpbmNvbWluZyBjb25uZWN0aW9uCiMge3tTT1VSQ0VfSVB9fTp7e1NPVVJDRV9QT1JUfX0gLSBSZW1vdGUgSVA6UG9ydCBvZiBpbmNvbWluZyBjb25uZWN0aW9uLgojIE5vdyBpdCBhY2NlcHRlZCBvbmx5IHRoaXMgc3BlY2lhbCB2YWx1ZXMsIHdoaWNoIG11c3QgYmUgZXhheGx0eSBlcXVhbCB0byBleGFtcGxlcy4gQWxsIG90aGVyIHZhbHVlcyBzZW5kIGFzIGlzLgojIEJ1dCBpdCBjYW4gY2hhbmdlIGFuZCBleHRlbmQgaW4gZnV0dXJlLiBEb2Vzbid0IHVzZSB7ey4uLn19IGFzIG93biB2YWx1ZXMuCiMgRXhhbXBsZToKIyBbIklQOnt7U09VUkNFX0lQfX0iLCAiUHJveHk6bGV0cy1wcm94eSIsICJQcm90b2NvbDp7e0hUVFBfUFJPVE99fSIgXQpIZWFkZXJzID0gW10KCltDaGVja0RvbWFpbnNdCgojIEFsbG93IGRvbWFpbiBpZiBpdCByZXNvbHZlciBmb3Igb25lIG9mIHB1YmxpYyBJUHMgb2YgdGhpcyBzZXJ2ZXIuCklQU2VsZiA9IHRydWUKCiMgQWxsb3cgZG9tYWluIGlmIGl0IHJlc29sdmVyIGZvciBvbmUgb2YgdGhlIGlwcy4KSVBXaGl0ZUxpc3QgPSAiIgoKIyBSZWdleHAgaW4gZ29sYW5nIHN5bnRheCBvZiBibGFja2xpc3RlZCBkb21haW4gZm9yIGlzc3VlIGNlcnRpZmljYXRlLgojVGhpcyBsaXN0IG92ZXJyaWRlZCBieSB3aGl0ZWxpc3QuCkJsYWNrTGlzdCA9ICIiCgojIFJlZ2V4cCBpbiBnb2xhbmcgc3ludGF4IG9mIHdoaXRlbGlzdCBkb21haW5zIGZvciBpc3N1ZSBjZXJ0aWZpY2F0ZS4KI1doaXRlbGlzdCBuZWVkIGZvciBhbGxvdyBwYXJ0IG9mIGRvbWFpbnMsIHdoaWNoIGV4Y2x1ZGVkIGJ5IGJsYWNrbGlzdC4KIwpXaGl0ZUxpc3QgPSAiIgoKIyBDb21tYSBzZXBhcmF0ZWQgZG5zIHNlcnZlciwgdXNlZCBmb3IgcmVzb2x2ZSBpcDpwb3J0IGFkZHJlc3Mgb2YgZG9tYWlucyB3aGlsZSBjaGVjayBpdC4KIyBpZiBlbXB0eSAtIHVzZSBzeXN0ZW0gZG5zIHJlc29sdmVyICh1c3VhbGx5IGluY2x1ZGUgaG9zdHMgZmlsZSwgY2FjaGUsIGV0YykKIyBpZiBzZXQgLSB1c2UgZGlyZWN0IGRucyBxdWVyaWVzIGZvciBzZXJ2ZXJzLCB3aXRob3V0IHNlbGYgY2FjaGUuCiMgaWYgc2V0IG1vcmUsIHRoYW4gb25lIGRucyBzZXJ2ZXIgLSBzZW5kIHF1ZXJpZXMgaW4gcGFyYWxsZWwgdG8gYWxsIHNlcnZlcnMuCiMgZXJyb3IgcmVzdWx0cyBmcm9tIHBhcnQgb2Ygc2VydmVycyAtIGlnbm9yZS4gTmVlZCBtaW5pbXVtIG9uZSBhbnN3ZXIuCiMgaWYgZGlmZmVyZW50IGRucyBzZXJ2ZXJzIHJldHVybiBkaWZmZXJlbnQgaXAgYWRkcmVzc2VzIC0gYWxsIG9mIHRoZW0gdXNlIGZvciBjaGVjawojIEV4YW1wbGU6ICI4LjguOC44OjUzLDEuMS4xLjE6NTMsNzcuODguOC44OjUzLFsyYTAyOjZiODo6ZmVlZDowZmZdOjUzLFsyMDAxOjQ4NjA6NDg2MDo6ODg4OF06NTMiClJlc29sdmVyID0gIiIKCgoKW0xpc3Rlbl0KCiMgQmluZCBhZGRyZXNzZXMgZm9yIFRMUyBsaXN0ZW5lcnMKVExTQWRkcmVzc2VzID0gWyI6NDQzIl0KCiMgQmluZCBhZGRyZXNzZXMgd2l0aG91dCBUTFMgc2VjdXJlIChmb3IgSFRUUCByZXZlcnNlIHByb3h5IGFuZCBodHRwLTAxIHZhbGlkYXRpb24gd2l0aG91dCByZWRpcmVjdCB0byBodHRwcykKVENQQWRkcmVzc2VzID0gW10K\"") + packr.PackJSONBytes("static", "default-config.toml", "\"IyMgQVRURU5USU9OCiMgaXQgaXMgZXhhbXBsZSBmaWxlIG9ubHkuIEl0IGJ1aWx0aW4gaW4gYmluYXJ5IGFuZCBkb24ndCByZWFkIGZyb20gZmlsZSBzeXN0ZW0uCiMgY2hhbmdlcyBpbiBjb25maWdfZGVmYXVsdC50b21sIGhhdmUgbm8gcmVhbCBlZmZlY3QuCgpbR2VuZXJhbF0KCiMgU2Vjb25kcyBmb3IgaXNzdWUgZXZlcnkgY2VydGlmaWNhdGUuIENhbmNlbCBpc3N1ZSBhbmQgcmV0dXJuIGVycm9yIGlmIHRpbWVvdXQuCklzc3VlVGltZW91dCA9IDMwMAoKIyBQYXRoIHRvIGRpciwgd2hpY2ggd2lsbCBzdG9yZSBzdGF0ZSBhbmQgY2VydGlmaWNhdGVzClN0b3JhZ2VEaXIgPSAic3RvcmFnZSIKCiMgU3RvcmUgLmpzb24gaW5mbyB3aXRoIGNlcnRpZmljYXRlIG1ldGFkYXRhIG5lYXIgY2VydGlmaWNhdGUuClN0b3JlSlNPTk1ldGFkYXRhID0gdHJ1ZQoKIyBEaXJlY3RvcnkgdXJsIG9mIGFjbWUgc2VydmVyLgojVGVzdCBzZXJ2ZXI6IGh0dHBzOi8vYWNtZS1zdGFnaW5nLmFwaS5sZXRzZW5jcnlwdC5vcmcvZGlyZWN0b3J5CkFjbWVTZXJ2ZXIgPSAiaHR0cHM6Ly9hY21lLXYwMS5hcGkubGV0c2VuY3J5cHQub3JnL2RpcmVjdG9yeSIKCiMgSW5jbHVkZSBvdGhlciBjb25maWcgZmlsZXMKIyBJdCBzdXBwb3J0IGdsb2Igc3ludGF4CiMgSWYgaXQgaGFzIHBhdGggd2l0aG91dCB0ZW1wbGF0ZSAtIHRoZSBmaWxlIG11c3QgZXhpc3QuCiMgRm9yIGFsbG93IG9wdGlvbmFsIGluY2x1ZGUgZmlsZSAtIGl0IGNhbiBjb250YWluIHNvbWUgZ2xvYiBzeW1ib2wKIyBJbmNsdWRlZCBjb25maWdzIG1lcmdlIHdpdGggY3VycmVudCByZWFkZWQgc3RhdGUuCiMgZXhhbXBsZT1bICJjb25maWcudG9tW2xdIiBdCkluY2x1ZGVDb25maWdzID0gW10KCiMgRm9yIHByZXZlbnQgaW5maW5pdGUgbG9vcCBhbmQgY29uc3VtZSBhbGwgbWVtb3J5IGlmIGN5Y2xlIGluIGluY2x1ZGVzCk1heENvbmZpZ0ZpbGVzUmVhZCA9IDEwMDAwCgpbTG9nXQpFbmFibGVMb2dUb0ZpbGUgPSB0cnVlCkVuYWJsZUxvZ1RvU3RkRXJyID0gdHJ1ZQoKIyB2ZXJib3NlIGxldmVsIG9mIGxvZywgb25lIG9mOiBkZWJ1ZywgaW5mbywgd2FybmluZywgZXJyb3IsIGZhdGFsCkxvZ0xldmVsID0gImluZm8iCgojIEVuYWJsZSBzZWxmIGxvZyByb3RhdGluZwpFbmFibGVSb3RhdGUgPSB0cnVlCgojIEVuYWJsZSBkZXZlbG9wZXIgbW9kZTogbW9yZSBzdGFja3RyYWNlcyBhbmQgcGFuaWMgKHN0b3AgcHJvZ3JhbSkgb24gc29tZSBpbnRlcm5hbCBlcnJvcnMuCkRldmVsb3Blck1vZGUgPSBmYWxzZQoKIyBQYXRoIHRvIGxvZyBmaWxlCkZpbGUgPSAibGV0cy1wcm94eS5sb2ciCgojIFJvdGF0ZSBsb2cgaWYgY3VycmVudCBmaWxlIHNpemUgbW9yZSB0aGFuIFggTUIKUm90YXRlQnlTaXplTUIgPSAxMDAKCiMgQ29tcHJlc3Mgb2xkIGxvZyB3aXRoIGd6aXAgYWZ0ZXIgcm90YXRlCkNvbXByZXNzUm90YXRlZCA9IGZhbHNlCgojIERlbGV0ZSBvbGQgYmFja3VwcyBhZnRlciBYIGRheXMuIDAgZm9yIGRpc2FibGUuCk1heERheXMgPSAxMAoKIyBEZWxldGUgb2xkIGJhY2t1cHMgaWYgb2xkIGZpbGUgbnVtYmVyIG1vcmUgdGhlbiBYLiAwIGZvciBkaXNhYmxlLgpNYXhDb3VudCA9IDEwCgpbUHJveHldCgojIERlZmF1bHQgcnVsZSBvZiBzZWxlY3QgZGVzdGluYXRpb24gYWRkcmVzcy4KI0l0IGNhbiBiZTogSVAgKHdpdGggZGVmYXVsdCBwb3J0IDgwKSwgOlBvcnQgKGRlZmF1bHQgLSBzYW1lIElQIGFzIHJlY2VpdmUgY29ubmVjdGlvbiksIElQdjQ6UG9ydCBvciBbSVB2Nl06UG9ydApEZWZhdWx0VGFyZ2V0ID0gIjo4MCIKCiMgQXJyYXkgb2YgJy0nIHNlcGFyYXRlZCBwYWlycyBvciBJUDpQb3J0LiBGb3IgZXhhbXBsZToKIyBbCiMgICAiMS4yLjMuNDo0NDMtMi4yLjIuMjoxMjM0IiwKIyAgICIzLjMuMy4zOjMzMy1bOjoxXTo5NCIKIyAiXQojIE1lYW46IGNvbm5lY3Rpb25zLCBhY2NlcHRlZCBvbiAxLjIuMy40OjQ0MyBzZW5kIHRvIHNlcnZlciAyLjIuMi4yOjEyMzQKIyBhbmQgY29ubmVjdGlvbnMgYWNjZXB0ZWQgb24gMy4zLjMuMzozMzMgc2VuZCB0byBpcHY2IDo6MSBwb3J0IDk0ClRhcmdldE1hcCA9IFtdCgojIEFycmF5IG9mIGNvbG9uIHNlcGFyYXRlZCBIZWFkZXJOYW1lOkhlYWRlclZhbHVlIGZvciBhZGQgdG8gcmVxdWVzdCBmb3IgYmFja2VuZC4ge3tWYWx1ZX19IGlzIHNwZWNpYWwgZm9ybXMsIHdoaWNoIGNhbgojIGludGVybmFsbHkgcGFyc2luZy4gTm93IGl0IHN1cHBvcnQgb25seSBzcGVjaWFsIHZhbHVlczoKIyB7e0NPTk5FQ1RJT05fSUR9fSAtIElkIG9mIGFjY2VwdGVkIGNvbm5lY3Rpb24sIGdlbmVyYXRlZCBieSBsZXRzLXByb3h5CiMge3tIVFRQX1BST1RPfX0gLSBzZXQgdG8gaHR0cC9odHRwcyBkZXBlbmRlbmNlIGluY29taW5nIGNvbm5lY3Rpb25zIGhhbmRsZWQKIyB7e1NPVVJDRV9JUH19IC0gUmVtb3RlIElQIG9mIGluY29taW5nIGNvbm5lY3Rpb24KIyB7U09VUkNFX1BPUlR9fSAtIFJlbW90ZSBwb3J0IG9mIGluY29taW5nIGNvbm5lY3Rpb24KIyB7e1NPVVJDRV9JUH19Ont7U09VUkNFX1BPUlR9fSAtIFJlbW90ZSBJUDpQb3J0IG9mIGluY29taW5nIGNvbm5lY3Rpb24uCiMgTm93IGl0IGFjY2VwdGVkIG9ubHkgdGhpcyBzcGVjaWFsIHZhbHVlcywgd2hpY2ggbXVzdCBiZSBleGF4bHR5IGVxdWFsIHRvIGV4YW1wbGVzLiBBbGwgb3RoZXIgdmFsdWVzIHNlbmQgYXMgaXMuCiMgQnV0IGl0IGNhbiBjaGFuZ2UgYW5kIGV4dGVuZCBpbiBmdXR1cmUuIERvZXNuJ3QgdXNlIHt7Li4ufX0gYXMgb3duIHZhbHVlcy4KIyBFeGFtcGxlOgojIFsiSVA6e3tTT1VSQ0VfSVB9fSIsICJQcm94eTpsZXRzLXByb3h5IiwgIlByb3RvY29sOnt7SFRUUF9QUk9UT319IiBdCkhlYWRlcnMgPSBbXQoKW0NoZWNrRG9tYWluc10KCiMgQWxsb3cgZG9tYWluIGlmIGl0IHJlc29sdmVyIGZvciBvbmUgb2YgcHVibGljIElQcyBvZiB0aGlzIHNlcnZlci4KSVBTZWxmID0gdHJ1ZQoKIyBBbGxvdyBkb21haW4gaWYgaXQgcmVzb2x2ZXIgZm9yIG9uZSBvZiB0aGUgaXBzLgpJUFdoaXRlTGlzdCA9ICIiCgojIFJlZ2V4cCBpbiBnb2xhbmcgc3ludGF4IG9mIGJsYWNrbGlzdGVkIGRvbWFpbiBmb3IgaXNzdWUgY2VydGlmaWNhdGUuCiNUaGlzIGxpc3Qgb3ZlcnJpZGVkIGJ5IHdoaXRlbGlzdC4KQmxhY2tMaXN0ID0gIiIKCiMgUmVnZXhwIGluIGdvbGFuZyBzeW50YXggb2Ygd2hpdGVsaXN0IGRvbWFpbnMgZm9yIGlzc3VlIGNlcnRpZmljYXRlLgojV2hpdGVsaXN0IG5lZWQgZm9yIGFsbG93IHBhcnQgb2YgZG9tYWlucywgd2hpY2ggZXhjbHVkZWQgYnkgYmxhY2tsaXN0LgojCldoaXRlTGlzdCA9ICIiCgojIENvbW1hIHNlcGFyYXRlZCBkbnMgc2VydmVyLCB1c2VkIGZvciByZXNvbHZlIGlwOnBvcnQgYWRkcmVzcyBvZiBkb21haW5zIHdoaWxlIGNoZWNrIGl0LgojIGlmIGVtcHR5IC0gdXNlIHN5c3RlbSBkbnMgcmVzb2x2ZXIgKHVzdWFsbHkgaW5jbHVkZSBob3N0cyBmaWxlLCBjYWNoZSwgZXRjKQojIGlmIHNldCAtIHVzZSBkaXJlY3QgZG5zIHF1ZXJpZXMgZm9yIHNlcnZlcnMsIHdpdGhvdXQgc2VsZiBjYWNoZS4KIyBpZiBzZXQgbW9yZSwgdGhhbiBvbmUgZG5zIHNlcnZlciAtIHNlbmQgcXVlcmllcyBpbiBwYXJhbGxlbCB0byBhbGwgc2VydmVycy4KIyBlcnJvciByZXN1bHRzIGZyb20gcGFydCBvZiBzZXJ2ZXJzIC0gaWdub3JlLiBOZWVkIG1pbmltdW0gb25lIGFuc3dlci4KIyBpZiBkaWZmZXJlbnQgZG5zIHNlcnZlcnMgcmV0dXJuIGRpZmZlcmVudCBpcCBhZGRyZXNzZXMgLSBhbGwgb2YgdGhlbSB1c2UgZm9yIGNoZWNrCiMgRXhhbXBsZTogIjguOC44Ljg6NTMsMS4xLjEuMTo1Myw3Ny44OC44Ljg6NTMsWzJhMDI6NmI4OjpmZWVkOjBmZl06NTMsWzIwMDE6NDg2MDo0ODYwOjo4ODg4XTo1MyIKUmVzb2x2ZXIgPSAiIgoKCgpbTGlzdGVuXQoKIyBCaW5kIGFkZHJlc3NlcyBmb3IgVExTIGxpc3RlbmVycwpUTFNBZGRyZXNzZXMgPSBbIjo0NDMiXQoKIyBCaW5kIGFkZHJlc3NlcyB3aXRob3V0IFRMUyBzZWN1cmUgKGZvciBIVFRQIHJldmVyc2UgcHJveHkgYW5kIGh0dHAtMDEgdmFsaWRhdGlvbiB3aXRob3V0IHJlZGlyZWN0IHRvIGh0dHBzKQpUQ1BBZGRyZXNzZXMgPSBbXQo=\"") } diff --git a/cmd/static/default-config.toml b/cmd/static/default-config.toml index 9754334d..6f820163 100644 --- a/cmd/static/default-config.toml +++ b/cmd/static/default-config.toml @@ -14,7 +14,7 @@ StorageDir = "storage" StoreJSONMetadata = true # Directory url of acme server. -#Test server: https://acme-staging-v02.api.letsencrypt.org/directory +#Test server: https://acme-staging.api.letsencrypt.org/directory AcmeServer = "https://acme-v01.api.letsencrypt.org/directory" # Include other config files diff --git a/internal/cert_manager/cert-desctiption.go b/internal/cert_manager/cert-desctiption.go index e3f6bd17..14891b45 100644 --- a/internal/cert_manager/cert-desctiption.go +++ b/internal/cert_manager/cert-desctiption.go @@ -1,7 +1,11 @@ //nolint:golint package cert_manager -import "go.uber.org/zap" +import ( + "strings" + + "go.uber.org/zap" +) type certNameType string @@ -10,7 +14,7 @@ func (n certNameType) String() string { } func certNameFromDomain(domain DomainName) certNameType { - return certNameType(domain) + return certNameType(strings.TrimPrefix(domain.String(), "www.")) } func domainNamesFromCertificateName(name certNameType) []DomainName {