Merge branch 'master' into develop/3.0

application/src/main/scripts/control/rpm/preinst

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-getent group ${pkg.name} >/dev/null || groupadd -r ${pkg.name}
+getent group ${pkg.user} >/dev/null || groupadd -r ${pkg.user}
-getent passwd ${pkg.name} >/dev/null || \
+getent passwd ${pkg.user} >/dev/null || \
-useradd -d ${pkg.installFolder} -g ${pkg.name} -M -r ${pkg.name} -s /sbin/nologin \
+useradd -d ${pkg.installFolder} -g ${pkg.user} -M -r ${pkg.user} -s /sbin/nologin \
 -c "Thingsboard application"

transport/coap/src/main/scripts/control/rpm/preinst

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-getent group ${pkg.name} >/dev/null || groupadd -r ${pkg.name}
+getent group ${pkg.user} >/dev/null || groupadd -r ${pkg.user}
-getent passwd ${pkg.name} >/dev/null || \
+getent passwd ${pkg.user} >/dev/null || \
-useradd -d ${pkg.installFolder} -g ${pkg.name} -M -r ${pkg.name} -s /sbin/nologin \
+useradd -d ${pkg.installFolder} -g ${pkg.user} -M -r ${pkg.user} -s /sbin/nologin \
 -c "Thingsboard application"

transport/http/src/main/scripts/control/rpm/preinst

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-getent group ${pkg.name} >/dev/null || groupadd -r ${pkg.name}
+getent group ${pkg.user} >/dev/null || groupadd -r ${pkg.user}
-getent passwd ${pkg.name} >/dev/null || \
+getent passwd ${pkg.user} >/dev/null || \
-useradd -d ${pkg.installFolder} -g ${pkg.name} -M -r ${pkg.name} -s /sbin/nologin \
+useradd -d ${pkg.installFolder} -g ${pkg.user} -M -r ${pkg.user} -s /sbin/nologin \
 -c "Thingsboard application"

transport/mqtt/src/main/scripts/control/rpm/preinst

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-getent group ${pkg.name} >/dev/null || groupadd -r ${pkg.name}
+getent group ${pkg.user} >/dev/null || groupadd -r ${pkg.user}
-getent passwd ${pkg.name} >/dev/null || \
+getent passwd ${pkg.user} >/dev/null || \
-useradd -d ${pkg.installFolder} -g ${pkg.name} -M -r ${pkg.name} -s /sbin/nologin \
+useradd -d ${pkg.installFolder} -g ${pkg.user} -M -r ${pkg.user} -s /sbin/nologin \
 -c "Thingsboard application"