Skip to content

Commit

Permalink
update express (butlerx#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
butlerx authored and cbutler committed Jul 9, 2018
1 parent 73633fd commit 987e65b
Show file tree
Hide file tree
Showing 4 changed files with 225 additions and 260 deletions.
1 change: 1 addition & 0 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ process.on('uncaughtException', e => {
let httpserv;

const app = express();
app.use(require('serve-favicon')(`${__dirname}/public/favicon.ico`));
// For using wetty at /wetty on a vhost
app.get('/wetty/ssh/:user', (req, res) => {
res.sendfile(`${__dirname}/public/wetty/index.html`);
Expand Down
21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,23 @@
"name": "wetty",
"version": "0.2.0",
"dependencies": {
"express": "3.5.1",
"socket.io": "^1.3.7",
"express": "^4.15.3",
"optimist": "^0.6",
"pty.js": "^0.3.0",
"optimist": "^0.6"
"serve-favicon": "^2.4.3",
"socket.io": "^1.3.7"
},
"devDependencies": {
"load-grunt-tasks": "^3.0",
"grunt": "^0.4",
"grunt-shell": "^1.1",
"grunt-mkdir": "^0.1",
"grunt-git": "^0.3",
"grunt-contrib-clean": "^0.6",
"eslint": "3.16.1",
"eslint-config-standard": "6.2.1",
"eslint-plugin-promise": "3.5.0",
"eslint-plugin-standard": "2.1.0"
"eslint-plugin-standard": "2.1.0",
"grunt": "^0.4",
"grunt-contrib-clean": "^0.6",
"grunt-git": "^0.3",
"grunt-mkdir": "^0.1",
"grunt-shell": "^1.1",
"load-grunt-tasks": "^3.0"
},
"description": "Wetty = Web + tty. Terminal access in browser over http/https ",
"main": "app.js",
Expand Down
Binary file added public/favicon.ico
Binary file not shown.
Loading

0 comments on commit 987e65b

Please sign in to comment.