renaming and reqorking the packaging

create_client_delivery.sh

@@ -4,7 +4,8 @@
 #
 # tobias.assmann@ecsec.de
 
-TRG_DIR=docker_for-client-delivery
+PCK_DIR=for-client-delivery
+TRG_DIR=eid-server
 TRG_ARC=eid-server.tgz
 
 echo "checking java version ..."
@@ -14,13 +15,16 @@ java -version 2>&1 | awk -F '"' '/version/ {print $2}' | grep -q 1.8 || { echo "
 echo "build the whole project ..."
 mvn clean install || { echo "maven build failed. please check!"; exit 1; }
 
-echo "copy builded stuff to $TRG_DIR ..."
-cp configuration-wizard/target/configuration-wizard-1.2.0-SNAPSHOT.jar $TRG_DIR/poseidas-configuration-wizard.jar
-cp docker/sam/sam-1.2.0-SNAPSHOT-thorntail.jar $TRG_DIR/sam/sam-1.2.0-SNAPSHOT-thorntail.jar
-cp docker/ssa/dist/ssa-server.war $TRG_DIR/ssa/dist/ssa-server.war
+echo "copy builded stuff to $PCK_DIR/$TRG_DIR ..."
+cp configuration-wizard/target/configuration-wizard-1.2.0-SNAPSHOT.jar $PCK_DIR/$TRG_DIR/poseidas-configuration-wizard.jar
+cp docker/sam/sam-1.2.0-SNAPSHOT-thorntail.jar $PCK_DIR/$TRG_DIR/sam/sam-1.2.0-SNAPSHOT-thorntail.jar
+cp docker/ssa/dist/ssa-server.war $PCK_DIR/$TRG_DIR/ssa/dist/ssa-server.war
 
-echo "archiving $TRG_DIR to $TRG_ARC ..."
+echo "archiving $PCK_DIR/$TRG_DIR to $PCK_DIR/$TRG_ARC ..."
+cd $PCK_DIR
+test -f $TRG_ARC && rm $TRG_ARC
 tar -cvzf $TRG_ARC $TRG_DIR
+cd ..
 
 echo "done"
 

docker_for-client-delivery/deploy.sh → for-client-delivery/eid-server/deploy.sh

@@ -31,7 +31,7 @@ rsync -av --delete --progress \
 
 # Restart / re-build the services
 echo "Start services on server ..."
-#ssh $USER@$HOST "cd $DIR/ && docker-compose up -d --build"
+ssh $USER@$HOST "cd $DIR/ && docker-compose up -d --build"
 
 echo "Deployment done, please wait until all services are fully running and proceed with EJBCA key setup."