From f566463fe22555fb533c4923648f44a75982f451 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Sun, 20 Jun 2021 11:54:28 +0200
Subject: [PATCH] default nginx vhost config moved around

---
 .gitlab-ci.yml                              | 6 +++---
 Dockerfile                                  | 1 +
 rootfs/etc/confd/conf.d/nextcloud.conf.toml | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e8f670..82b8ec8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,9 +5,9 @@ build:
     stage: build
     script:
         - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
-        - docker build --pull -t $IMAGE_NAME:$CI_COMMIT_SHA .
-        - docker build --pull -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
-        - docker build --pull -t $IMAGE_NAME:latest .
+        - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA .
+        - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
+        - docker build -t $IMAGE_NAME:latest .
         - docker push $IMAGE_NAME:$CI_COMMIT_SHA
         - docker push $IMAGE_NAME:$CI_COMMIT_REF_NAME
         - docker push $IMAGE_NAME:latest
diff --git a/Dockerfile b/Dockerfile
index 80249d7..478f0d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -140,6 +140,7 @@ RUN apk add --no-cache  \
     php8-ldap
 
 RUN chown -R nginx:nginx /var/lib/nextcloud
+RUN rm /etc/nginx/http.d/default.conf
 
 ADD /rootfs /
 
diff --git a/rootfs/etc/confd/conf.d/nextcloud.conf.toml b/rootfs/etc/confd/conf.d/nextcloud.conf.toml
index ee6e871..a2ad5c3 100644
--- a/rootfs/etc/confd/conf.d/nextcloud.conf.toml
+++ b/rootfs/etc/confd/conf.d/nextcloud.conf.toml
@@ -1,3 +1,3 @@
 [template]
 src = "nextcloud.conf.tmpl"
-dest = "/etc/nginx/conf.d/nextcloud.conf"
+dest = "/etc/nginx/http.d/nextcloud.conf"