From eb8398e226d8065fce2e540aba2d2c56d0a7822a Mon Sep 17 00:00:00 2001
From: AngeD <ange.duhayon@epitech.eu>
Date: Sun, 17 Sep 2023 20:55:13 +0200
Subject: [PATCH] fix: user / network issues

---
 element/.env                     |  3 ---
 element/compose.yaml             |  1 -
 gitea/compose.yaml               |  1 +
 gitea/nginx.conf                 | 10 +++++-----
 nextcloud/compose.yaml           |  1 +
 nextcloud/nginx.conf             | 12 ++++++------
 nginx/install_site/entrypoint.sh |  4 +---
 7 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/element/.env b/element/.env
index 03c3aee..ce3d77b 100644
--- a/element/.env
+++ b/element/.env
@@ -1,5 +1,2 @@
 BASE_URL=chat.
 EMAIL=
-
-PUID=1000
-PGID=1000
diff --git a/element/compose.yaml b/element/compose.yaml
index 5002cbf..a965c38 100644
--- a/element/compose.yaml
+++ b/element/compose.yaml
@@ -15,7 +15,6 @@ services:
   element:
     build: .
     restart: unless-stopped
-    user: "$PUID:$PGID"
     networks:
       - nginx
 
diff --git a/gitea/compose.yaml b/gitea/compose.yaml
index 1a94b9b..e63f045 100644
--- a/gitea/compose.yaml
+++ b/gitea/compose.yaml
@@ -40,6 +40,7 @@ services:
       - GITEA__database__PASSWD=$POSTGRES_PASSWORD
     networks:
       - nginx
+      - default
     depends_on:
       - db
 
diff --git a/gitea/nginx.conf b/gitea/nginx.conf
index 7154374..81c0197 100644
--- a/gitea/nginx.conf
+++ b/gitea/nginx.conf
@@ -14,14 +14,14 @@ server {
     ssl_certificate     /etc/letsencrypt/live/$BASE_URL/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/$BASE_URL/privkey.pem;
 
-    client_max_body_size 8G;
 
     location / {
         proxy_pass http://gitea:3000;
 
-        proxy_set_header Host              $host;
-        proxy_set_header X-Real-IP         $remote_addr;
-        proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
+        client_max_body_size 8G;
+        proxy_set_header     Host              $host;
+        proxy_set_header     X-Real-IP         $remote_addr;
+        proxy_set_header     X-Forwarded-For   $proxy_add_x_forwarded_for;
+        proxy_set_header     X-Forwarded-Proto $scheme;
     }
 }
diff --git a/nextcloud/compose.yaml b/nextcloud/compose.yaml
index 0518fd1..76eaa6e 100644
--- a/nextcloud/compose.yaml
+++ b/nextcloud/compose.yaml
@@ -44,6 +44,7 @@ services:
       - OVERWRITEPROTOCOL=https
     networks:
       - nginx
+      - default
     depends_on:
       - db
       - redis
diff --git a/nextcloud/nginx.conf b/nextcloud/nginx.conf
index 587970b..454e379 100644
--- a/nextcloud/nginx.conf
+++ b/nextcloud/nginx.conf
@@ -14,16 +14,16 @@ server {
     ssl_certificate     /etc/letsencrypt/live/$BASE_URL/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/$BASE_URL/privkey.pem;
 
-    client_max_body_size 1024G;
 
     location / {
         proxy_pass       http://nextcloud;
 
-        proxy_set_header Host              $host;
-        proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Host  $http_host;
-        proxy_redirect   off;
+        client_max_body_size 1024G;
+        proxy_set_header     Host              $host;
+        proxy_set_header     X-Forwarded-For   $proxy_add_x_forwarded_for;
+        proxy_set_header     X-Forwarded-Proto $scheme;
+        proxy_set_header     X-Forwarded-Host  $http_host;
+        proxy_redirect       off;
     }
 
     location /.well-known/carddav {
diff --git a/nginx/install_site/entrypoint.sh b/nginx/install_site/entrypoint.sh
index bec06b5..ddee1f4 100755
--- a/nginx/install_site/entrypoint.sh
+++ b/nginx/install_site/entrypoint.sh
@@ -9,9 +9,7 @@ certbot certonly -n      \
     -d "$BASE_URL"
 
 for f in *; do
-    envsubst "$(bash -c 'compgen -v' | xargs printf '$%s ')" \
-        < "$f"                                               \
-        > "/sites/$f"
+    envsubst "$(env | xargs printf '$%s ')" < "$f" > "/sites/$f"
 done
 
 printf "POST /containers/nginx/kill?signal=SIGHUP HTTP/1.0\r\n\n" \