Merge branch 'master' of https://github.com/jackycute/HackMD
This commit is contained in:
		
						commit
						c4c9c4fed6
					
				@ -62,8 +62,8 @@ Environment variables
 | 
				
			|||||||
| variables | example values | description |
 | 
					| variables | example values | description |
 | 
				
			||||||
| --------- | ------ | ----------- |
 | 
					| --------- | ------ | ----------- |
 | 
				
			||||||
| NODE_ENV  | `production` or `development` | show current environment status |
 | 
					| NODE_ENV  | `production` or `development` | show current environment status |
 | 
				
			||||||
| DATABASE_URL | `postgresql://localhost:5432/hackmd` | PostgreSQL connection string |
 | 
					| DATABASE_URL | `postgresql://user:pass@host:port/hackmd` | PostgreSQL connection string |
 | 
				
			||||||
| MONGOLAB_URI | `mongodb://localhost/hackmd` | MongoDB connection string |
 | 
					| MONGOLAB_URI | `mongodb://user:pass@host:port/hackmd` | MongoDB connection string |
 | 
				
			||||||
| PORT | `80` | web port |
 | 
					| PORT | `80` | web port |
 | 
				
			||||||
| SSLPORT | `443` | ssl web port |
 | 
					| SSLPORT | `443` | ssl web port |
 | 
				
			||||||
| DOMAIN | `localhost` | domain name |
 | 
					| DOMAIN | `localhost` | domain name |
 | 
				
			||||||
@ -84,8 +84,8 @@ Server-side config.js settings
 | 
				
			|||||||
| sslcertpath | `./cert/hackmd_io.crt` | ssl cert path |
 | 
					| sslcertpath | `./cert/hackmd_io.crt` | ssl cert path |
 | 
				
			||||||
| sslcapath | `['./cert/COMODORSAAddTrustCA.crt']` | ssl ca chain |
 | 
					| sslcapath | `['./cert/COMODORSAAddTrustCA.crt']` | ssl ca chain |
 | 
				
			||||||
| tmppath | `./tmp/` | temp file path |
 | 
					| tmppath | `./tmp/` | temp file path |
 | 
				
			||||||
| postgresqlstring | `postgresql://localhost:5432/hackmd` | PostgreSQL connection string, fallback to this when not set in environment |
 | 
					| postgresqlstring | `postgresql://user:pass@host:port/hackmd` | PostgreSQL connection string, fallback to this when not set in environment |
 | 
				
			||||||
| mongodbstring | `mongodb://localhost/hackmd` | MongoDB connection string, fallback to this when not set in environment |
 | 
					| mongodbstring | `mongodb://user:pass@host:port/hackmd` | MongoDB connection string, fallback to this when not set in environment |
 | 
				
			||||||
| sessionname | `connect.sid` | cookie session name |
 | 
					| sessionname | `connect.sid` | cookie session name |
 | 
				
			||||||
| sessionsecret | `secret` | cookie session secret |
 | 
					| sessionsecret | `secret` | cookie session secret |
 | 
				
			||||||
| sessionlife | `14 * 24 * 60 * 60 * 1000` | cookie session life |
 | 
					| sessionlife | `14 * 24 * 60 * 60 * 1000` | cookie session life |
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user