hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

include unixusers in pillar

Browse Source
This commit is contained in:
Peter Hormanns 2021-08-10 19:36:43 +02:00
parent 607f9f57fb
commit 61357a596e
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java
View File

@ -99,13 +99,33 @@ public class JsonPillarServlet extends HttpServlet {
final PacComponent pacQuota = pac.getPacComponent("QUOTA"); final PacComponent pacQuota = pac.getPacComponent("QUOTA");
if (pacQuota != null) { if (pacQuota != null) {
int quota = pacQuota.getQuantity(); int quota = pacQuota.getQuantity();
writer.println(" , \"quota\": \"" + quota + "\""); writer.println(" , \"quota\": " + quota);
} }
final PacComponent pacOffice = pac.getPacComponent("OFFICE"); final PacComponent pacOffice = pac.getPacComponent("OFFICE");
if (pacOffice != null) { if (pacOffice != null) {
int office = pacOffice.getQuantity(); int office = pacOffice.getQuantity();
writer.println(" , \"office\": \"" + office + "\""); writer.println(" , \"office\": \"" + office + "\"");
} }
writer.println(" , \"users\": [");
boolean firstLoopUsers = true;
final Set<UnixUser> users = pac.getUnixUser();
for (UnixUser user: users) {
if (firstLoopUsers) {
firstLoopUsers = false;
writer.println(" {");
} else {
writer.println(" , {");
}
writer.println(" \"user\": \"" + user.getName() + "\"");
writer.println(" , \"uid\": " + user.getUserId());
writer.println(" , \"comment\": \"" + user.getComment() + "\"");
writer.println(" , \"shell\": \"" + user.getShell() + "\"");
writer.println(" , \"homedir\": \"" + user.getHomedir() + "\"");
writer.println(" , \"quota_soft\": " + user.getQuotaSoftlimit());
writer.println(" , \"quota_hard\": " + user.getQuotaHardlimit());
writer.println(" }");
}
writer.println(" ]");
writer.println(" }"); writer.println(" }");
} }
writer.println(" ]"); writer.println(" ]");