X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dist%2Fargeo-node%2Fpom.xml;h=da9678e12f6567193d6581df4876bdd9fd23dd20;hb=e99cdfa8b25db642a109390f5eda42c8ed3bf2af;hp=dbb96be9993829bcf9dc6c1c04cae68dc01b4cc2;hpb=bb33d723919b6edc58c07198e7dd5be72e96813a;p=lgpl%2Fargeo-commons.git

diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index dbb96be99..da9678e12 100644
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.84-SNAPSHOT</version>
+		<version>2.1.104</version>
 		<artifactId>dist</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -13,16 +13,26 @@
 		<profile>
 			<id>dist</id>
 			<dependencies>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.dep.cms.client</artifactId>
+					<version>2.1.104</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.dep.cms.node</artifactId>
+					<version>2.1.104</version>
+				</dependency>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-					<version>2.1.84-SNAPSHOT</version>
+					<version>2.1.104</version>
 				</dependency>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>osgi-boot</artifactId>
 					<type>zip</type>
-					<version>2.1.84-SNAPSHOT</version>
+					<version>2.1.104</version>
 				</dependency>
 			</dependencies>
 			<build>
@@ -31,7 +41,7 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-assembly-plugin</artifactId>
 						<configuration>
-							<finalName>argeo-node-${project.version}</finalName>
+							<finalName>argeo-node-${version.released}</finalName>
 							<appendAssemblyId>false</appendAssemblyId>
 							<descriptors>
 								<descriptor>assembly/cms-e4-rap.xml</descriptor>
@@ -65,12 +75,12 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-node</name>
+									<name>argeo-node${argeo.rpm.suffix}</name>
 									<mappings>
 										<mapping>
 											<directory>/etc/argeo</directory>
 											<username>root</username>
-											<groupname>argeo</groupname>
+											<groupname>root</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
@@ -80,10 +90,23 @@
 												</source>
 											</sources>
 										</mapping>
+										<mapping>
+											<directory>/etc/argeo.d</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<configuration>noreplace</configuration>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>base/etc/argeo.d</location>
+												</source>
+											</sources>
+										</mapping>
 										<mapping>
 											<directory>/etc/argeo/conf.d</directory>
 											<username>root</username>
-											<groupname>argeo</groupname>
+											<groupname>root</groupname>
 											<filemode>640</filemode>
 											<configuration>noreplace</configuration>
 											<directoryIncluded>false</directoryIncluded>
@@ -127,6 +150,21 @@
 												</source>
 											</sources>
 										</mapping>
+										<mapping>
+											<directory>/usr/lib/systemd/user</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>rpm/usr/lib/systemd/user</location>
+													<includes>
+														<include>*.service</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
 										<mapping>
 											<directory>/usr/sbin</directory>
 											<username>root</username>
@@ -143,12 +181,9 @@
 											</sources>
 										</mapping>
 									</mappings>
-									<preinstallScriptlet>
-										<scriptFile>rpm/scripts/preinstall</scriptFile>
-									</preinstallScriptlet>
 									<requires>
-										<require>argeo-cms-node</require>
-										<require>osgi-boot</require>
+										<require>argeo-cms-node${argeo.rpm.suffix}</require>
+										<require>argeo-osgi-boot${argeo.rpm.suffix}</require>
 										<!-- do not explicitely require java -->
 									</requires>
 								</configuration>