github
/
nginxconfig.io
mirror of https://github.com/digitalocean/nginxconfig.io
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't use duplicated computed value for nginx dir, watch initial value

pull/159/head
MattIPv4 2020-06-11 15:03:52 +01:00
parent 16a860f5ca
commit e4f219a286
7 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nginxconfig/templates/app.vue
View File

@ -139,9 +139,6 @@ THE SOFTWARE.
activeDomains() {
return this.$data.domains.map((domain, index) => [domain, index]).filter(d => d[0] !== null);
},
nginxDir() {
return this.$data.global.nginx.nginxConfigDirectory.computed.replace(/\/+$/, '');
},
confFiles() {
return generators(this.$data.domains.filter(d => d !== null), this.$data.global);
},
@ -217,7 +214,7 @@ THE SOFTWARE.
updateDiff(newConf, oldConf) {
// Calculate the diff & highlight after render
this.$data.confFilesOutput = Object.values(diff(newConf, oldConf)).map(conf => {
const name = `${escape(this.nginxDir)}/${conf[0]}`;
const name = `${escape(this.$data.global.nginx.nginxConfigDirectory.computed)}/${conf[0]}`;
return [
name,
conf[1],

21
src/nginxconfig/templates/domain_sections/https.vue
View File

@ -165,7 +165,7 @@ THE SOFTWARE.
<input v-model="sslCertificate"
class="input"
type="text"
:placeholder="`${nginxDir}/ssl/${$parent.$props.data.server.domain.computed}.crt`"
:placeholder="`${$parent.$parent.$data.global.nginx.nginxConfigDirectory.computed}/ssl/${$parent.$props.data.server.domain.computed}.crt`"
/>
</div>
</div>
@ -182,7 +182,7 @@ THE SOFTWARE.
<input v-model="sslCertificateKey"
class="input"
type="text"
:placeholder="`${nginxDir}/ssl/${$parent.$props.data.server.domain.computed}.key`"
:placeholder="`${$parent.$parent.$data.global.nginx.nginxConfigDirectory.computed}/ssl/${$parent.$props.data.server.domain.computed}.key`"
/>
</div>
</div>
@ -247,28 +247,23 @@ THE SOFTWARE.
};
export default {
name: 'DomainHTTPS', // Component name
display: i18n.common.https, // Display name for tab
key: 'https', // Key for data in parent
delegated: delegatedFromDefaults(defaults), // Data the parent will present here
name: 'DomainHTTPS', // Component name
display: i18n.common.https, // Display name for tab
key: 'https', // Key for data in parent
delegated: delegatedFromDefaults(defaults), // Data the parent will present here
components: {
PrettyCheck,
PrettyRadio,
},
props: {
data: Object, // Data delegated back to us from parent
data: Object, // Data delegated back to us from parent
},
data () {
return {
i18n,
};
},
computed: {
...computedFromDefaults(defaults, 'https'), // Getters & setters for the delegated data
nginxDir() {
return this.$parent.$parent.$data.global.nginx.nginxConfigDirectory.computed.replace(/\/+$/, '');
},
},
computed: computedFromDefaults(defaults, 'https'), // Getters & setters for the delegated data
watch: {
// Disable everything if https is disabled
'$props.data.https': {

11
src/nginxconfig/templates/global_sections/nginx.vue
View File

@ -128,6 +128,7 @@ THE SOFTWARE.
const defaults = {
nginxConfigDirectory: {
default: '/etc/nginx/',
computed: '/etc/nginx', // We use a watcher to trim trailing slashes
enabled: true,
},
workerProcesses: {
@ -170,6 +171,16 @@ THE SOFTWARE.
},
computed: computedFromDefaults(defaults, 'nginx'), // Getters & setters for the delegated data
watch: {
// Clean nginx directory of trailing slashes
'$props.data.nginxConfigDirectory': {
handler(data) {
// This might cause recursion, but seems not to
if (data.enabled)
if (data.computed.endsWith('/'))
data.computed = data.computed.replace(/\/+$/, '');
},
deep: true,
},
// Check worker processes selection is valid
'$props.data.workerProcesses': {
handler(data) {

5
src/nginxconfig/templates/setup.vue
View File

@ -94,9 +94,6 @@ THE SOFTWARE.
if (index >= 0) return tabs[index];
return false;
},
nginxDir() {
return this.$props.data.global.nginx.nginxConfigDirectory.computed.replace(/\/+$/, '');
},
tarName() {
const domains = this.$props.data.domains.filter(d => d !== null).map(d => d.server.domain.computed);
return `nginxconfig.io-${domains.join(',')}.tar.gz`;
@ -149,7 +146,7 @@ THE SOFTWARE.
// Convert it to base64 string
const b64 = btoa(String.fromCharCode(...contents));
return `echo '${b64}' | base64 --decode > ${this.nginxDir}/${this.tarName}`;
return `echo '${b64}' | base64 --decode > ${this.$props.data.global.nginx.nginxConfigDirectory.computed}/${this.tarName}`;
},
setupCopy() {
const originalText = this.$refs.copyTar.textContent;

8
src/nginxconfig/templates/setup_sections/certbot.vue
View File

@ -113,9 +113,6 @@ THE SOFTWARE.
};
},
computed: {
nginxDir() {
return this.$props.data.global.nginx.nginxConfigDirectory.computed.replace(/\/+$/, '');
},
letsEncryptDir() {
return this.$props.data.global.https.letsEncryptRoot.computed.replace(/\/+$/, '');
},
@ -128,12 +125,13 @@ THE SOFTWARE.
return false;
},
sitesAvailable() {
if (!this.$props.data.global.tools.modularizedStructure.computed) return `${this.nginxDir}/nginx.conf`;
if (!this.$props.data.global.tools.modularizedStructure.computed)
return `${this.$props.data.global.nginx.nginxConfigDirectory.computed}/nginx.conf`;
const enabledAvailable = this.$props.data.global.tools.symlinkVhost.computed ? 'available' : 'enabled';
return this.$props.data.domains
.filter(domain => domain.https.certType.computed === 'letsEncrypt')
.map(domain => `${this.nginxDir}/sites-${enabledAvailable}/${domain.server.domain.computed}.conf`)
.map(domain => `${this.$props.data.global.nginx.nginxConfigDirectory.computed}/sites-${enabledAvailable}/${domain.server.domain.computed}.conf`)
.join(' ');
},
certbotCmds() {

6
src/nginxconfig/templates/setup_sections/download.vue
View File

@ -33,7 +33,7 @@ THE SOFTWARE.
<b>&nbsp;<a @click="$parent.downloadTar">{{ $parent.tarName }}</a></b>
<br />
<span v-html="i18n.templates.setupSections.download.andUploadItToYourServers"></span>
<code class="slim">{{ $parent.nginxDir }}</code>
<code class="slim">{{ $props.data.global.nginx.nginxConfigDirectory.computed }}</code>
{{ i18n.templates.setupSections.download.directory }}
</p>
<p>
@ -50,7 +50,9 @@ THE SOFTWARE.
<p>
<span v-html="i18n.templates.setupSections.download.navigateToYourNginxConfigurationDirectoryOnYourServer"></span>
<br />
<BashPrism :key="$parent.nginxDir" :cmd="`cd ${$parent.nginxDir}`"></BashPrism>
<BashPrism :key="$props.data.global.nginx.nginxConfigDirectory.computed"
:cmd="`cd ${$props.data.global.nginx.nginxConfigDirectory.computed}`"
></BashPrism>
</p>
</li>

7
src/nginxconfig/templates/setup_sections/ssl.vue
View File

@ -31,8 +31,8 @@ THE SOFTWARE.
<p>
<span v-html="i18n.templates.setupSections.ssl.generateDiffieHellmanKeysByRunningThisCommandOnYourServer"></span>
<br />
<BashPrism :key="`${nginxDir}-${diffieHellmanValue}`"
:cmd="`openssl dhparam -out ${nginxDir}/dhparam.pem ${diffieHellmanValue}`"
<BashPrism :key="`${$props.data.global.nginx.nginxConfigDirectory.computed}-${diffieHellmanValue}`"
:cmd="`openssl dhparam -out ${$props.data.global.nginx.nginxConfigDirectory.computed}/dhparam.pem ${diffieHellmanValue}`"
></BashPrism>
</p>
</li>
@ -83,9 +83,6 @@ THE SOFTWARE.
};
},
computed: {
nginxDir() {
return this.$props.data.global.nginx.nginxConfigDirectory.computed.replace(/\/+$/, '');
},
letsEncryptDir() {
return this.$props.data.global.https.letsEncryptRoot.computed.replace(/\/+$/, '');
},