From d90c7302e79db115b3d2608d46afa4163ba17e54 Mon Sep 17 00:00:00 2001
From: Nikola Petrov <nikolape7@gmail.com>
Date: Sun, 24 Sep 2023 20:43:52 +0200
Subject: [PATCH] Remove https now handled by nginx
---
app.js | 14 --------
bin/www | 90 ----------------------------------------------------
package.json | 4 +--
3 files changed, 2 insertions(+), 106 deletions(-)
delete mode 100644 bin/www
diff --git a/app.js b/app.js
index 4ab6de2..b0676b4 100644
--- a/app.js
+++ b/app.js
@@ -4,20 +4,10 @@ var path = require('path');
var cookieParser = require('cookie-parser');
var logger = require('morgan');
const http = require('http');
-const https = require('https');
-const fs = require('fs');
const hostname = 'petrov.nexus';
const httpPort = 4080;
-//const httpsPort = 443;
-// const httpsOptions = {
-// key: fs.readFileSync('./archive/server.key'),
-// cert: fs.readFileSync('./archive/petrov_nexus.crt'),
-// ca: fs.readFileSync('./archive/petrov_nexus.ca-bundle')
-// };
-
-// vključimo mongoose in ga povežemo z MongoDB
var mongoose = require('mongoose');
var mongoDB = "mongodb://127.0.0.1/my_database";
mongoose.connect(mongoDB);
@@ -30,7 +20,6 @@ db.on('error', console.error.bind(console, 'MongoDB connection error:'));
var app = express();
const httpServer = http.createServer(app);
-//const httpsServer = https.createServer(httpsOptions, app);
// view engine setup
app.set('views', path.join(__dirname, 'views'));
@@ -67,8 +56,5 @@ app.use(function (err, req, res, next) {
httpServer.listen(httpPort, () => {
console.log(`Server running at http://${hostname}:${httpPort}/`);
});
-// httpsServer.listen(httpsPort, () => {
-// console.log(`Server running at https://${hostname}:${httpsPort}/`);
-// });
module.exports = app;
\ No newline at end of file
diff --git a/bin/www b/bin/www
deleted file mode 100644
index 782699f..0000000
--- a/bin/www
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
-
-var app = require('../app');
-var debug = require('debug')('web:server');
-var http = require('http');
-
-/**
- * Get port from environment and store in Express.
- */
-
-// var port = normalizePort(process.env.PORT || '3000');
-// app.set('port', port);
-
-/**
- * Create HTTP server.
- */
-
-var server = http.createServer(app);
-
-/**
- * Listen on provided port, on all network interfaces.
- */
-
-//server.listen(port);
-server.on('error', onError);
-server.on('listening', onListening);
-
-/**
- * Normalize a port into a number, string, or false.
- */
-
-// function normalizePort(val) {
-// var port = parseInt(val, 10);
-
-// if (isNaN(port)) {
-// // named pipe
-// return val;
-// }
-
-// if (port >= 0) {
-// // port number
-// return port;
-// }
-
-// return false;
-// }
-
-/**
- * Event listener for HTTP server "error" event.
- */
-
-function onError(error) {
- if (error.syscall !== 'listen') {
- throw error;
- }
-
- var bind = typeof port === 'string'
- ? 'Pipe ' + port
- : 'Port ' + port;
-
- // handle specific listen errors with friendly messages
- switch (error.code) {
- case 'EACCES':
- console.error(bind + ' requires elevated privileges');
- process.exit(1);
- break;
- case 'EADDRINUSE':
- console.error(bind + ' is already in use');
- process.exit(1);
- break;
- default:
- throw error;
- }
-}
-
-/**
- * Event listener for HTTP server "listening" event.
- */
-
-function onListening() {
- var addr = server.address();
- var bind = typeof addr === 'string'
- ? 'pipe ' + addr
- : 'port ' + addr.port;
- debug('Listening on ' + bind);
-}
diff --git a/package.json b/package.json
index 518a4f5..c456875 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
"version": "0.0.0",
"private": true,
"scripts": {
- "start": "node ./bin/www",
- "dev": "nodemon ./bin/www"
+ "start": "node ./app.js",
+ "dev": "nodemon ./app.js"
},
"dependencies": {
"connect-mongo": "^5.0.0",