From 42dec2b87d3abb1c985488cf038ce93e8a87a080 Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Mon, 21 Oct 2024 15:34:34 +0200 Subject: [PATCH] calc ram option value from daemon option --- hsarback/database/database_update.sql | 21 ++----------------- hsarback/pom.xml | 6 +++--- .../hsadmin/servlets/JsonPillarServlet.java | 13 ++++++++++++ hsarback/src/main/webapp/META-INF/context.xml | 18 ++++++++++++++-- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/hsarback/database/database_update.sql b/hsarback/database/database_update.sql index e3398af..0001abc 100644 --- a/hsarback/database/database_update.sql +++ b/hsarback/database/database_update.sql @@ -1,19 +1,2 @@ - -ALTER TABLE domain - ADD COLUMN passenger_python character varying(256) DEFAULT '/usr/bin/python3', - ADD COLUMN passenger_nodejs character varying(256) DEFAULT '/usr/bin/node', - ADD COLUMN passenger_ruby character varying(256) DEFAULT '/usr/bin/ruby', - ADD COLUMN fcgi_php_bin character varying(256) DEFAULT '/usr/lib/cgi-bin/php'; - -INSERT INTO domain_option (domain_option_name) VALUES - ('passenger'), - ('passengerfriendlyerrorpages'), - ('cgi'), - ('fastcgi'); - -INSERT INTO domain__domain_option ( domain_option_id, domain_id ) - SELECT ( SELECT domain_option_id FROM domain_option WHERE domain_option_name='cgi' ), domain_id FROM domain; -INSERT INTO domain__domain_option ( domain_option_id, domain_id ) - SELECT ( SELECT domain_option_id FROM domain_option WHERE domain_option_name='fastcgi' ), domain_id FROM domain; -INSERT INTO domain__domain_option ( domain_option_id, domain_id ) - SELECT ( SELECT domain_option_id FROM domain_option WHERE domain_option_name='passenger' ), domain_id FROM domain; +INSERT INTO component ( basepacket_id, basecomponent_id, admin_only, article_number, min_quantity, max_quantity, default_quantity, increment_quantity, include_quantity ) + SELECT basepacket_id, basecomponent_id, false, 1023, 128, 10240, 128, 64, 0 from basepacket, basecomponent where basepacket_code='PAC/WEB' and basecomponent_code='RAM'; \ No newline at end of file diff --git a/hsarback/pom.xml b/hsarback/pom.xml index 290d540..5516eeb 100644 --- a/hsarback/pom.xml +++ b/hsarback/pom.xml @@ -5,7 +5,7 @@ de.hsadmin hsar war - 4.0.15 + 4.0.16 HSAdmin Stable Backend Webapp http://maven.apache.org @@ -36,12 +36,12 @@ de.hsadmin.core hsadmin-util - 4.0.15 + 4.0.16 de.hsadmin.core hsadmin-qserv - 4.0.15 + 4.0.16 commons-httpclient diff --git a/hsarback/src/main/java/de/hsadmin/servlets/JsonPillarServlet.java b/hsarback/src/main/java/de/hsadmin/servlets/JsonPillarServlet.java index c6a76de..3e6b25a 100644 --- a/hsarback/src/main/java/de/hsadmin/servlets/JsonPillarServlet.java +++ b/hsarback/src/main/java/de/hsadmin/servlets/JsonPillarServlet.java @@ -200,6 +200,19 @@ public class JsonPillarServlet extends HttpServlet { int storage = pacStorage.getQuantity(); writer.println(" , \"storage\": " + storage); } + final PacComponent pacDaemons = pac.getPacComponent("DAEMON"); + int daemon = 0; + int ram = 16; + if (pacDaemons != null && pacDaemons.getQuantity() > 0) { + daemon = pacDaemons.getQuantity(); + ram = daemon * 640; + } + writer.println(" , \"daemon\": " + daemon); + final PacComponent pacRAM = pac.getPacComponent("RAM"); + if (pacRAM != null) { + ram = pacRAM.getQuantity(); + } + writer.println(" , \"ram\": " + ram); final PacComponent pacOffice = pac.getPacComponent("OFFICE"); if (pacOffice != null) { int office = pacOffice.getQuantity(); diff --git a/hsarback/src/main/webapp/META-INF/context.xml b/hsarback/src/main/webapp/META-INF/context.xml index 808ab2b..686174a 100644 --- a/hsarback/src/main/webapp/META-INF/context.xml +++ b/hsarback/src/main/webapp/META-INF/context.xml @@ -1,5 +1,9 @@ + + + + + +