diff --git a/cmd/cmd.go b/cmd/cmd.go index 14a0efd1..d5bdff25 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -118,7 +118,7 @@ package environment to new version.`, cmd.Flag.Bool("dep-follow-all-variants", false, "when processing dependencies, follow a & b if dependency is 'a|b'") cmd.Flag.Bool("dep-verbose-resolve", false, "when processing dependencies, print detailed logs") cmd.Flag.String("architectures", "", "list of architectures to consider during (comma-separated), default to all available") - cmd.Flag.String("config", "", "location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf)") + cmd.Flag.String("config", "", "location of configuration file (default locations in order: ~/.aptly.conf, /usr/local/etc/aptly.conf, /etc/aptly.conf)") cmd.Flag.String("gpg-provider", "", "PGP implementation (\"gpg\", \"gpg1\", \"gpg2\" for external gpg or \"internal\" for Go internal implementation)") if aptly.EnableDebug { diff --git a/context/context.go b/context/context.go index 0603255a..a3d56688 100644 --- a/context/context.go +++ b/context/context.go @@ -97,7 +97,7 @@ func (context *AptlyContext) config() *utils.ConfigStructure { } } else { homeLocation := filepath.Join(os.Getenv("HOME"), ".aptly.conf") - configLocations := []string{ homeLocation, "/etc/aptly.conf", } + configLocations := []string{homeLocation, "/usr/local/etc/aptly.conf", "/etc/aptly.conf"} for _, configLocation := range configLocations { // FIXME: check if exists, check if readable