scip/ephemerup
1
0
Fork 0
mirror of https://codeberg.org/scip/ephemerup.git synced 2025-12-17 12:40:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "renamed"

Browse Source 
This reverts commit f2b3fb3b96.
This commit is contained in:
Thomas von Dein
2023-03-29 13:21:28 +02:00
parent f2b3fb3b96
commit 58b11dec33
29 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/root.go
View File

@@ -29,8 +29,8 @@ import (
flag "github.com/spf13/pflag"
"github.com/alecthomas/repr"
"github.com/tlinden/ephemerup/api"
"github.com/tlinden/ephemerup/cfg"
"github.com/tlinden/cenophane/api"
"github.com/tlinden/cenophane/cfg"
"io/ioutil"
"os"
@@ -71,7 +71,7 @@ func Execute() error {
f.BoolVarP(&conf.V6only, "ipv6", "6", false, "Only listen on ipv6")
f.BoolVarP(&conf.Prefork, "prefork", "p", false, "Prefork server threads")
f.StringVarP(&conf.AppName, "appname", "n", "ephemerupd "+conf.GetVersion(), "App name to say hi as")
f.StringVarP(&conf.AppName, "appname", "n", "cenod "+conf.GetVersion(), "App name to say hi as")
f.IntVarP(&conf.BodyLimit, "bodylimit", "b", 10250000000, "Max allowed upload size in bytes")
f.Parse(os.Args[1:])
@@ -91,10 +91,10 @@ func Execute() error {
configfiles = []string{configfile}
} else {
configfiles = []string{
"/etc/ephemerupd.hcl", "/usr/local/etc/ephemerupd.hcl", // unix variants
filepath.Join(os.Getenv("HOME"), ".config", "ephemerupd", "ephemerupd.hcl"),
filepath.Join(os.Getenv("HOME"), ".ephemerupd"),
"ephemerupd.hcl",
"/etc/cenod.hcl", "/usr/local/etc/cenod.hcl", // unix variants
filepath.Join(os.Getenv("HOME"), ".config", "cenod", "cenod.hcl"),
filepath.Join(os.Getenv("HOME"), ".cenod"),
"cenod.hcl",
}
}
@@ -108,9 +108,9 @@ func Execute() error {
}
// env overrides config file
k.Load(env.Provider("EPHEMERUPD_", ".", func(s string) string {
k.Load(env.Provider("CENOD_", ".", func(s string) string {
return strings.Replace(strings.ToLower(
strings.TrimPrefix(s, "EPHEMERUPD_")), "_", ".", -1)
strings.TrimPrefix(s, "CENOD_")), "_", ".", -1)
}), nil)
// command line overrides env
@@ -157,11 +157,11 @@ func Execute() error {
Multiple env vars are supported in this format:
EPHEMERUPD_CONTEXT_$(NAME)="<context>:<key>"
CENOD_CONTEXT_$(NAME)="<context>:<key>"
eg:
EPHEMERUPD_CONTEXT_SUPPORT="support:tymag-fycyh-gymof-dysuf-doseb-puxyx"
CENOD_CONTEXT_SUPPORT="support:tymag-fycyh-gymof-dysuf-doseb-puxyx"
^^^^^^^- doesn't matter.
Modifies cfg.Config directly
@@ -171,7 +171,7 @@ func GetApicontextsFromEnv(conf *cfg.Config) {
for _, envvar := range os.Environ() {
pair := strings.SplitN(envvar, "=", 2)
if strings.HasPrefix(pair[0], "EPHEMERUPD_CONTEXT_") {
if strings.HasPrefix(pair[0], "CENOD_CONTEXT_") {
c := strings.SplitN(pair[1], ":", 2)
if len(c) == 2 {
contexts = append(contexts, cfg.Apicontext{Context: c[0], Key: c[1]})