ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
feat(services): pick a base domain when giving an app a subdomain
Juan Denis432e65179b4d
diff --git a/backend/tests/test_site_base_domains.py b/backend/tests/test_site_base_domains.pyindex 149b28fa..282e9114 100644--- a/backend/tests/test_site_base_domains.py+++ b/backend/tests/test_site_base_domains.py@@ -153,6 +153,17 @@ def test_admin_update_dns_mode(app, client, auth_headers):assert SiteBaseDomainService.get('toto.com').dns_mode == 'per-site'+def test_suggest_subdomain_honours_base(app, client, auth_headers):+ from app.services.site_base_domain_service import SiteBaseDomainService+ _set('sites_base_domain', 'example.com')+ SiteBaseDomainService.add('toto.com')+ a = _mk_app(name='My Service', port=8900)+ resp = client.get(f'/api/v1/domains/suggest-subdomain?application_id={a.id}&base=toto.com',+ headers=auth_headers)+ assert resp.status_code == 200+ assert resp.get_json()['suggestion'] == 'my-service.toto.com'++def test_per_base_https_setup_persists_to_row(app, monkeypatch):from app import dbfrom app.models.email import DNSProviderConfigdiff --git a/frontend/src/components/service-detail/SettingsTab.jsx b/frontend/src/components/service-detail/SettingsTab.jsxindex 3461e52c..f56a9481 100644--- a/frontend/src/components/service-detail/SettingsTab.jsx+++ b/frontend/src/components/service-detail/SettingsTab.jsx@@ -386,6 +386,10 @@ const DomainSslPanel = ({ app, domains, primaryDomain, onUpdate }) => {const [subdomainLabel, setSubdomainLabel] = useState('');const [suggesting, setSuggesting] = useState(false);const [publishing, setPublishing] = useState(false);+ // Base domains the app can be published under, and the chosen one, so a+ // multi-base install can pick which domain the subdomain lives on.+ const [subdomainBases, setSubdomainBases] = useState([]);+ const [subdomainBase, setSubdomainBase] = useState('');const isPublicDomain = !!primaryDomain&& !/^(localhost|127\.|10\.|192\.168\.|172\.(1[6-9]|2\d|3[01])\.)/.test(primaryDomain)@@ -449,15 +453,22 @@ const DomainSslPanel = ({ app, domains, primaryDomain, onUpdate }) => {async function handleSuggestSubdomain() {setSuggesting(true);try {- const res = await api.suggestSubdomain(app.id);- if (!res.base_domain) {+ const [suggestRes, basesRes] = await Promise.all([+ api.suggestSubdomain(app.id),+ api.getSiteBaseDomains().catch(() => ({ base_domains: [], default: null })),+ ]);+ if (!suggestRes.base_domain) {toast.info('Set a managed-sites base domain in Settings → Sites to publish on a subdomain.', 6000);return;}+ const bases = basesRes.base_domains || [];+ const chosen = basesRes.default || suggestRes.base_domain;// Prefill the editable label from the suggestion (<label>.<base>).- const suggestedLabel = (res.suggestion || '').replace(`.${res.base_domain}`, '');+ const suggestedLabel = (suggestRes.suggestion || '').replace(`.${suggestRes.base_domain}`, '');setSubdomainLabel(suggestedLabel);- setSubdomainModal({ base_domain: res.base_domain, dns_mode: res.dns_mode });+ setSubdomainBases(bases);+ setSubdomainBase(chosen);+ setSubdomainModal({ base_domain: chosen, dns_mode: suggestRes.dns_mode });} catch (err) {toast.error(err.message || 'Failed to suggest a subdomain');} finally {@@ -468,7 +479,7 @@ const DomainSslPanel = ({ app, domains, primaryDomain, onUpdate }) => {async function handleGiveSubdomain() {setPublishing(true);try {- const res = await api.giveSubdomain(app.id, subdomainLabel.trim());+ const res = await api.giveSubdomain(app.id, subdomainLabel.trim(), subdomainBase || undefined);if (res.success) {if (res.warning) toast.warning(res.warning);toast.success(res.url ? `Published at ${res.url}` : 'Subdomain published');@@ -658,8 +669,26 @@ const DomainSslPanel = ({ app, domains, primaryDomain, onUpdate }) => {<div className="modal-body"><p className="hint">Publish <strong>{app.name}</strong> at a managed subdomain of{' '}- <code>{subdomainModal.base_domain}</code>.+ <code>{subdomainBase || subdomainModal.base_domain}</code>.</p>+ {subdomainBases.length > 1 && (+ <div className="form-group">+ <Label>Base domain</Label>+ <select+ className="settings-select"+ value={subdomainBase}+ onChange={(e) => setSubdomainBase(e.target.value)}+ disabled={publishing}+ >+ {subdomainBases.map((b) => (+ <option key={b.domain} value={b.domain}>+ {b.domain}{b.is_default ? ' (default)' : ''}{b.https_enabled ? ' — HTTPS' : ''}+ </option>+ ))}+ </select>+ <span className="form-hint">Which registered base domain to publish this service under.</span>+ </div>+ )}<div className="form-group"><Label>Subdomain</Label><div className="svc-subdomain-input">@@ -670,10 +699,10 @@ const DomainSslPanel = ({ app, domains, primaryDomain, onUpdate }) => {placeholder="my-app"disabled={publishing}/>- <span className="svc-subdomain-input__suffix">.{subdomainModal.base_domain}</span>+ <span className="svc-subdomain-input__suffix">.{subdomainBase || subdomainModal.base_domain}</span></div><span className="form-hint">- {subdomainModal.dns_mode === 'wildcard'+ {(subdomainBases.find((b) => b.domain === subdomainBase)?.dns_mode || subdomainModal.dns_mode) === 'wildcard'? 'Wildcard DNS is configured — this resolves instantly, no record needed.': 'Per-site mode — a DNS record will be created for this host.'}</span>diff --git a/frontend/src/services/api/files.js b/frontend/src/services/api/files.jsindex 87ea33c4..af61e486 100644--- a/frontend/src/services/api/files.js+++ b/frontend/src/services/api/files.js@@ -483,15 +483,23 @@ export async function verifyDomain(domainId) {// Suggest a managed-sites subdomain (<slug>.<base>) for an app so the UI can// prefill the "give this a subdomain" action.-export async function suggestSubdomain(applicationId) {- return this.request(`/domains/suggest-subdomain?application_id=${applicationId}`);+export async function suggestSubdomain(applicationId, base) {+ const q = base ? `&base=${encodeURIComponent(base)}` : '';+ return this.request(`/domains/suggest-subdomain?application_id=${applicationId}${q}`);}-// Publish an app at <label>.<base_domain> in one click. Label is optional —-// omit it when falsy so the backend derives one from the app name.-export async function giveSubdomain(applicationId, label) {+// Base domains a site can be published under (<slug>.<base>), for the picker.+export async function getSiteBaseDomains() {+ return this.request('/domains/base-domains');+}++// Publish an app at <label>.<base> in one click. Label and base are optional —+// omit them when falsy so the backend derives the label from the app name and+// uses the default base domain.+export async function giveSubdomain(applicationId, label, base) {const body = { application_id: applicationId };if (label) body.label = label;+ if (base) body.base = base;return this.request('/domains/give-subdomain', { method: 'POST', body });}