luzifer/vault-openvpn
1
0
Fork 0
mirror of https://github.com/Luzifer/vault-openvpn.git synced 2024-09-19 09:32:56 +00:00
Code Issues Releases Wiki Activity

Allow sorting by date instead of FQDN

Browse Source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2018-01-13 13:59:42 +01:00
parent 0e3fbc7816
commit 45928d5991
Signed by: luzifer
GPG Key ID: DC2729FDD34BE99E
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main.go
View File

@ -47,6 +47,7 @@ var (
CertTTL time.Duration `flag:"ttl" vardefault:"ttl" description:"Set the TTL for this certificate"` CertTTL time.Duration `flag:"ttl" vardefault:"ttl" description:"Set the TTL for this certificate"`
LogLevel string `flag:"log-level" vardefault:"log-level" description:"Log level to use (debug, info, warning, error)"` LogLevel string `flag:"log-level" vardefault:"log-level" description:"Log level to use (debug, info, warning, error)"`
Sort string `flag:"sort" vardefault:"sort" description:"How to sort list output (fqdn, issuedate, expiredate)"`
TemplatePath string `flag:"template-path" vardefault:"template-path" description:"Path to read the client.conf / server.conf template from"` TemplatePath string `flag:"template-path" vardefault:"template-path" description:"Path to read the client.conf / server.conf template from"`
VersionAndExit bool `flag:"version" default:"false" description:"Prints current version and exits"` VersionAndExit bool `flag:"version" default:"false" description:"Prints current version and exits"`
}{} }{}
@ -57,6 +58,7 @@ var (
"auto-revoke": "true", "auto-revoke": "true",
"ttl": "8760h", "ttl": "8760h",
"log-level": "info", "log-level": "info",
"sort": "fqdn",
"template-path": ".", "template-path": ".",
} }
@ -243,10 +245,19 @@ func listCertificates() error {
} }
sort.Slice(lines, func(i, j int) bool { sort.Slice(lines, func(i, j int) bool {
if lines[i].FQDN == lines[j].FQDN { switch cfg.Sort {
case "issuedate":
return lines[i].NotBefore.Before(lines[j].NotBefore) return lines[i].NotBefore.Before(lines[j].NotBefore)
case "expiredate":
return lines[i].NotAfter.Before(lines[j].NotAfter)
default:
if lines[i].FQDN == lines[j].FQDN {
return lines[i].NotBefore.Before(lines[j].NotBefore)
}
return lines[i].FQDN < lines[j].FQDN
} }
return lines[i].FQDN < lines[j].FQDN
}) })
for _, line := range lines { for _, line := range lines {