removing superfluous controllers

This commit is contained in:
Martin McKeaveney 2021-06-01 20:22:56 +01:00
parent aacaca3d4e
commit e927f44c12
6 changed files with 6 additions and 37 deletions

View File

@ -65,20 +65,6 @@ services:
volumes: volumes:
- redis_data:/data - redis_data:/data
watchtower-service:
image: containrrr/watchtower
volumes:
- /var/run/docker.sock:/var/run/docker.sock
command: --debug --http-api-update budibase/apps budibase/worker
environment:
- WATCHTOWER_HTTP_API=true
- WATCHTOWER_HTTP_API_TOKEN=budibase
- WATCHTOWER_CLEANUP=true
labels:
- "com.centurylinklabs.watchtower.enable=false"
ports:
- 6161:8080
volumes: volumes:
couchdb3_data: couchdb3_data:
driver: local driver: local

View File

@ -21,6 +21,10 @@ static_resources:
cluster: app-service cluster: app-service
prefix_rewrite: "/" prefix_rewrite: "/"
- match: { path: "/v1/update" }
route:
cluster: watchtower-service
- match: { prefix: "/builder/" } - match: { prefix: "/builder/" }
route: route:
cluster: app-service cluster: app-service
@ -38,11 +42,6 @@ static_resources:
route: route:
cluster: worker-service cluster: worker-service
- match: { prefix: "/v1/update" }
route:
cluster: watchtower-service
- match: { path: "/" } - match: { path: "/" }
route: route:
cluster: app-service cluster: app-service

View File

@ -1,10 +1,4 @@
module.exports = async (ctx, next) => { module.exports = async (ctx, next) => {
ctx.log.info({ // Placeholder for audit log middleware
userId: ctx.user && ctx.user._id,
ip: ctx.ip,
url: ctx.originalUrl,
origin: ctx.origin,
method: ctx.method,
})
return next() return next()
} }

View File

@ -26,7 +26,6 @@
"@koa/router": "^8.0.0", "@koa/router": "^8.0.0",
"aws-sdk": "^2.811.0", "aws-sdk": "^2.811.0",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"dockerode": "^3.3.0",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"got": "^11.8.1", "got": "^11.8.1",
"joi": "^17.4.0", "joi": "^17.4.0",

View File

@ -1,9 +0,0 @@
const Router = require("@koa/router")
const controller = require("../../controllers/admin/updates")
const adminOnly = require("../../../middleware/adminOnly")
const router = Router()
router.get("/api/admin/update", adminOnly, controller.updateSystem)
module.exports = router