all repos — homestead @ feff5f2aec90e6d8b2d647c7b1994a91c8b2b33b

Code for my website

reduce number of environment variables needed in production

Alan Pearce
commit

feff5f2aec90e6d8b2d647c7b1994a91c8b2b33b

parent

c780aa5eac632a22241f6289969e5b5a99e60745

4 files changed, 5 insertions(+), 10 deletions(-)

jump to
M fly.toml → fly.toml
@@ -8,14 +8,10 @@ primary_region = "ams"
 
 [env]
 GOMEMLIMIT = "200MiB"
-SERVER_PORT = "8080"
-SERVER_LISTEN_ADDRESS = "::"
 # WEBSITE_GOATCOUNTER_SECRET = <fly secret>
 WEBSITE_ROOT = "/data/website"
-WEBSITE_REDIS_ENABLED = "true"
 WEBSITE_REDIS_ADDRESS = "redis.alanpearce.eu:6379"
 # WEBSITE_REDIS_PASSWORD = <fly secret>
-WEBSITE_REDIS_TLS_ENABLED = "true"
 
 [[services]]
 internal_port = 8080
M internal/events/redis.go → internal/events/redis.go
@@ -18,11 +18,10 @@ const key = "run_id"
 const fallbackRunID uint64 = 210
 
 type RedisOptions struct {
-	Enabled    bool   `conf:"default:false"`
-	Address    string `conf:"default:localhost:6379"`
+	Address    string
 	Username   string `conf:"default:default"`
 	Password   string `conf:"default:default"`
-	TLSEnabled bool   `conf:"default:false"`
+	TLSEnabled bool   `conf:"default:true"`
 }
 
 type Logger struct {
M internal/server/server.go → internal/server/server.go
@@ -26,7 +26,7 @@
 type Options struct {
 	DBPath        string `conf:"default:site.db"`
 	Redirect      bool   `conf:"default:true"`
-	ListenAddress string `conf:"default:localhost"`
+	ListenAddress string `conf:"default:::"`
 	Port          int    `conf:"default:8080,short:p"`
 
 	LiveReload      *livereload.LiveReload `conf:"-"`
M internal/website/website.go → internal/website/website.go
@@ -65,7 +65,7 @@ return nil, errors.WithMessage(err, "could not prepare root directory")
 	}
 
 	var listener events.Listener
-	if opts.Redis.Enabled {
+	if opts.Redis.Address != "" {
 		log.Debug("using redis listener")
 		listener, err = events.NewRedisListener(opts.Redis, log.Named("redis"))
 	} else {

@@ -79,7 +79,7 @@
 	var cfg *config.Config
 	fetcher := fetcher.New(log.Named("fetcher"), &fetcher.Options{
 		FetchURL:     opts.FetchURL,
-		RedisEnabled: opts.Redis.Enabled,
+		RedisEnabled: opts.Redis.Address != "",
 		Root:         opts.Root,
 		Listener:     listener,
 	})