fix some problems with GitLab CI deployment

.gitlab-ci.yml

@@ -1,5 +1,8 @@
 variables:
+  GIT_STRATEGY: clone
+  GIT_SUBMODULE_STRATEGY: recursive
   PREFIX: /usr/
+  RSYNC_OPTS: --recursive --ignore-missing-args --chown $DEPLOY_USER:$DEPLOY_USER
 
 stages:
   - prepare
@@ -15,8 +18,6 @@ docker-dev:
   stage: prepare
   before_script:
     - docker info
-    - git submodule sync --recursive
-    - git submodule update --init --recursive
   script:
     - docker pull fedora:latest
     - make docker-dev
@@ -150,8 +151,9 @@ website:
 deliver:
   stage: deploy
   script:
-    - rsync --recursive --ignore-missing-args build/release-coverage/coverage/  $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/coverage/$CI_BUILD_REF_NAME/
-    - rsync --recursive --ignore-missing-args build/release/doc/html/           $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/doc/$CI_BUILD_REF_NAME/
+    - ssh $DEPLOY_USER@$DEPLOY_HOST mkdir -pf $DEPLOY_PATH/{coverage,doc}/$CI_BUILD_REF_NAME/
+    - rsync $RSYNC_OPTS build/release-coverage/coverage/  $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/coverage/$CI_BUILD_REF_NAME/
+    - rsync $RSYNC_OPTS build/release/doc/html/           $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/doc/$CI_BUILD_REF_NAME/
   dependencies:
     - docs
     - coverage
@@ -162,8 +164,9 @@ deliver:
 deliver-packages:
   stage: deploy
   script:
-    - rsync --recursive --ignore-missing-args build/release/packaging/rpm/RPMS/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/../packages/
-    - rsync             --ignore-missing-args build/release/packaging/*.tar.gz  $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/dist/
+    - ssh $DEPLOY_USER@$DEPLOY_HOST mkdir -p $DEPLOY_PATH/{dist,../packages}
+    - rsync $RSYNC_OPTS build/release/packaging/rpm/RPMS/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/../packages/
+    - rsync $RSYNC_OPTS build/release/packaging/*.tar.gz  $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/dist/
     - ssh $DEPLOY_USER@$DEPLOY_HOST createrepo $DEPLOY_PATH/../packages
   dependencies:
     - packages

.gitmodules

@@ -21,4 +21,4 @@
 	url = https://github.com/curl/curl.git
 [submodule "thirdparty/libxil"]
 	path = thirdparty/libxil
-	url = git@git.rwth-aachen.de:VILLASframework/libxil.git
+	url = ../libxil.git

Dockerfile.dev

@@ -18,18 +18,16 @@ MAINTAINER Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
 # Toolchain
 RUN dnf -y update && \
     dnf -y install \
-	gcc pkgconfig make cmake \
-	git \
-	gcc-c++ \
+	gcc gcc-c++ \
+	pkgconfig make cmake \
 	autoconf automake autogen libtool \
 	flex bison \
-	texinfo
+	texinfo git
 
 # Dependencies
 RUN dnf -y update && \
     dnf -y install \
-	openssl \
-	openssl-devel \
+	openssl openssl-devel \
 	libconfig-devel \
 	libnl3-devel \
 	libcurl-devel \
@@ -38,12 +36,9 @@ RUN dnf -y update && \
 # Several tools only needed for developement and testing
 RUN dnf -y update && \
     dnf -y install \
-	doxygen \
-	dia \
-	graphviz \
+	doxygen dia graphviz \
 	openssh-clients \
-	rpmdevtools \
-	rpm-build \
+	rpmdevtools rpm-build \
 	jq \
 	iproute \
 	python-pip \

thirdparty/libwebsockets

@@ -1 +1 @@
-Subproject commit 42b2334c5c4b1b3da5dd75bd92451bb49983c236
+Subproject commit 2b9fff73f92dfe1ea5fde9a11e75f3ef2a981f90