temp fix lastPull server
This commit is contained in:
@@ -2,3 +2,4 @@ GITHUB_CLIENT_ID=
|
|||||||
GITHUB_CLIENT_SECRET=
|
GITHUB_CLIENT_SECRET=
|
||||||
SESSION_SECRET=
|
SESSION_SECRET=
|
||||||
APP_URL=http://exemple:8080
|
APP_URL=http://exemple:8080
|
||||||
|
APP_PORT=8080
|
||||||
2
index.js
2
index.js
@@ -82,6 +82,6 @@ app.use('/auth/', require('./routes/auth.route'));
|
|||||||
app.use('/keys/', require('./routes/keys.route'));
|
app.use('/keys/', require('./routes/keys.route'));
|
||||||
app.use('/endpoint', require('./routes/endpoint.route'))
|
app.use('/endpoint', require('./routes/endpoint.route'))
|
||||||
|
|
||||||
app.listen(8080, () => {
|
app.listen(process.env.APP_PORT, () => {
|
||||||
console.log("running");
|
console.log("running");
|
||||||
})
|
})
|
||||||
@@ -12,11 +12,19 @@ var router = express.Router();
|
|||||||
|
|
||||||
router.get("/", (req, res) => {
|
router.get("/", (req, res) => {
|
||||||
try {
|
try {
|
||||||
|
// pas très propre à edit
|
||||||
|
var lastPullList = {}
|
||||||
Server.findAll().then((servers) => {
|
Server.findAll().then((servers) => {
|
||||||
|
var secret_display = null
|
||||||
|
servers.forEach((server) => {
|
||||||
|
if (server.lastPull != null) {
|
||||||
|
lastPullList[server.hostname] = server.lastPull.toISOString().replace(/T/, ' ').replace(/\..+/, '')
|
||||||
|
} else {
|
||||||
|
lastPullList[server.hostname] = 'never'
|
||||||
|
}
|
||||||
if (req.query.alert === "secretDisplay") {
|
if (req.query.alert === "secretDisplay") {
|
||||||
var tmp = ''
|
var tmp = ''
|
||||||
var secret_display = {}
|
secret_display = {}
|
||||||
servers.forEach((server) => {
|
|
||||||
if (server.hostname === req.query.server) {
|
if (server.hostname === req.query.server) {
|
||||||
secret_display.content = server.tmp
|
secret_display.content = server.tmp
|
||||||
secret_display.url = process.env.APP_URL
|
secret_display.url = process.env.APP_URL
|
||||||
@@ -24,9 +32,9 @@ router.get("/", (req, res) => {
|
|||||||
secret_display.user = server.username
|
secret_display.user = server.username
|
||||||
|
|
||||||
}
|
}
|
||||||
})
|
|
||||||
}
|
}
|
||||||
res.render('admin/servers', { "servers": servers, locals: {secret: secret_display, alert: req.query.alert, alert_type: req.query.type} })
|
})
|
||||||
|
res.render('admin/servers', { "servers": servers, "lastPullList": lastPullList, locals: {secret: secret_display, alert: req.query.alert, alert_type: req.query.type} })
|
||||||
});
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log(e)
|
console.log(e)
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ router.get("/:server", async (req, res) => {
|
|||||||
raw += '# ' + x + '\n' + result[x] + '\n\n'
|
raw += '# ' + x + '\n' + result[x] + '\n\n'
|
||||||
}
|
}
|
||||||
res.send(raw)
|
res.send(raw)
|
||||||
server.lastPull =
|
server.lastPull = new Date()
|
||||||
server.save()
|
server.save()
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -54,7 +54,7 @@
|
|||||||
<td><%= server.ip %></td>
|
<td><%= server.ip %></td>
|
||||||
<td><%= server.username %></td>
|
<td><%= server.username %></td>
|
||||||
|
|
||||||
<td><%= server.lastPull.toISOString().replace(/T/, ' ').replace(/\..+/, '') %> <% if (!server.lastPull) { %>never<% } %></td>
|
<td><%= lastPullList[server.hostname] %></td>
|
||||||
<td style="text-align: right;"> <a class="btn btn-sm btn-danger" href="/admin/servers/delete/<%= server.hostname %>"><i class="far fa-trash-alt"></i></a></td>
|
<td style="text-align: right;"> <a class="btn btn-sm btn-danger" href="/admin/servers/delete/<%= server.hostname %>"><i class="far fa-trash-alt"></i></a></td>
|
||||||
</tr>
|
</tr>
|
||||||
<% }) %>
|
<% }) %>
|
||||||
|
|||||||
Reference in New Issue
Block a user