calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-06-01 13:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:fosrl/pangolin into dev

Browse Source
This commit is contained in:
Owen
2026-04-24 15:13:25 -07:00
parent 48ddc700a0 99f9b68efe
commit 593a7fdd69
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
messages/en-US.json
View File

@@ -3158,7 +3158,7 @@
"uptimeNoData": "No data", "uptimeNoData": "No data",
"uptimeMiniBarDown": "Down", "uptimeMiniBarDown": "Down",
"uptimeSectionTitle": "Uptime", "uptimeSectionTitle": "Uptime",
"uptimeSectionDescription": "Site availability over the last {days} days.", "uptimeSectionDescription": "Availability over the last {days} days",
"uptimeAddAlert": "Add Alert", "uptimeAddAlert": "Add Alert",
"uptimeViewAlerts": "View Alerts", "uptimeViewAlerts": "View Alerts",
"uptimeCreateEmailAlert": "Create Email Alert", "uptimeCreateEmailAlert": "Create Email Alert",

6
server/private/routers/ssh/signSshKey.ts
View File

@@ -368,8 +368,8 @@ export async function signSshKey(
const parsedSudoCommands: string[] = []; const parsedSudoCommands: string[] = [];
const parsedGroupsSet = new Set<string>(); const parsedGroupsSet = new Set<string>();
let homedir: boolean | null = null; let homedir: boolean | null = null;
const sudoModeOrder = { none: 0, commands: 1, all: 2 }; const sudoModeOrder = { none: 0, commands: 1, full: 2 };
let sudoMode: "none" | "commands" | "all" = "none"; let sudoMode: "none" | "commands" | "full" = "none";
for (const roleRow of roleRows) { for (const roleRow of roleRows) {
try { try {
const cmds = JSON.parse(roleRow?.sshSudoCommands ?? "[]"); const cmds = JSON.parse(roleRow?.sshSudoCommands ?? "[]");
@@ -386,7 +386,7 @@ export async function signSshKey(
if (roleRow?.sshCreateHomeDir === true) homedir = true; if (roleRow?.sshCreateHomeDir === true) homedir = true;
const m = roleRow?.sshSudoMode ?? "none"; const m = roleRow?.sshSudoMode ?? "none";
if (sudoModeOrder[m as keyof typeof sudoModeOrder] > sudoModeOrder[sudoMode]) { if (sudoModeOrder[m as keyof typeof sudoModeOrder] > sudoModeOrder[sudoMode]) {
sudoMode = m as "none" | "commands" | "all"; sudoMode = m as "none" | "commands" | "full";
} }
} }
const parsedGroups = Array.from(parsedGroupsSet); const parsedGroups = Array.from(parsedGroupsSet);