@@ -1132,6 +1151,7 @@
const SERVER_ID = {{ server_id }};
const ALL_SERVERS = {{ servers_for_move | tojson }};
const SERVER_HOST = "{{ server.host }}";
+ const SERVER_CONNECT_DOMAIN = {{ ((server.server_info or {}).get('connect_domain') or '') | tojson }};
const SERVER_SSL_DOMAIN = {{ ((server.server_info or {}).get('ssl_domain') or '') | tojson }};
const SERVER_SSL_EMAIL = {{ ((server.server_info or {}).get('ssl_email') or '') | tojson }};
const MARKETPLACE_APPS = [
@@ -1153,6 +1173,8 @@
{ id: 'services', icon: 'wrench', titleKey: 'services' },
{ id: 'web_servers', icon: 'globe', titleKey: 'web_servers' },
];
+ const WG_AWG_BASES = new Set(['awg', 'awg2', 'awg_legacy', 'wireguard']);
+ let connectDomainEffective = {};
let currentInstallProto = 'awg';
let currentInstallAnother = false;
let currentConfig = '';
@@ -1212,6 +1234,94 @@
return Object.keys(installedProtocols).some(key => protoBase(key) === base && installedProtocols[key]);
}
+ function hasWgAwgInstalled() {
+ return Object.entries(installedProtocols || {}).some(([key, installed]) => installed && WG_AWG_BASES.has(protoBase(key)));
+ }
+
+ function listInstalledWgAwgProtocols() {
+ const protos = new Set();
+ Object.entries(installedProtocols || {}).forEach(([key, installed]) => {
+ if (installed && WG_AWG_BASES.has(protoBase(key))) protos.add(key);
+ });
+ return Array.from(protos).sort((a, b) => {
+ const ao = MARKETPLACE_APPS.findIndex(app => app.proto === protoBase(a));
+ const bo = MARKETPLACE_APPS.findIndex(app => app.proto === protoBase(b));
+ if (ao !== bo) return ao - bo;
+ return protoInstance(a) - protoInstance(b);
+ });
+ }
+
+ function updateConnectDomainSection() {
+ const section = document.getElementById('connectDomainSection');
+ if (!section) return;
+ const show = hasWgAwgInstalled();
+ section.classList.toggle('hidden', !show);
+ if (!show) return;
+ const select = document.getElementById('connectDomainProto');
+ if (!select) return;
+ const prev = select.value;
+ const installed = listInstalledWgAwgProtocols();
+ select.innerHTML = `