next

cmd/certs.go

@@ -2,8 +2,8 @@ package cmd
 
 import (
 	"fmt"
+	"time"
 
-	"github.com/akrylysov/pogreb"
 	"github.com/urfave/cli/v2"
 
 	"codeberg.org/codeberg/pages/server/database"
@@ -52,15 +52,20 @@ func listCerts(ctx *cli.Context) error {
 		return fmt.Errorf("could not create database: %v", err)
 	}
 
-	items := keyDatabase.Items()
-	for domain, _, err := items.Next(); err != pogreb.ErrIterationDone; domain, _, err = items.Next() {
-		if err != nil {
-			return err
+	items, err := keyDatabase.Items(0, 0)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("Name\tDomain\tValidTill\n\n")
+	for _, cert := range items {
+		if cert.Name[0] == '.' {
+			cert.Name = "*" + cert.Name
 		}
-		if domain[0] == '.' {
-			fmt.Printf("*")
-		}
-		fmt.Printf("%s\n", domain)
+		fmt.Printf("%s\t%s\t%s\n",
+			cert.Name,
+			cert.Domain,
+			time.Unix(cert.ValidTill, 0).Format(time.RFC3339))
 	}
 	return nil
 }