Browse Source
Merge pull request #989 from Budibase/bug/self-host-logo-removal
Remove logo customisation feature from self hosting
gh-pages
Michael Drury
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
1 additions and
16 deletions
-
hosting/docker-compose.yaml
-
hosting/hosting.properties
-
packages/server/src/environment.js
-
packages/server/src/utilities/index.js
|
|
|
@ -9,7 +9,6 @@ services: |
|
|
|
SELF_HOSTED: 1 |
|
|
|
COUCH_DB_URL: http://${COUCH_DB_USER}:${COUCH_DB_PASSWORD}@couchdb-service:5984 |
|
|
|
BUDIBASE_ENVIRONMENT: ${BUDIBASE_ENVIRONMENT} |
|
|
|
LOGO_URL: ${LOGO_URL} |
|
|
|
PORT: 4002 |
|
|
|
JWT_SECRET: ${JWT_SECRET} |
|
|
|
depends_on: |
|
|
|
|
|
|
|
@ -5,9 +5,6 @@ MAIN_PORT=10000 |
|
|
|
# This should be updated |
|
|
|
HOSTING_KEY=budibase |
|
|
|
|
|
|
|
# This section contains customisation options |
|
|
|
LOGO_URL=https://logoipsum.com/logo/logo-15.svg |
|
|
|
|
|
|
|
# This section contains all secrets pertaining to the system |
|
|
|
# These should be updated |
|
|
|
JWT_SECRET=testsecret |
|
|
|
|
|
|
|
@ -36,8 +36,6 @@ module.exports = { |
|
|
|
ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS, |
|
|
|
DEPLOYMENT_DB_URL: process.env.DEPLOYMENT_DB_URL, |
|
|
|
LOCAL_TEMPLATES: process.env.LOCAL_TEMPLATES, |
|
|
|
// self hosting features
|
|
|
|
LOGO_URL: process.env.LOGO_URL, |
|
|
|
_set(key, value) { |
|
|
|
process.env[key] = value |
|
|
|
module.exports[key] = value |
|
|
|
|
|
|
|
@ -169,15 +169,6 @@ exports.coerceRowValues = (row, table) => { |
|
|
|
return clonedRow |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* Gets the correct link to the logo URL depending on if running in Cloud or if running in self hosting. |
|
|
|
* @returns {string} A URL which links to the correct default logo for new apps. |
|
|
|
*/ |
|
|
|
exports.getLogoUrl = () => { |
|
|
|
const BB_LOGO_URL = |
|
|
|
"https://d33wubrfki0l68.cloudfront.net/aac32159d7207b5085e74a7ef67afbb7027786c5/2b1fd/img/logo/bb-emblem.svg" |
|
|
|
if (env.SELF_HOSTED) { |
|
|
|
return env.LOGO_URL || BB_LOGO_URL |
|
|
|
} |
|
|
|
return BB_LOGO_URL |
|
|
|
return "https://d33wubrfki0l68.cloudfront.net/aac32159d7207b5085e74a7ef67afbb7027786c5/2b1fd/img/logo/bb-emblem.svg" |
|
|
|
} |
|
|
|
|