fix: proxy www through binary for ACME challenge support

This commit is contained in:
Claus Lohmar 2026-07-07 12:22:11 +01:00
parent 038d923a11
commit d73b67614e
2 changed files with 98 additions and 6 deletions

View file

@ -205,16 +205,19 @@ ZORAXY_APP
}
ZORAXY_DNS
# Generate www subdomain config (static site, no upstream)
# Generate www subdomain config (proxied to binary for landing page + ACME support)
cat > "$TARGET_DIR/config/zoraxy/conf/proxy/www.$DOMAIN.config" <<ZORAXY_WWW
{
"ProxyType": 1,
"RootOrMatchingDomain": "www.$DOMAIN",
"ActiveOrigins": [],
"ActiveOrigins": [{
"OriginIpOrDomain": "127.0.0.1:9000",
"RequireTLS": false,
"Weight": 1,
"MaxConn": 0
}],
"Disabled": false,
"AuthenticationProvider": {"AuthMethod": 0},
"DefaultSiteOption": 1,
"DefaultSiteValue": "internal"
"AuthenticationProvider": {"AuthMethod": 0}
}
ZORAXY_WWW

91
main.go
View file

@ -295,6 +295,89 @@ const loginHTML = `<!DOCTYPE html>
</body>
</html>`
const landingPageHTML = `<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>NextWorkspace Your Self-Hosted Workspace for Startups</title>
<style>
* { margin: 0; padding: 0; box-sizing: border-box; }
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
background: #f0f2f5;
color: #1a1a2e;
min-height: 100vh;
}
header {
background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%);
color: #fff;
padding: 3rem 2rem;
text-align: center;
}
header h1 { font-size: 2.5rem; margin-bottom: 0.5rem; }
header p { color: #a0aec0; font-size: 1.2rem; }
.domain { color: #63b3ed; font-size: 0.9rem; margin-top: 0.5rem; }
.container { max-width: 800px; margin: 0 auto; padding: 2rem; }
h2 { font-size: 1.5rem; margin: 2rem 0 1rem; color: #2d3748; }
ul { list-style: none; padding: 0; }
li {
background: #fff;
border-radius: 8px;
padding: 1rem 1.25rem;
margin-bottom: 0.75rem;
box-shadow: 0 1px 4px rgba(0,0,0,0.06);
}
li a { color: #1a1a2e; text-decoration: none; font-weight: 600; font-size: 1.05rem; }
li a:hover { color: #63b3ed; }
li span { color: #718096; font-size: 0.9rem; margin-left: 0.5rem; }
.ai-credit {
background: #edf2f7;
border-radius: 8px;
padding: 1.5rem;
margin-top: 2rem;
text-align: center;
font-size: 0.9rem;
color: #4a5568;
}
.ai-credit strong { color: #1a1a2e; }
footer {
text-align: center;
padding: 2rem;
color: #a0aec0;
font-size: 0.85rem;
}
</style>
</head>
<body>
<header>
<h1>NextWorkspace</h1>
<p>Your Self-Hosted Workspace for Startups</p>
<div class="domain">nextwks.eu</div>
</header>
<div class="container">
<h2>Components</h2>
<ul>
<li><a href="https://app.nextwks.eu/home">NextWks Core</a><span> Launcher &amp; Workspace Hub</span></li>
<li><a href="https://app.nextwks.eu/drive">OpenCloud</a><span> File Storage</span></li>
<li><a href="https://app.nextwks.eu/connect">Alps Webmail</a><span> Email Client</span></li>
<li><a href="https://app.nextwks.eu/office">Euro Office</a><span> Collaborative Suite</span></li>
<li><a href="https://app.nextwks.eu/enterprise">ERPNext</a><span> Enterprise ERP</span></li>
<li><a href="https://app.nextwks.eu/chat">Element Web</a><span> Matrix Chat</span></li>
<li><a href="https://app.nextwks.eu/meet">Jitsi</a><span> Video Conferencing</span></li>
<li><a href="https://app.nextwks.eu/aida">Open WebUI</a><span> AI Chat Frontend</span></li>
</ul>
<div class="ai-credit">
<h2>Built with AI</h2>
<p>NextWorkspace was developed with assistance from AI coding tools, using <strong>DeepSeek</strong> as the provider and <strong>OpenCode</strong> as the development framework.</p>
</div>
</div>
<footer>
&copy; 2026 NextWorkspace &mdash; nextwks.eu
</footer>
</body>
</html>`
const launcherHTML = `<!DOCTYPE html>
<html lang="en">
<head>
@ -437,8 +520,14 @@ func main() {
}
}
// Default: redirect to launcher
// Default: serve landing page for www subdomain, redirect to launcher otherwise
domain := os.Getenv("DOMAIN")
mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(r.Host, "www.") || (domain != "" && r.Host == "www."+domain) {
w.Header().Set("Content-Type", "text/html; charset=utf-8")
fmt.Fprint(w, landingPageHTML)
return
}
http.Redirect(w, r, "/home/", http.StatusFound)
})