Merge branch 'main' into feat/emoji-in-tree

Author: olaurendeau

docker/files/production/etc/nginx/conf.d/default.conf.template

@@ -11,6 +11,9 @@ server {
     server_name localhost;
     charset utf-8;
 
+    # increase max upload size
+    client_max_body_size 10m;
+
     # Disables server version feedback on pages and in headers
     server_tokens off;
 
@@ -68,7 +71,7 @@ server {
         proxy_set_header Host $host;
     }
 
-    location  /collaboration/api/ {
+    location /collaboration/api/ {
         # Collaboration server
         proxy_pass http://${YPROVIDER_HOST}:4444;
         proxy_set_header Host $host;
@@ -95,7 +98,7 @@ server {
 
         add_header Content-Security-Policy "default-src 'none'" always;
     }
-    
+
     location /media-auth {
         proxy_pass http://docs_backend/api/v1.0/documents/media-auth/;
         proxy_set_header X-Forwarded-Proto https;
@@ -109,4 +112,4 @@ server {
         proxy_set_header Content-Length "";
         proxy_set_header X-Original-Method $request_method;
     }
-}
+}

docs/examples/compose/compose.yaml

@@ -7,12 +7,12 @@ services:
       timeout: 2s
       retries: 300
     env_file:
-    - env.d/postgresql
-    - env.d/common
+      - env.d/postgresql
+      - env.d/common
     environment:
-    - PGDATA=/var/lib/postgresql/data/pgdata
+      - PGDATA=/var/lib/postgresql/data/pgdata
     volumes:
-    - ./data/databases/backend:/var/lib/postgresql/data/pgdata
+      - ./data/databases/backend:/var/lib/postgresql/data/pgdata
 
   redis:
     image: redis:8
@@ -22,12 +22,12 @@ services:
     user: ${DOCKER_USER:-1000}
     restart: always
     environment:
-    - DJANGO_CONFIGURATION=Production
+      - DJANGO_CONFIGURATION=Production
     env_file:
-    - env.d/common
-    - env.d/backend
-    - env.d/yprovider
-    - env.d/postgresql
+      - env.d/common
+      - env.d/backend
+      - env.d/yprovider
+      - env.d/postgresql
     healthcheck:
       test: ["CMD", "python", "manage.py", "check"]
       interval: 15s
@@ -45,24 +45,24 @@ services:
     image: lasuite/impress-y-provider:latest
     user: ${DOCKER_USER:-1000}
     env_file:
-    - env.d/common
-    - env.d/yprovider
+      - env.d/common
+      - env.d/yprovider
 
   frontend:
     image: lasuite/impress-frontend:latest
     user: "101"
     entrypoint:
-    - /docker-entrypoint.sh
+      - /docker-entrypoint.sh
     command: ["nginx", "-g", "daemon off;"]
     env_file:
-    - env.d/common
+      - env.d/common
     # Uncomment and set your values if using our nginx proxy example
     #environment:
-    # - VIRTUAL_HOST=${DOCS_HOST} # used by nginx proxy 
+    # - VIRTUAL_HOST=${DOCS_HOST} # used by nginx proxy
     # - VIRTUAL_PORT=8083 # used by nginx proxy
     # - LETSENCRYPT_HOST=${DOCS_HOST} # used by lets encrypt to generate TLS certificate
     volumes:
-    - ./default.conf.template:/etc/nginx/templates/docs.conf.template
+      - ./default.conf.template:/etc/nginx/templates/docs.conf.template
     depends_on:
       backend:
         condition: service_healthy

docs/examples/compose/keycloak/compose.yaml

@@ -7,23 +7,23 @@ services:
       timeout: 2s
       retries: 300
     env_file:
-    - env.d/kc_postgresql
+      - env.d/kc_postgresql
     volumes:
-    - ./data/keycloak:/var/lib/postgresql/data/pgdata
+      - ./data/keycloak:/var/lib/postgresql/data/pgdata
 
   keycloak:
     image: quay.io/keycloak/keycloak:26.1.3
     command: ["start"]
     env_file:
-    - env.d/kc_postgresql
-    - env.d/keycloak
+      - env.d/kc_postgresql
+      - env.d/keycloak
     # Uncomment and set your values if using our nginx proxy example
     # environment:
-    # - VIRTUAL_HOST=id.yourdomain.tld # used by nginx proxy 
+    # - VIRTUAL_HOST=id.yourdomain.tld # used by nginx proxy
     # - VIRTUAL_PORT=8080 # used by nginx proxy
     # - LETSENCRYPT_HOST=id.yourdomain.tld # used by lets encrypt to generate TLS certificate
     depends_on:
-      kc_postgresql::
+      kc_postgresql:
         condition: service_healthy
         restart: true
 # Uncomment if using our nginx proxy example
@@ -33,4 +33,4 @@ services:
 #
 #networks:
 #  proxy-tier:
-#    external: true
+#    external: true

docs/examples/compose/minio/compose.yaml

@@ -2,8 +2,8 @@ services:
   minio:
     image: minio/minio
     environment:
-    - MINIO_ROOT_USER=<set minio root username>
-    - MINIO_ROOT_PASSWORD=<set minio root password>
+      - MINIO_ROOT_USER=<set minio root username>
+      - MINIO_ROOT_PASSWORD=<set minio root password>
     # Uncomment and set your values if using our nginx proxy example
     # - VIRTUAL_HOST=storage.yourdomain.tld # used by nginx proxy 
     # - VIRTUAL_PORT=9000 # used by nginx proxy
@@ -16,12 +16,12 @@ services:
     entrypoint: ""
     command: minio server /data
     volumes:
-    - ./data/minio:/data
+      - ./data/minio:/data
 # Uncomment if using our nginx proxy example
 #    networks:
-#    - proxy-tier
+#      - proxy-tier
 
 # Uncomment if using our nginx proxy example
 #networks:
 #  proxy-tier:
-#    external: true
+#    external: true

docs/examples/compose/nginx-proxy/compose.yaml

@@ -3,28 +3,28 @@ services:
     image: nginxproxy/nginx-proxy
     container_name: nginx-proxy
     ports:
-    - "80:80"
-    - "443:443"
+      - "80:80"
+      - "443:443"
     volumes:
-    - html:/usr/share/nginx/html
-    - certs:/etc/nginx/certs:ro
-    - /var/run/docker.sock:/tmp/docker.sock:ro
+      - html:/usr/share/nginx/html
+      - certs:/etc/nginx/certs:ro
+      - /var/run/docker.sock:/tmp/docker.sock:ro
     networks:
-    - proxy-tier
+      - proxy-tier
 
   acme-companion:
     image: nginxproxy/acme-companion
     container_name: nginx-proxy-acme
     environment:
-    - [email protected]
+      - [email protected]
     volumes_from:
-    - nginx-proxy
+      - nginx-proxy
     volumes:
-    - certs:/etc/nginx/certs:rw
-    - acme:/etc/acme.sh
-    - /var/run/docker.sock:/var/run/docker.sock:ro
+      - certs:/etc/nginx/certs:rw
+      - acme:/etc/acme.sh
+      - /var/run/docker.sock:/var/run/docker.sock:ro
     networks:
-    - proxy-tier
+      - proxy-tier
 
 networks:
   proxy-tier:

env.d/production.dist/backend

@@ -43,8 +43,8 @@ OIDC_RP_CLIENT_ID=<client_id>
 OIDC_RP_CLIENT_SECRET=<client secret>
 OIDC_RP_SIGN_ALGO=RS256
 OIDC_RP_SCOPES="openid email"
-#USER_OIDC_FIELD_TO_SHORTNAME
-#USER_OIDC_FIELDS_TO_FULLNAME
+#OIDC_USERINFO_SHORTNAME_FIELD
+#OIDC_USERINFO_FULLNAME_FIELDS
 
 LOGIN_REDIRECT_URL=https://${DOCS_HOST}
 LOGIN_REDIRECT_URL_FAILURE=https://${DOCS_HOST}