Skip to content

Commit

Permalink
Merge branch 'release/v1.8.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
GreenPioneer committed Feb 19, 2018
2 parents a57ee9d + 6c6ab86 commit f508e0a
Show file tree
Hide file tree
Showing 10 changed files with 347 additions and 88 deletions.
260 changes: 260 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
# ENVIRONMENT VARIABLES
#
# Recommended: APP_NAME, HTML_TITLE, JWT_SECRET, SESSION_SECRET,
# GOOGLE_ANALYTICS, HTML_META_*, EMAIL_*, SEO_*
#
# See https://github.com/motdotla/dotenv/blob/master/README.md
#=====



# Application
#-----

#NODE_ENV=
# defaults to 'development'
# other supported options include 'test', 'production' or 'nightwatch'

#APP_NAME=
# defaults to 'MeanStackJS'

#HTML_TITLE=
# defaults to 'Development MEANSTACKJS' in development environment
# defaults to 'MEANSTACKJS' in production environment
# defaults to 'Nightwatch E2E MEANSTACKJS' in nightwatch environment
# defaults to 'Test MEANSTACKJS' in test environment

#IP=
# defaults to '0.0.0.0'

#HOST=
# fallsback to HOSTNAME
# defaults to 'localhost'

#JWT_SECRET=
# defaults to 'MEANSTACKJS'

#SESSION_SECRET=
# defaults to 'MEANSTACKJS'

#HTTP_ACTIVE
# defaults to true

#PORT=
# defaults to 3000

#HTTPS_ACTIVE
# defaults to false

#HTTPSPORT=
# defaults to 3043

#HTTPS_KEY
# defaults to './configs/certificates/keyExample.pem'

#HTTPS_CERT
# defaults to './configs/certificates/certExample.pem'


## Minification

#MINIFY=
# defaults to 'default' in development and nightwatch environments
# defaults to 'minify' in production environment
# defaults to 'concat' in test environment


## Database

#DB_PORT_27017_TCP_ADDR=
#MONGODB=
#MONGOLAB_URI=
# defaults to 'mongodb://localhost/dev'


### Mongo Express

#MONGOEXPRESSPORT=
# defaults to 8081


### SocketIO

#SOCKETIOPORT=
# defaults to 8282



# Content Delivery Network
#-----

#CDN
# defaults to false

#MAXCDN_COMPANY_ALIAS=
# defaults to ''

#MAXCDN_CONSUMER_KEY=
# defaults to ''

#MAXCDN_CONSUMER_SECRET=
# defaults to ''

#MAXCDN_ZONE_ID=
# defaults to false



# Google Analytics
#-----

#GOOGLE_ANALYTICS
# defaults to 'UA-71654331-1'



# HTML Meta
#-----

#HTML_META_TITLE=
# defaults to 'Mean Stack JS Demo'

#HTML_META_KEYWORDS=
# defaults to 'MEAN, MEANSTACKJS, mongodb, expressjs, angularjs,no...'

#HTML_META_DESCRIPTION=
# defaults to 'Mean Stack JS was built for ease of use with javas...'

#HTML_META_OG_URL=
# defaults to 'https://meanstackjs.herokuapp.com/'

#HTML_META_OG_TYPE=
# defaults to 'website'

#HTML_META_OG_TITLE=
# defaults to 'Mean Stack JS Demo'

#HTML_META_OG_DESCRIPTION=
# defaults to 'Mean Stack JS was built for ease of use with javasc...'

#HTML_META_OG_IMAGE=
# defaults to 'http://meanstackjs.com/images/logo/header.png'

#HTML_META_FB_APPID=
# defaults to '1610630462580116'

#HTML_META_TWITTER_CREATOR=
# defaults to '@greenpioneerdev'

#HTML_META_TWITTER_CARD=
# defaults to 'summary_large_image'

#HTML_META_TWITTER_TITLE=
# defaults to 'Mean Stack JS Demo'

#HTML_META_TWITTER_DESCRIPTION=
# defaults to 'Mean Stack JS was built for ease of use with javasc...'

#HTML_META_TWITTER_URL=
# defaults to 'https://meanstackjs.herokuapp.com/'

#HTML_META_TWITTER_IMAGE=
# defaults to 'http://meanstackjs.com/images/logo/header.png'

#HTML_META_TWITTER_SITE=
# defaults to '@meanstackjs'

#HTML_META_CANONICAL=
# defaults to 'https://meanstackjs.herokuapp.com/'

#HTML_META_AUTHOR=
# defaults to 'Green Pioneer Solutions'



# Email Configuration
#-----

#EMAIL_FROM=
# defaults to '[email protected]'

#EMAIL_ERROR=
# defaults to '[email protected]'

#EMAIL_HOST=
# defaults to 'smtp.mandrillapp.com'

#EMAIL_PORT=
# defaults to '587'

#EMAIL_USER=
# defaults to 'hackathonstarterdemo'

#EMAIL_PASS=
# defaults to 'E1K950_ydLR4mHw12a0ldA'


## Email Templates

#EMAIL_WELCOME_SUB=
# defaults to 'Welcome to Mean Stack JS'

#EMAIL_WELCOME_TEXT_STRING=
# var username
# defaults to 'Hi ' + username + ',\n\n' + 'Thanks for signing up ...'

#EMAIL_RESET_SUB=
# defaults to 'Reset your password on MEANSTACKJS '

#EMAIL_RESET_TEXT_STRING=
# var email
# defaults to 'Hello,\n\n' + 'This is a confirmation that the pass...'

#EMAIL_FORGOT_SUB=
# defaults to 'Welcome to Mean Stack JS'

#EMAIL_FORGOT_TEXT_STRING=
# var host
# var token
# defaults to 'You are receiving this email because you (or someon...'



# Search Engine Optimization
#-----

#SEO_TITLE=
# defaults to 'Mean Stack JS Demo'

#SEO_404=
# defaults to 'Page Not Found'

#SEO_500=
# defaults to 'Server Side Error'

#SEO_LOG_IN=
# defaults to 'Signin to Mean Stack JS'

#SEO_SIGN_UP=
# defaults to 'Join Mean Stack JS '

#SEO_ACCOUNT=
# defaults to '<%= user.profile.name %> Account'

#SEO_FORGOT=
# defaults to 'Forgot Your Password '

#SEO_RESET=
# defaults to 'reset '

#SEO_CREATE=
# defaults to 'Create a New Blog'

#SEO_EDIT=
# defaults to 'Edit Your Blog'

#SEO_LIST=
# defaults to 'Blog List'

#SEO_TAGS=
# defaults to ['Add', 'Tags', 'To Blog', 'Mean Stack JS']
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: node_js
node_js:
- 4
- 5
- 6
- 7
- 8
- 9
os:
- linux
- centos
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
[![Build Status](https://travis-ci.org/greenpioneersolutions/meanstackjs.svg?branch=master)](https://travis-ci.org/greenpioneersolutions/meanstackjs)
[![Join the chat at https://gitter.im/greenpioneersolutions/meanstackjs](https://badges.gitter.im/greenpioneersolutions/meanstackjs.svg)](https://gitter.im/greenpioneersolutions/meanstackjs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Known Vulnerabilities](https://snyk.io/test/github/greenpioneersolutions/meanstackjs/badge.svg)](https://snyk.io/test/github/greenpioneersolutions/meanstackjs/badge.svg)
[![Codewake](https://www.codewake.com/badges/codewake2.svg)](https://www.codewake.com/p/meanstackjs)
[![Code Triagers Badge](https://www.codetriage.com/greenpioneersolutions/meanstackjs/badges/users.svg)](https://www.codetriage.com/greenpioneersolutions/meanstackjs)
[![Get help on Codementor](https://cdn.codementor.io/badges/get_help_github.svg)](https://www.codementor.io/jasonhumphrey?utm_source=github&utm_medium=button&utm_term=jasonhumphrey&utm_campaign=github)
[![Donatee](https://img.shields.io/badge/paypal-donate-blue.svg)](https://paypal.me/greenpioneer)
Expand Down
12 changes: 6 additions & 6 deletions configs/environments/development.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var mongodbUri = process.env.DB_PORT_27017_TCP_ADDR || process.env.MONGODB || process.env.MONGOLAB_URI || 'mongodb://localhost/dev'
module.exports = {
minify: 'default', // 'concat' all files or 'minify' concat and minfy or 'default' leave as is
minify: process.env.MINIFY || 'default', // 'concat' all files or 'minify' concat and minfy or 'default' leave as is
html: {
title: 'Development MEANSTACKJS'
title: process.env.HTML_TITLE || 'Development MEANSTACKJS'
},
logger: 'dev',
cdn: process.env.CDN || false,
Expand All @@ -19,15 +19,15 @@ module.exports = {
port: process.env.SOCKETIOPORT || 8282
},
http: {
active: true,
active: process.env.HTTP_ACTIVE || true,
port: process.env.PORT || 3000
},
https: {
active: false,
active: process.env.HTTPS_ACTIVE || false,
redirect: true,
port: process.env.HTTPSPORT || 3043,
key: './configs/certificates/keyExample.pem',
cert: './configs/certificates/certExample.pem'
key: process.env.HTTPS_KEY || './configs/certificates/keyExample.pem',
cert: process.env.HTTPS_CERT || './configs/certificates/certExample.pem'
},
throttle: {
rateLimit: {
Expand Down
10 changes: 5 additions & 5 deletions configs/environments/nightwatch.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var mongodbUri = process.env.DB_PORT_27017_TCP_ADDR || process.env.MONGODB || pr
module.exports = {
minify: process.env.MINIFY || 'default', // 'concat' all files or 'minify' concat and minfy or 'default' leave as is - Added process env for testing
html: {
title: 'Nightwatch E2E MEANSTACKJS'
title: process.env.HTML_TITLE || 'Nightwatch E2E MEANSTACKJS'
},
logger: false,
cdn: process.env.CDN || false,
Expand All @@ -19,15 +19,15 @@ module.exports = {
port: process.env.SOCKETIOPORT || 8282
},
http: {
active: true,
active: process.env.HTTP_ACTIVE || true,
port: process.env.PORT || 3000
},
https: {
active: false,
active: process.env.HTTPS_ACTIVE || false,
redirect: true,
port: process.env.HTTPSPORT || 3043,
key: './configs/certificates/keyExample.pem',
cert: './configs/certificates/certExample.pem'
key: process.env.HTTPS_KEY || './configs/certificates/keyExample.pem',
cert: process.env.HTTPS_CERT || './configs/certificates/certExample.pem'
},
throttle: {
rateLimit: {
Expand Down
12 changes: 6 additions & 6 deletions configs/environments/production.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var mongodbUri = process.env.DB_PORT_27017_TCP_ADDR || process.env.MONGODB || process.env.MONGOLAB_URI || 'mongodb://localhost/prod'
module.exports = {
minify: 'minify', // 'concat' all files or 'minify' concat and minfy or 'default' leave as is
minify: process.env.MINIFY || 'minify', // 'concat' all files or 'minify' concat and minfy or 'default' leave as is
html: {
title: 'MEANSTACKJS'
title: process.env.HTML_TITLE || 'MEANSTACKJS'
},
logger: 'combined',
cdn: process.env.CDN || false,
Expand All @@ -19,15 +19,15 @@ module.exports = {
port: process.env.SOCKETIOPORT || 8282
},
http: {
active: true,
active: process.env.HTTP_ACTIVE || true,
port: process.env.PORT || 3000
},
https: {
active: false,
active: process.env.HTTPS_ACTIVE || false,
redirect: true,
port: process.env.HTTPSPORT || 3043,
key: './configs/certificates/keyExample.pem',
cert: './configs/certificates/certExample.pem'
key: process.env.HTTPS_KEY || './configs/certificates/keyExample.pem',
cert: process.env.HTTPS_CERT || './configs/certificates/certExample.pem'
},
throttle: {
rateLimit: {
Expand Down
Loading

0 comments on commit f508e0a

Please sign in to comment.