ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

merga all environment variables into nuxt.env

Browse Source
This commit is contained in:
Moriz Wahl 2021-03-19 11:33:39 +01:00
parent e54763cddf
commit 68c8ab9e3f
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/PageFooter/PageFooter.vue
View File

@ -31,7 +31,7 @@
import links from '~/constants/links.js' import links from '~/constants/links.js'
export default { export default {
data() { data() {
return { links, version: `v${this.$env.RELEASE}` } return { links, version: `v${this.$env.VERSION}` }
}, },
} }
</script> </script>

2
webapp/config/index.js
View File

@ -29,7 +29,7 @@ const options = {
VERSION: process.env.VERSION || pkg.version, VERSION: process.env.VERSION || pkg.version,
DESCRIPTION: process.env.DESCRIPTION || pkg.description, DESCRIPTION: process.env.DESCRIPTION || pkg.description,
PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION === 'true' || false, PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION === 'true' || false,
INVITE_REGISTRATION: process.env.INVITE_REGISTRATION !== 'false', //default = true INVITE_REGISTRATION: process.env.INVITE_REGISTRATION !== 'false', // default = true
// Cookies // Cookies
COOKIE_EXPIRE_TIME: process.env.COOKIE_EXPIRE_TIME || 730, // Two years by default COOKIE_EXPIRE_TIME: process.env.COOKIE_EXPIRE_TIME || 730, // Two years by default
COOKIE_HTTPS_ONLY: process.env.COOKIE_HTTPS_ONLY || process.env.NODE_ENV === 'production', // ensure true in production if not set explicitly COOKIE_HTTPS_ONLY: process.env.COOKIE_HTTPS_ONLY || process.env.NODE_ENV === 'production', // ensure true in production if not set explicitly

4
webapp/nuxt.config.js
View File

@ -27,9 +27,7 @@ export default {
}, },
env: { env: {
RELEASE: CONFIG.VERSION, ...CONFIG,
PUBLIC_REGISTRATION: CONFIG.PUBLIC_REGISTRATION,
INVITE_REGISTRATION: CONFIG.INVITE_REGISTRATION,
// pages which do NOT require a login // pages which do NOT require a login
publicPages: [ publicPages: [
'login', 'login',