Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chasquid-util: honor --config_dir argument as chasquid does #60

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chasquid-util: honor --config_dir argument as chasquid does #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions cmd/chasquid-util/chasquid-util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package main

import (
"flag"
"bytes"
"fmt"
"os"
Expand Down Expand Up @@ -60,25 +61,20 @@ var args map[string]string

// Globals, loaded from top-level options.
var (
configDir = "/etc/chasquid"
configDir = flag.String("config_dir", "/etc/chasquid",
"configuration directory")
)

func main() {
flag.Parse()

args = parseArgs(usage)

if _, ok := args["--help"]; ok {
fmt.Print(usage)
return
}

// Load globals.
if d, ok := args["--configdir"]; ok {
configDir = d
}
if d, ok := args["-C"]; ok {
configDir = d
}

commands := map[string]func(){
"user-add": userAdd,
"user-remove": userRemove,
Expand Down Expand Up @@ -116,7 +112,7 @@ func userDBForDomain(domain string) string {
if domain == "" {
domain = args["$2"]
}
return configDir + "/domains/" + domain + "/users"
return *configDir + "/domains/" + domain + "/users"
}

func userDBFromArgs(create bool) (string, string, *userdb.DB) {
Expand Down Expand Up @@ -254,7 +250,7 @@ func userRemove() {

// chasquid-util aliases-resolve <address>
func aliasesResolve() {
conf, err := config.Load(configDir+"/chasquid.conf", "")
conf, err := config.Load(*configDir+"/chasquid.conf", "")
if err != nil {
Fatalf("Error loading config: %v", err)
}
Expand Down Expand Up @@ -282,7 +278,7 @@ func aliasesResolve() {

// chasquid-util print-config
func printConfig() {
conf, err := config.Load(configDir+"/chasquid.conf", "")
conf, err := config.Load(*configDir+"/chasquid.conf", "")
if err != nil {
Fatalf("Error loading config: %v", err)
}
Expand All @@ -292,7 +288,7 @@ func printConfig() {

// chasquid-util domaininfo-remove <domain>
func domaininfoRemove() {
conf, err := config.Load(configDir+"/chasquid.conf", "")
conf, err := config.Load(*configDir+"/chasquid.conf", "")
if err != nil {
Fatalf("Error loading config: %v", err)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/chasquid-util/dkim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ func dkimKeygen() {

func keyPathFor(domain, selector string) string {
return path.Clean(fmt.Sprintf("%s/domains/%s/dkim:%s.pem",
configDir, domain, selector))
*configDir, domain, selector))
}

func getDomainFromMsg(msg []byte) string {
Expand All @@ -226,7 +226,7 @@ func getDomainFromMsg(msg []byte) string {
}

func findSelectorForDomain(domain string) string {
glob := path.Clean(configDir + "/domains/" + domain + "/dkim:*.pem")
glob := path.Clean(*configDir + "/domains/" + domain + "/dkim:*.pem")
ms, err := filepath.Glob(glob)
if err != nil {
Fatalf("Error finding DKIM keys: %v", err)
Expand Down