diff --git a/install.sh b/install.sh index 786c0eb..e1d8a2f 100755 --- a/install.sh +++ b/install.sh @@ -47,7 +47,6 @@ IMAP_HOST_DEFAULT="imap.openxchange.eu" IMAP_PORT_DEFAULT="993" NEXTWKS_URL_DEFAULT="https://wks.lohmar.co.uk" AUTH_URL_DEFAULT="https://auth.lohmar.co.uk" -PROXY_IP_DEFAULT="172.16.0.10" # ============================================================ # AUTO-CLONE: if running standalone (not from repo), clone first @@ -124,8 +123,6 @@ gather_inputs() { NEXTWKS_URL="${NEXTWKS_URL:-$NEXTWKS_URL_DEFAULT}" read -p " Auth URL [$AUTH_URL_DEFAULT]: " AUTH_URL AUTH_URL="${AUTH_URL:-$AUTH_URL_DEFAULT}" - read -p " Reverse Proxy [$PROXY_IP_DEFAULT]: " PROXY_IP - PROXY_IP="${PROXY_IP:-$PROXY_IP_DEFAULT}" # Extract domains from URLs NEXTWKS_DOMAIN=$(echo "$NEXTWKS_URL" | sed 's|https\?://||;s|/.*||') @@ -138,7 +135,6 @@ gather_inputs() { info " Admin: ${ADMIN_UNAME} (${ADMIN_EMAIL:-no email})" info " NextWks: ${NEXTWKS_URL}" info " Auth: ${AUTH_URL}" - info " Proxy: ${PROXY_IP}" echo "" read -p " Install with these settings? [Y/n]: " CONFIRM [ "$CONFIRM" = "n" ] || [ "$CONFIRM" = "N" ] && { echo "Aborted."; exit 0; } @@ -155,7 +151,6 @@ ADMIN_UNAME="${ADMIN_UNAME}" ADMIN_EMAIL="${ADMIN_EMAIL}" NEXTWKS_URL="${NEXTWKS_URL}" AUTH_URL="${AUTH_URL}" -PROXY_IP="${PROXY_IP}" ENVEOF success "Settings saved to $ENV_FILE" } @@ -249,8 +244,6 @@ smtp: imap: host: "${IMAP_HOST}" port: ${IMAP_PORT} -proxy: - ip: "${PROXY_IP}" session: secret: "${SESSION_KEY}" expiry_minutes: 60 diff --git a/src/core/admin/templates/global.templ b/src/core/admin/templates/global.templ index e505284..6e82842 100644 --- a/src/core/admin/templates/global.templ +++ b/src/core/admin/templates/global.templ @@ -1,6 +1,6 @@ package templates -templ GlobalSettings(smtpHost, smtpPort, smtpUser, smtpPass, imapHost, imapPort, nextwksURL, authURL, proxyIP, msg string) { +templ GlobalSettings(smtpHost, smtpPort, smtpUser, smtpPass, imapHost, imapPort, nextwksURL, authURL, msg string) { @Layout("global") {

Global Settings

if msg != "" { @@ -53,10 +53,6 @@ templ GlobalSettings(smtpHost, smtpPort, smtpUser, smtpPass, imapHost, imapPort, -
- - -
diff --git a/src/core/admin/templates/global_templ.go b/src/core/admin/templates/global_templ.go index fc291d4..0c676bc 100644 --- a/src/core/admin/templates/global_templ.go +++ b/src/core/admin/templates/global_templ.go @@ -8,7 +8,7 @@ package templates import "github.com/a-h/templ" import templruntime "github.com/a-h/templ/runtime" -func GlobalSettings(smtpHost, smtpPort, smtpUser, smtpPass, imapHost, imapPort, nextwksURL, authURL, proxyIP, msg string) templ.Component { +func GlobalSettings(smtpHost, smtpPort, smtpUser, smtpPass, imapHost, imapPort, nextwksURL, authURL, msg string) templ.Component { return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { @@ -168,20 +168,7 @@ func GlobalSettings(smtpHost, smtpPort, smtpUser, smtpPass, imapHost, imapPort, if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "\">
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/src/core/admin/ui.go b/src/core/admin/ui.go index 9584fca..20104bc 100644 --- a/src/core/admin/ui.go +++ b/src/core/admin/ui.go @@ -48,8 +48,7 @@ func (h *Handler) adminGlobal(w http.ResponseWriter, r *http.Request) { cfg := readConfigRaw(h.configPath) component := templates.GlobalSettings( cfg["smtp_host"], cfg["smtp_port"], cfg["smtp_user"], cfg["smtp_pass"], - cfg["imap_host"], cfg["imap_port"], cfg["nextwks_url"], cfg["auth_url"], - cfg["proxy_ip"], "", + cfg["imap_host"], cfg["imap_port"], cfg["nextwks_url"], cfg["auth_url"], "", ) component.Render(r.Context(), w) } @@ -62,8 +61,7 @@ func (h *Handler) adminGlobalSave(w http.ResponseWriter, r *http.Request) { cfg := readConfigRaw(h.configPath) component := templates.GlobalSettings( cfg["smtp_host"], cfg["smtp_port"], cfg["smtp_user"], cfg["smtp_pass"], - cfg["imap_host"], cfg["imap_port"], cfg["nextwks_url"], cfg["auth_url"], - cfg["proxy_ip"], msg, + cfg["imap_host"], cfg["imap_port"], cfg["nextwks_url"], cfg["auth_url"], msg, ) component.Render(r.Context(), w) } @@ -90,7 +88,6 @@ func readConfigRaw(path string) rawConfig { cfg["nextwks_url"] = trimSuffix(cfg["nextwks_url"], "/auth/callback") } cfg["auth_url"] = getNested(m, "oidc", "issuer_url") - cfg["proxy_ip"] = getNested(m, "proxy", "ip") return cfg } @@ -108,7 +105,6 @@ func writeConfigRaw(path string, r *http.Request) string { setNested(m, r.FormValue("smtp_pass"), "smtp", "password") setNested(m, r.FormValue("imap_host"), "imap", "host") setNested(m, r.FormValue("imap_port"), "imap", "port") - setNested(m, r.FormValue("proxy_ip"), "proxy", "ip") nextwks := r.FormValue("nextwks_url") if nextwks != "" { setNested(m, nextwks+"/auth/callback", "oidc", "redirect_url") diff --git a/src/core/config/config.go b/src/core/config/config.go index 21eb4f1..ecdff42 100644 --- a/src/core/config/config.go +++ b/src/core/config/config.go @@ -16,7 +16,6 @@ type Config struct { OIDC OIDCConfig `yaml:"oidc"` SMTP SMTPConfig `yaml:"smtp"` IMAP IMAPConfig `yaml:"imap"` - Proxy ProxyConfig `yaml:"proxy"` Session SessionConfig `yaml:"session"` } @@ -62,10 +61,6 @@ type IMAPConfig struct { Port int `yaml:"port"` } -type ProxyConfig struct { - IP string `yaml:"ip"` -} - type SessionConfig struct { Secret string `yaml:"secret"` ExpiryMinutes int `yaml:"expiry_minutes"`