From e31aa8a8d9fef96357f18a33940adacecd1ca363 Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 17 Nov 2016 12:58:45 +0100 Subject: Rename app.js -> server.js --- Dockerfile | 2 +- app.js | 55 ------------------------------------------------------- package.json | 2 +- server.js | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ start.sh | 2 +- 5 files changed, 58 insertions(+), 58 deletions(-) delete mode 100755 app.js create mode 100755 server.js diff --git a/Dockerfile b/Dockerfile index d5c7e87..5cdd88c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ADD src /app/code/src ADD app /app/code/app ADD cli /app/code/cli -ADD package.json app.js start.sh README.md /app/code/ +ADD package.json server.js start.sh README.md /app/code/ RUN npm install --production diff --git a/app.js b/app.js deleted file mode 100755 index eaeed17..0000000 --- a/app.js +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env node - -'use strict'; - - -var express = require('express'), - morgan = require('morgan'), - passport = require('passport'), - path = require('path'), - compression = require('compression'), - session = require('express-session'), - bodyParser = require('body-parser'), - cookieParser = require('cookie-parser'), - lastMile = require('connect-lastmile'), - multipart = require('./src/multipart'), - mkdirp = require('mkdirp'), - auth = require('./src/auth.js'), - files = require('./src/files.js')(path.resolve(__dirname, process.argv[2] || 'files')); - -var app = express(); -var router = new express.Router(); - -var multipart = multipart({ maxFieldsSize: 2 * 1024, limit: '512mb', timeout: 3 * 60 * 1000 }); - -router.get ('/api/files/*', auth.verify, files.get); -router.put ('/api/files/*', auth.verify, multipart, files.put); -router.delete('/api/files/*', auth.verify, files.del); -router.get ('/api/healthcheck', function (req, res) { res.status(200).send(); }); - -// welcome screen in case / does not serve up any file yet -router.get('/', function (req, res) { res.status(200).sendFile(path.join(__dirname, '/app/welcome.html')); }); - -app.use(morgan('dev')); -app.use(compression()); -app.use('/_admin', express.static(__dirname + '/app')); -app.use(express.static(path.resolve(__dirname, process.argv[2] || 'files'))); -app.use(bodyParser.json()); -app.use(bodyParser.urlencoded({ extended: false, limit: '100mb' })); -app.use(cookieParser()); -app.use(session({ secret: 'surfin surfin', resave: false, saveUninitialized: false })); -app.use(passport.initialize()); -app.use(passport.session()); -app.use(router); -app.use(lastMile()); - -var server = app.listen(3000, function () { - var host = server.address().address; - var port = server.address().port; - - var basePath = path.resolve(__dirname, process.argv[2] || 'files'); - mkdirp.sync(basePath); - - console.log('Surfer listening at http://%s:%s', host, port); - console.log('Using base path', basePath); -}); diff --git a/package.json b/package.json index 5732fcd..335b1ca 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cloudron-surfer", "version": "3.0.0", "description": "Simple file server", - "main": "app.js", + "main": "server.js", "scripts": { "test": "./node_modules/mocha/bin/_mocha -R spec ./test/test.js" }, diff --git a/server.js b/server.js new file mode 100755 index 0000000..eaeed17 --- /dev/null +++ b/server.js @@ -0,0 +1,55 @@ +#!/usr/bin/env node + +'use strict'; + + +var express = require('express'), + morgan = require('morgan'), + passport = require('passport'), + path = require('path'), + compression = require('compression'), + session = require('express-session'), + bodyParser = require('body-parser'), + cookieParser = require('cookie-parser'), + lastMile = require('connect-lastmile'), + multipart = require('./src/multipart'), + mkdirp = require('mkdirp'), + auth = require('./src/auth.js'), + files = require('./src/files.js')(path.resolve(__dirname, process.argv[2] || 'files')); + +var app = express(); +var router = new express.Router(); + +var multipart = multipart({ maxFieldsSize: 2 * 1024, limit: '512mb', timeout: 3 * 60 * 1000 }); + +router.get ('/api/files/*', auth.verify, files.get); +router.put ('/api/files/*', auth.verify, multipart, files.put); +router.delete('/api/files/*', auth.verify, files.del); +router.get ('/api/healthcheck', function (req, res) { res.status(200).send(); }); + +// welcome screen in case / does not serve up any file yet +router.get('/', function (req, res) { res.status(200).sendFile(path.join(__dirname, '/app/welcome.html')); }); + +app.use(morgan('dev')); +app.use(compression()); +app.use('/_admin', express.static(__dirname + '/app')); +app.use(express.static(path.resolve(__dirname, process.argv[2] || 'files'))); +app.use(bodyParser.json()); +app.use(bodyParser.urlencoded({ extended: false, limit: '100mb' })); +app.use(cookieParser()); +app.use(session({ secret: 'surfin surfin', resave: false, saveUninitialized: false })); +app.use(passport.initialize()); +app.use(passport.session()); +app.use(router); +app.use(lastMile()); + +var server = app.listen(3000, function () { + var host = server.address().address; + var port = server.address().port; + + var basePath = path.resolve(__dirname, process.argv[2] || 'files'); + mkdirp.sync(basePath); + + console.log('Surfer listening at http://%s:%s', host, port); + console.log('Using base path', basePath); +}); diff --git a/start.sh b/start.sh index 87cec0d..7c78798 100755 --- a/start.sh +++ b/start.sh @@ -6,4 +6,4 @@ export NODE_ENV=production chown -R cloudron:cloudron /app/data -/usr/local/bin/gosu cloudron:cloudron node /app/code/app.js /app/data +/usr/local/bin/gosu cloudron:cloudron node /app/code/server.js /app/data -- cgit v1.2.3