Skip to content

Commit

Permalink
Cmd line flag -c for config location (#108)
Browse files Browse the repository at this point in the history
Add command line parsing and a flag `-c` to specify where the config
file should be loaded from.
  • Loading branch information
stblassitude authored and joohoi committed Sep 21, 2018
1 parent d66ccff commit db2a6bc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ See the INSTALL section for information on how to do this.

2) Install acme-dns: `go get github.com/joohoi/acme-dns/...`. This will install acme-dns to `~/go/bin/acme-dns`.

3) Edit config.cfg to suit your needs (see [configuration](#configuration)). `acme-dns` will read the configuration file from `/etc/acme-dns/config.cfg` or `./config.cfg`.
3) Edit config.cfg to suit your needs (see [configuration](#configuration)). `acme-dns` will read the configuration file from `/etc/acme-dns/config.cfg` or `./config.cfg`, or a location specified with the `-c` flag.

4) If your system has systemd, you can optionally install acme-dns as a service so that it will start on boot and be tracked by systemd. This also allows us to add the `CAP_NET_BIND_SERVICE` capability so that acme-dns can be run by a user other than root.

Expand Down Expand Up @@ -300,6 +300,9 @@ header_name = "X-Forwarded-For"


## Changelog
- unreleased
- New
- Command line flag `-c` to specify location of config file.
- v0.5
- New
- Configurable certificate cache directory
Expand Down
9 changes: 6 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package main

import (
"crypto/tls"
"flag"
stdlog "log"
"net/http"
"os"
Expand All @@ -18,11 +19,13 @@ import (
func main() {
// Created files are not world writable
syscall.Umask(0077)
configPtr := flag.String("c", "/etc/acme-dns/config.cfg", "config file location")
flag.Parse()
// Read global config
var err error
if fileIsAccessible("/etc/acme-dns/config.cfg") {
log.WithFields(log.Fields{"file": "/etc/acme-dns/config.cfg"}).Info("Using config file")
Config, err = readConfig("/etc/acme-dns/config.cfg")
if fileIsAccessible(*configPtr) {
log.WithFields(log.Fields{"file": *configPtr}).Info("Using config file")
Config, err = readConfig(*configPtr)
} else if fileIsAccessible("./config.cfg") {
log.WithFields(log.Fields{"file": "./config.cfg"}).Info("Using config file")
Config, err = readConfig("./config.cfg")
Expand Down

0 comments on commit db2a6bc

Please sign in to comment.