Merge branch '71-make-deb-packages-lighter' into 'master'

Install from jars, edit service file

Closes #71

See merge request kypo2/services-and-portlets/kypo2-user-and-group!67

.gitlab-ci.yml

@@ -104,10 +104,10 @@ buildDebian:
         - triggers
         - branches
         - tags
-#    artifacts:
-#        paths:
-#            - ./*.$DEBIAN_PACKAGE_EXTENSION
-#        expire_in: 1 hour
+    #artifacts:
+    #    paths:
+    #        - ./*.$DEBIAN_PACKAGE_EXTENSION
+    #    expire_in: 1 hour
 
 deployDebian:
     stage: deployDebian
@@ -128,7 +128,7 @@ deployDebian:
             --id-length 8
             --ignore-branch
             --git-log="--merges --grep=into[[:space:]]'master'"
-        # -uc do not sign .changes file, -us do not sign source package (see dpkg-buildpackage)
+        #-uc do not sign .changes file, -us do not sign source package (see dpkg-buildpackage)
         # -i -I exclude .git directory (see dpkg-source)
         - > 
             gbp buildpackage

debian/install

-pom.xml /opt/kypo2/kypo2-user-and-group
-kypo2-api-user-and-group /opt/kypo2/kypo2-user-and-group
 kypo2-api-user-and-group/target/kypo2-api-user-and-group*.jar /opt/kypo2/kypo2-user-and-group/jars
-kypo2-persistence-user-and-group /opt/kypo2/kypo2-user-and-group
 kypo2-persistence-user-and-group/target/kypo2-persistence-user-and-group*.jar /opt/kypo2/kypo2-user-and-group/jars
-kypo2-rest-user-and-group /opt/kypo2/kypo2-user-and-group
 kypo2-rest-user-and-group/target/kypo2-rest-user-and-group*.jar /opt/kypo2/kypo2-user-and-group/jars
-kypo2-security-user-and-group /opt/kypo2/kypo2-user-and-group
 kypo2-security-user-and-group/target/kypo2-security-user-and-group*.jar /opt/kypo2/kypo2-user-and-group/jars
-kypo2-service-user-and-group /opt/kypo2/kypo2-user-and-group
 kypo2-service-user-and-group/target/kypo2-service-user-and-group*.jar /opt/kypo2/kypo2-user-and-group/jars
+kypo2-persistence-user-and-group/src/main/resources/db/migration/*.sql /opt/kypo2/kypo2-user-and-group/migration

debian/postinst

@@ -2,8 +2,7 @@
 set -e
 case "$1" in
     configure)
-    cd /opt/kypo2/kypo2-user-and-group
-    mvn clean install
+
     cd /opt/kypo2/kypo2-user-and-group/jars
     API_JAR=$(ls kypo2-api-user-and-group*.jar | tail -n 1)
     if ! [ "$API_JAR" = "kypo2-api-user-and-group.jar" ]; then ln -sf $API_JAR kypo2-api-user-and-group.jar; fi
@@ -17,6 +16,8 @@ case "$1" in
     if ! [ "$SERVICE_JAR" = "kypo2-service-user-and-group.jar" ]; then ln -sf $SERVICE_JAR kypo2-service-user-and-group.jar; fi    
     ;;
 
+    mvn install:install-file -Dfile=kypo2-api-user-and-group.jar -Dfile=kypo2-persistence-user-and-group.jar -Dfile=kypo2-rest-user-and-group.jar -Dfile=kypo2-security-user-and-group.jar -Dfile=kypo2-service-user-and-group.jar
+
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
 

debian/service

@@ -6,7 +6,7 @@ User=kypo
 ExecStart=/usr/bin/java -Dpath.to.config.file=/etc/kypo2/java-projects/properties/user-and-group/user-and-group-project.properties -jar /opt/kypo2/kypo2-user-and-group/jars/kypo2-rest-user-and-group.jar
 StandardOutput=syslog
 StandardError=syslog
-SyslogIdentifier=/var/log/syslog
+SyslogIdentifier=kypo2-user-and-group
 Restart=always
 
 [Install]