This commit is contained in:
+3
-3
@@ -37,6 +37,7 @@ func main() {
|
||||
log.Fatalf("mail: %v", err)
|
||||
}
|
||||
bus := events.New()
|
||||
mail.Subscribe(bus, store.NewPostgres(db), notifier)
|
||||
bot, err := discord.FromEnv(store.NewDiscordLinks(db), bus, store.NewPostgres(db), notifier)
|
||||
if err != nil {
|
||||
log.Fatalf("discord: %v", err)
|
||||
@@ -44,7 +45,7 @@ func main() {
|
||||
if bot != nil {
|
||||
defer bot.Close()
|
||||
}
|
||||
handler := newHandler(db, sessions, uploader, notifier, bus)
|
||||
handler := newHandler(db, sessions, uploader, bus)
|
||||
run(&http.Server{
|
||||
Addr: listenAddr(),
|
||||
Handler: handler,
|
||||
@@ -68,13 +69,12 @@ func openDB() (*sql.DB, *store.SessionStore) {
|
||||
return db, sessions
|
||||
}
|
||||
|
||||
func newHandler(db *sql.DB, sessions *store.SessionStore, uploader blob.Uploader, notifier mail.Notifier, bus events.Publisher) http.Handler {
|
||||
func newHandler(db *sql.DB, sessions *store.SessionStore, uploader blob.Uploader, bus events.Publisher) http.Handler {
|
||||
srv, err := web.New(store.NewPostgres(db), sessions.Store(), plumber.TemplateFS, plumber.StaticFS, web.Config{
|
||||
AdminSetupSecret: strings.TrimSpace(os.Getenv("ADMIN_SETUP_SECRET")),
|
||||
SecureCookie: secureCookieFromEnv(),
|
||||
TrustedProxies: parseTrustedProxies(os.Getenv("TRUSTED_PROXY_CIDRS")),
|
||||
Blob: uploader,
|
||||
Mail: notifier,
|
||||
Events: bus,
|
||||
BaseURL: strings.TrimRight(strings.TrimSpace(os.Getenv("APP_BASE_URL")), "/"),
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user