diff --git a/assets/favicon.ico b/assets/favicon.ico deleted file mode 100644 index f9f38493b..000000000 Binary files a/assets/favicon.ico and /dev/null differ diff --git a/src/paths.js b/src/paths.js index 944b37f4a..31936c003 100644 --- a/src/paths.js +++ b/src/paths.js @@ -28,7 +28,5 @@ exports = module.exports = { CLOUDRON_AVATAR_FILE: path.join(config.baseDir(), 'data/box/avatar.png'), CLOUDRON_DEFAULT_AVATAR_FILE: path.join(__dirname + '/../assets/avatar.png'), - FAVICON_FILE: path.join(__dirname + '/../assets/favicon.ico'), - UPDATE_CHECKER_FILE: path.join(config.baseDir(), 'data/box/updatechecker.json') }; diff --git a/src/routes/test/settings-test.js b/src/routes/test/settings-test.js index db948a8bb..c95eba93a 100644 --- a/src/routes/test/settings-test.js +++ b/src/routes/test/settings-test.js @@ -215,7 +215,7 @@ describe('Settings API', function () { it('set succeeds', function (done) { request.post(SERVER_URL + '/api/v1/settings/cloudron_avatar') .query({ access_token: token }) - .attach('avatar', paths.FAVICON_FILE) + .attach('avatar', paths.CLOUDRON_DEFAULT_AVATAR_FILE) .end(function (err, res) { expect(res.statusCode).to.equal(202); done(); @@ -227,7 +227,7 @@ describe('Settings API', function () { .query({ access_token: token }) .end(function (err, res) { expect(res.statusCode).to.equal(200); - expect(res.body.toString()).to.eql(fs.readFileSync(paths.FAVICON_FILE, 'utf-8')); + expect(res.body.toString()).to.eql(fs.readFileSync(paths.CLOUDRON_DEFAULT_AVATAR_FILE, 'utf-8')); done(err); }); }); diff --git a/src/server.js b/src/server.js index da05a85ce..f8a3de374 100644 --- a/src/server.js +++ b/src/server.js @@ -53,7 +53,6 @@ function initializeExpressSync() { .use(json) .use(urlencoded) .use(middleware.cookieParser()) - .use(middleware.favicon(paths.FAVICON_FILE)) // used when serving oauth login page .use(middleware.cors({ origins: [ '*' ], allowCredentials: true })) .use(middleware.session({ secret: 'yellow is blue', resave: true, saveUninitialized: true, cookie: { path: '/', httpOnly: true, secure: false, maxAge: 600000 } })) .use(passport.initialize())