diff --git a/src/nginxconfig/templates/domain_sections/onion.vue b/src/nginxconfig/templates/domain_sections/onion.vue index 1058c9d..050c974 100644 --- a/src/nginxconfig/templates/domain_sections/onion.vue +++ b/src/nginxconfig/templates/domain_sections/onion.vue @@ -102,6 +102,8 @@ THE SOFTWARE. watch: { '$props.data.onionLocation': { handler(data) { + data.computed = data.computed.replace(//, '>'); // Drop http(s):// data.computed = data.computed.replace(/^https?:\/\//, ''); }, diff --git a/src/nginxconfig/templates/domain_sections/server.vue b/src/nginxconfig/templates/domain_sections/server.vue index 563cb75..289c149 100644 --- a/src/nginxconfig/templates/domain_sections/server.vue +++ b/src/nginxconfig/templates/domain_sections/server.vue @@ -208,7 +208,9 @@ THE SOFTWARE. watch: { '$props.data.domain': { handler(data) { - data.computed = data.computed.replace(/<.+>/, ''); + data.computed = data.computed.replace(//, '>'); + // Ignore www. if given, enable WWW subdomain if (data.computed.startsWith('www.')) { data.computed = data.computed.slice(4); @@ -244,7 +246,9 @@ THE SOFTWARE. // Ensure there is a default path '$props.data.path': { handler(data) { - data.computed = data.computed.replace(/<.+>/, ''); + data.computed = data.computed.replace(//, '>'); + if (!data.computed.trim()) { data.computed = `/var/www/${this.$props.data.domain.computed}`; } @@ -253,19 +257,22 @@ THE SOFTWARE. }, '$props.data.documentRoot': { handler(data) { - data.computed = data.computed.replace(/<.+>/, ''); + data.computed = data.computed.replace(//, '>'); }, deep: true, }, '$props.data.listenIpv4': { handler(data) { - data.computed = data.computed.replace(/<.+>/, ''); + data.computed = data.computed.replace(//, '>'); }, deep: true, }, '$props.data.listenIpv6': { handler(data) { - data.computed = data.computed.replace(/<.+>/, ''); + data.computed = data.computed.replace(//, '>'); }, deep: true, }, diff --git a/src/nginxconfig/templates/global_sections/https.vue b/src/nginxconfig/templates/global_sections/https.vue index 74cc4af..a1b92e2 100644 --- a/src/nginxconfig/templates/global_sections/https.vue +++ b/src/nginxconfig/templates/global_sections/https.vue @@ -374,7 +374,8 @@ THE SOFTWARE. }, '$props.data.letsEncryptCertRoot': { handler(data) { - data.computed = data.computed.replace(/<.+>/, ''); + data.computed = data.computed.replace(//, '>'); }, deep: true, },