Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion deleter.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const touch = require('touch')
const mkdirp = require('mkdirp')

const config = require('/home/ec2-user/deploy/forge-server/config').config()
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';

// temp folder is used to cache site meta between deploys
// example.com/.forge-meta.json
Expand Down Expand Up @@ -36,7 +37,7 @@ let lastCheckAt = null
try {
lastCheckAt = new Date( fs.readFileSync(lastCheckedAtFile, 'utf-8') )
} catch(err) {
lastCheckAt = moment().subtract(1, 'days').toDate()
lastCheckAt = moment().toDate()
}

logger(`😎 Last check was performed ${moment(lastCheckAt).format('MM.DD HH:mm')}`)
Expand Down
4 changes: 2 additions & 2 deletions src/middlewares/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const fetchMetaByApi = (address, done) => {
*/

// the name of the file with site config
const forgercName = '.forgerc'
const forgercName = 'forgerc.txt'

const fetchMetaOldWay = (address, done) => {
getFileContent(`${address}/index.html`, (err, indexPage) => {
Expand Down Expand Up @@ -90,7 +90,7 @@ const loadSiteMeta = (address, done) => {
let meta = {}
try { meta = JSON.parse(metaContent) } catch(err) { success = false }

if(success) {
if(success && meta.configRaw.trim().length > 0) {
logger(`✅ Meta for site loaded from ${metaFileLocation}`)
return done(null, meta)
}
Expand Down
2 changes: 1 addition & 1 deletion src/middlewares/notFound.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ module.exports = (req, res, next) => {
performRewrite(req, res, () => {

res
.status(404)
.set({ 'Content-Type': 'text/html' })
.status(404)
.send(errorPageContent)

}, '/404.html', 404)
Expand Down
8 changes: 4 additions & 4 deletions src/middlewares/static.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ const middleware = (req, res, next) => {

statusCode = req.context.overwriteStatus || response.statusCode

res.writeHead(statusCode, {
'content-type': response.headers['content-type']
})

response.on('data', chunk => {
if (response.headers['content-encoding'] == 'gzip')
{
Expand All @@ -114,6 +110,10 @@ const middleware = (req, res, next) => {
}
});

res.writeHead(statusCode, {
'content-type': response.headers['content-type']
})

response.on('end', () => res.end())
}).end()
}
Expand Down
1 change: 1 addition & 0 deletions src/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const { config } = require('./env')
const logger = require('./logger')

let app = express()
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';

app.use(require('./middlewares/common'))
app.use(require('./middlewares/expired'))
Expand Down