hsarback/database/database_update.sql aktualisiert

Align with actual system configuration.

hsarback/database/database_update.sql

@@ -1,19 +1,2 @@
-
+INSERT INTO component ( basepacket_id, basecomponent_id, admin_only, article_number, min_quantity, max_quantity, default_quantity, increment_quantity, include_quantity )
-ALTER TABLE domain  
+    SELECT basepacket_id, basecomponent_id, false, 1012, 0, 102400000, 0, 0, 0 from basepacket, basecomponent where basepacket_code='PAC/WEB' and basecomponent_code='RAM';
-    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;

hsarback/pom.xml

@@ -5,7 +5,7 @@
 	<groupId>de.hsadmin</groupId>
 	<artifactId>hsar</artifactId>
 	<packaging>war</packaging>
-	<version>4.0.15</version>
+	<version>4.0.16</version>
 	<name>HSAdmin Stable Backend Webapp</name>
 	<url>http://maven.apache.org</url>
 	<properties>
@@ -36,12 +36,12 @@
 		<dependency>
 			<groupId>de.hsadmin.core</groupId>
 			<artifactId>hsadmin-util</artifactId>
-			<version>4.0.15</version>
+			<version>4.0.16</version>
 		</dependency>
 		<dependency>
 			<groupId>de.hsadmin.core</groupId>
 			<artifactId>hsadmin-qserv</artifactId>
-			<version>4.0.15</version>
+			<version>4.0.16</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-httpclient</groupId>

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();

hsarback/src/main/webapp/META-INF/context.xml

@@ -1,5 +1,9 @@
 <Context path="/hsar" reloadable="true" crossContext="true">
 
+    <Valve className="org.apache.catalina.valves.ErrorReportValve" 
+        showReport="false"
+        showServerInfo="false" />
+
 	<ResourceLink
 		name="jdbc/HSAdminDB"
 		global="jdbc/HSAdminDB"
@@ -11,8 +15,18 @@
 		type="javax.jms.QueueConnectionFactory"/>
 
 	<ResourceLink
-		name="jms/hsadminSystem-h99"
+		name="jms/hsadminSystem-h96"
-		global="jms/hsadminSystem-h99"
+		global="jms/hsadminSystem-h96"
+		type="javax.jms.Queue"/>
+
+	<ResourceLink
+		name="jms/hsadminSystem-h97"
+		global="jms/hsadminSystem-h97"
+		type="javax.jms.Queue"/>
+
+	<ResourceLink
+		name="jms/hsadminSystem-h98"
+		global="jms/hsadminSystem-h98"
 		type="javax.jms.Queue"/>
 
 	<ResourceLink

qserv/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.hsadmin.core</groupId>
 	<artifactId>hsadmin-qserv</artifactId>
-	<version>4.0.15</version>
+	<version>4.0.16</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>8</java.version>
@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>de.hsadmin.core</groupId>
 			<artifactId>hsadmin-util</artifactId>
-			<version>4.0.15</version>
+			<version>4.0.16</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
@@ -59,7 +59,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.11.0</version>
+				<version>3.13.0</version>
 				<configuration>
 					<source>8</source>
 					<target>8</target>

qserv/src/main/java/de/hsadmin/mods/dom/DomainProcessorFactory.java

@@ -35,7 +35,11 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
 		UnixUser domUser = dom.getUser();
 		Pac pac = domUser.getPac();
 		WaitingTasksProcessor mainProcessor = new WaitingTasksProcessor(
-				new CompoundProcessor(new ShellProcessor("salt-call state.sls pacs"))
+				new CompoundProcessor(
+						new ShellProcessor("salt-call state.sls pacs"),
+						createDomainDirectoriesProcessor(dom),
+						createApacheVHostSetupProcessor(em, dom)
+				)
 			);
 		Config config = Config.getInstance();
 		for (String queueName : config.getProperty("queues.dns").split(",")) {
@@ -44,24 +48,23 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
 		for (String queueName : config.getProperty("queues.mail").split(",")) {
 			mainProcessor.appendProcessor(queueName, createMailinSetupProcessor(em, dom, pac), queueName + ".hostsharing.net");
 		}
-		mainProcessor.appendProcessor(hiveName, createDomainDirectoriesProcessor(dom), "Setup Domain Directories");
-		mainProcessor.appendProcessor(hiveName, createApacheVHostSetupProcessor(em, dom), "Setup Apache VHost");
 		mainProcessor.appendProcessor(hiveName, createTriggerAcmebotProcessor(em, dom), "Trigger ACMEBot");
 		return mainProcessor;
 	}
 
 	public <T extends AbstractEntity> Processor createUpdateProcessor(final EntityManager em, final T entity) throws ProcessorException {
+		String hiveName = entity.getHiveName();
 		final Domain dom = (Domain) entity;
 		final UnixUser domUser = dom.getUser();
 		final Pac pac = domUser.getPac();
 		final Processor apacheVHostSetupProcessor = createApacheVHostSetupProcessor(em, dom);
-		final Processor triggerAcmebotProcessor = createTriggerAcmebotProcessor(em, dom);
 		final WaitingTasksProcessor processor = new WaitingTasksProcessor(
-				new CompoundProcessor(new ShellProcessor("salt-call state.sls pacs"), apacheVHostSetupProcessor, triggerAcmebotProcessor));
+				new CompoundProcessor(new ShellProcessor("salt-call state.sls pacs"), apacheVHostSetupProcessor));
 		final Config config = Config.getInstance();
 		for (String queueName : config.getProperty("queues.mail").split(",")) {
 			processor.appendProcessor(queueName, createMailinSetupProcessor(em, dom, pac), queueName + ".hostsharing.net");
 		}
+		processor.appendProcessor(hiveName, createTriggerAcmebotProcessor(em, dom), "Trigger ACMEBot");
 		return processor;
 	}
 

util/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.hsadmin.core</groupId>
 	<artifactId>hsadmin-util</artifactId>
-	<version>4.0.15</version>
+	<version>4.0.16</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>8</java.version>
@@ -22,7 +22,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.11.0</version>
+				<version>3.13.0</version>
 				<configuration>
 					<source>8</source>
 					<target>8</target>