From 274a733dae2dd72cb17ecc3facf0ac7e0e3fed9c Mon Sep 17 00:00:00 2001
From: Florent Guiotte <florent.guiotte@irisa.fr>
Date: Sun, 4 Jan 2026 13:04:22 +0100
Subject: [PATCH] Add subdomains for ente

---
 bind9/guiotte.db                              |  43 ++++++++-------
 ddclient/ddclient.conf                        | Bin 1438 -> 1898 bytes
 docker-compose.yml                            |  10 ++--
 swag/nginx/nginx.conf                         |   8 ---
 .../nginx/proxy-confs/ente-web.subdomain.conf |  52 +++++++++---------
 5 files changed, 55 insertions(+), 58 deletions(-)

diff --git a/bind9/guiotte.db b/bind9/guiotte.db
index fc4d9bd..6d1cfa7 100644
--- a/bind9/guiotte.db
+++ b/bind9/guiotte.db
@@ -12,24 +12,29 @@ $TTL  604800
 @  IN  NS  dm.guiotte.fr.
 
 ; OVH
-guiotte.fr.            IN  A       37.59.61.141
-*.guiotte.fr.          IN  CNAME   guiotte.fr.
+guiotte.fr.                     IN  A       37.59.61.141
+*.guiotte.fr.                   IN  CNAME   guiotte.fr.
 
 ; LAN
-dm.guiotte.fr.         IN  A       192.168.1.2
-money.guiotte.fr.      IN  CNAME   dm.guiotte.fr.
-dl.guiotte.fr.         IN  CNAME   dm.guiotte.fr.
-kdoc.guiotte.fr.       IN  CNAME   dm.guiotte.fr.
-sync.guiotte.fr.       IN  CNAME   dm.guiotte.fr.
-pad.guiotte.fr.        IN  CNAME   dm.guiotte.fr.
-home.guiotte.fr.       IN  CNAME   dm.guiotte.fr.
-zotero.guiotte.fr.     IN  CNAME   dm.guiotte.fr.
-git.guiotte.fr.        IN  CNAME   dm.guiotte.fr.
-db.guiotte.fr.         IN  CNAME   dm.guiotte.fr.
-flix.guiotte.fr.       IN  CNAME   dm.guiotte.fr.
-task.guiotte.fr.       IN  CNAME   dm.guiotte.fr.
-todo.guiotte.fr.       IN  CNAME   dm.guiotte.fr.
-pics.guiotte.fr.       IN  CNAME   dm.guiotte.fr.
-photos.guiotte.fr.     IN  CNAME   dm.guiotte.fr.
-ente.guiotte.fr.       IN  CNAME   dm.guiotte.fr.
-s3.guiotte.fr.         IN  CNAME   dm.guiotte.fr.
+dm.guiotte.fr.                  IN  A       192.168.1.2
+money.guiotte.fr.               IN  CNAME   dm.guiotte.fr.
+dl.guiotte.fr.                  IN  CNAME   dm.guiotte.fr.
+kdoc.guiotte.fr.                IN  CNAME   dm.guiotte.fr.
+sync.guiotte.fr.                IN  CNAME   dm.guiotte.fr.
+pad.guiotte.fr.                 IN  CNAME   dm.guiotte.fr.
+home.guiotte.fr.                IN  CNAME   dm.guiotte.fr.
+zotero.guiotte.fr.              IN  CNAME   dm.guiotte.fr.
+git.guiotte.fr.                 IN  CNAME   dm.guiotte.fr.
+db.guiotte.fr.                  IN  CNAME   dm.guiotte.fr.
+flix.guiotte.fr.                IN  CNAME   dm.guiotte.fr.
+task.guiotte.fr.                IN  CNAME   dm.guiotte.fr.
+todo.guiotte.fr.                IN  CNAME   dm.guiotte.fr.
+pics.guiotte.fr.                IN  CNAME   dm.guiotte.fr.
+photos.guiotte.fr.              IN  CNAME   dm.guiotte.fr.
+ente.guiotte.fr.                IN  CNAME   dm.guiotte.fr.
+s3.guiotte.fr.                  IN  CNAME   dm.guiotte.fr.
+comptes-photos.guiotte.fr.      IN  CNAME   dm.guiotte.fr.
+albums-photos.guiotte.fr.       IN  CNAME   dm.guiotte.fr.
+auth.guiotte.fr.                IN  CNAME   dm.guiotte.fr.
+capsule-photos.guiotte.fr.      IN  CNAME   dm.guiotte.fr.
+tele-photos.guiotte.fr.         IN  CNAME   dm.guiotte.fr.
diff --git a/ddclient/ddclient.conf b/ddclient/ddclient.conf
index 69a0f23237e37dee27a9d5f7a78ae9c744f1da47..c6435cdcd68730532ce6147894d4347af75647c0 100644
GIT binary patch
literal 1898
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

literal 1438
zcmV;P1!4LCM@dveQdv+`0EZ@yO%YuZoT_FOgISc=r7{zr!BOk@I{~Yv<v<1@?w^^w
zOLhv838OqvZR=g6-*aN4a)U@2TSbCTqRL49=dyf0X^8?mm!rWLSRKzg)!`45m5Jnu
z(e%nC38z?S994*dgQw7y9nfGCJzxh^aiedsz!$!exP*Gf<N&|CYs06Jh@pBED2j2k
zYub1reHc-|fse|u;EYH+i+e^pWKKbLb;-{wT-U?$<w3=3(^pjMFO;|8tpK~-INo<?
zn7M@nyLeF0U0&aQm}PMDhKjEuyznDRALLJ&KrZzhR%=V<yS#tGYaKkG@=S#~oS2x=
zpK;%S@Rvz(;C!^`p4l}oQEXT-yz<v9y>{fmVdT~BBi<;2gkTLBi1D10MMh4H__Pl4
z<n<v+Zo|T9y|E#?j+WhBteT>#tEUf!hh=y_FAEsKd89Tk8;qxL0pUh3M?T(~z`xK*
z{JE*FtF1hGCk83qdSgV4t16910Nr&jyti)S&qBPnr7o+<@j+;P;T>dAD+s+f-NWp@
z1W5)D8fF8{JVJYj#N@&dm^vjV`sy=H$MQP^*r>3Xqyf6vei&R5p4G8lAeUeJDxJQ5
zDcUQ*of*jkjzhRNUzvnYtB%I1tx-v`T!Y&ZfpA9>pU;L5N8EBg)dbrX1y~!=EnZ^?
zkdd`rg|!{o$sb5U{8R$8)YrBp%Yk>Wa^YXy3f+dB?<v;c0?$C#2yhA}-ncLmUbI!#
z0kSjhD~+S~w|v5Rt@L({_!p36)1vUev<iakv)IugC_ovRA?0#4n6EVTM-feL#mxU$
zYL(d2$3r|WN(>HL@vF;v-78xT)f-#78f(|l&89QiDPHk(<MxFOxMbh(_$L&;x}}TC
zS0Q%}bN!-NI3;HgvL-Cn7mD4(&Vamt?u{yoC&h^=MRduw-G7`OYk19dX?);m5>Cg?
z^k&D_(28N3%Gt8j(1GNIDn$V0-ScPF3u)q;;2#i_JFDCZN_0#nRnfs|7zdFUj{>`=
zZ7jG;6krR~&{)16V-N8enPZ@|A9YmcCAn6c1vIN;70IUe&SJz%(VC&9Blk6Ii6(St
zY&-Byg6@i6FT(-+f4LYm4=%ygmJn{b^Rmk$WY%5T(^!Y9>&yg=H9zASDg3#McVE?q
zQ@QL3V<zDcL332q!_+@h{BqDo8Z>rri=AFwP=}uS=IIOI&}5Wuphp587QkYk$lr$#
zog|x-fnt-xDYfzhAYSD8484duXDl&Rv?As759JKR`227f^mFY=M!+(&2}Iul--Yb?
zIrbfhw4}|-xw<*%RdZZUKg2vZ>V!W1Hy0J%pd4_$n3Q2smTe;x*b5M9)Nq)K>6l8j
z@+w(%J*PTtA5@^}wi=L7oGetF0B&a)&>-zlQR{$Rt!Lx%TDFEg#;@>fgIItFs#lHh
z`@i@DT}XTsX1-$ah+s_<{&FCkVYR^V&pWu^MTIY;Z;?`Ks35$u+~Ae~k}Qqru^O8O
z{AFfRP2gkOE%quWWOEMImjuLFFid)9sxx(q;Ey)RZeuoQWV+qhIe)!zkmA25Ttus8
z2s=0n6$ymGZLT-|9AVS}GWjs&%Q=v&(-}}K7%6tfnKC0&Ea@YwU6G%LO^&o@8YyoC
zVLkSDOcNMQ<eP6-hMx|OMk9&X@A+o`vWsJ`HlZ_(9v9<}A-iYo;*m)U#ODlQ@7S~f
zm?-kqv$Lt|M!23SUM6|l-?KSU#)Q&BGN!DWTz3JhVMbJyXE7)ng4l3!FL9xopg2d$
zcFkkgJ204N6<VD}!ge4psTHgU&~}P4mt(+lgDt=v79tq8BfJJolAX$9nn;KZ(-z+(
sBJn4G=cQK7N}yv4zDy|dcRho?i5J^1R^rd*{2H5mvMV%?<Q^#%;)7zt*Z=?k

diff --git a/docker-compose.yml b/docker-compose.yml
index ee0c93b..051fa5f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -499,10 +499,10 @@ services:
       ENTE_S3_B2_EU_CEN_ENDPOINT: https://s3.guiotte.fr
       ENTE_S3_B2_EU_CEN_REGION: garage
       ENTE_S3_B2_EU_CEN_BUCKET: ente
-      ENTE_APPS_PUBLIC_ALBUMS: https://albums.photos.guiotte.fr
-      ENTE_APPS_CAST: https://cast.photos.guiotte.fr
-      ENTE_APPS_EMBED_ALBUMS: https://embed.photos.guiotte.fr
-      ENTE_APPS_ACCOUNTS: https://accounts.photos.guiotte.fr
+      ENTE_APPS_PUBLIC_ALBUMS: https://albums-photos.guiotte.fr
+      ENTE_APPS_CAST: https://tele-photos.guiotte.fr
+      ENTE_APPS_EMBED_ALBUMS: https://capsule-photos.guiotte.fr
+      ENTE_APPS_ACCOUNTS: https://comptes-photos.guiotte.fr
     secrets:
       - ente-db-pw
       - ente-s3-key
@@ -540,7 +540,7 @@ services:
     environment:
       <<: *common-environment
       ENTE_API_ORIGIN: https://ente.guiotte.fr
-      ENTE_ALBUMS_ORIGIN: https://albums.photos.guiotte.fr
+      ENTE_ALBUMS_ORIGIN: https://albums-photos.guiotte.fr
       ENTE_PHOTOS_ORIGIN: https://photos.guiotte.fr/
 
 
diff --git a/swag/nginx/nginx.conf b/swag/nginx/nginx.conf
index f1130a8..5f59482 100644
--- a/swag/nginx/nginx.conf
+++ b/swag/nginx/nginx.conf
@@ -75,14 +75,6 @@ http {
     # Includes virtual hosts configs.
     include /etc/nginx/http.d/*.conf;
     include /config/nginx/site-confs/*.conf;
-
-    # For garage CORS
-    map $http_origin $cors_origin {
-        default "";
-        "https://photos.guiotte.fr" $http_origin;
-        "https://ente.guiotte.fr" $http_origin;
-    }
-
 }
 
 daemon off;
diff --git a/swag/nginx/proxy-confs/ente-web.subdomain.conf b/swag/nginx/proxy-confs/ente-web.subdomain.conf
index 990c068..7259427 100644
--- a/swag/nginx/proxy-confs/ente-web.subdomain.conf
+++ b/swag/nginx/proxy-confs/ente-web.subdomain.conf
@@ -24,7 +24,7 @@ server {
     listen 443 ssl;
     listen [::]:443 ssl;
 
-    server_name accounts.photos.*;
+    server_name comptes-photos.*;
 
     include /config/nginx/ssl.conf;
 
@@ -46,7 +46,7 @@ server {
     listen 443 ssl;
     listen [::]:443 ssl;
 
-    server_name public.photos.*;
+    server_name albums-photos.*;
 
     include /config/nginx/ssl.conf;
 
@@ -68,7 +68,7 @@ server {
     listen 443 ssl;
     listen [::]:443 ssl;
 
-    server_name auth.photos.*;
+    server_name auth.*;
 
     include /config/nginx/ssl.conf;
 
@@ -90,7 +90,7 @@ server {
     listen 443 ssl;
     listen [::]:443 ssl;
 
-    server_name cast.photos.*;
+    server_name tele-photos.*;
 
     include /config/nginx/ssl.conf;
 
@@ -108,33 +108,33 @@ server {
     }
 }
 
-server {
-    listen 443 ssl;
-    listen [::]:443 ssl;
-
-    server_name share.photos.*;
-
-    include /config/nginx/ssl.conf;
-
-    client_max_body_size 0;
-
-    location / {
-
-        include /config/nginx/proxy.conf;
-        include /config/nginx/resolver.conf;
-        set $upstream_app ente-web;
-        set $upstream_port 3005;
-        set $upstream_proto http;
-        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-
-    }
-}
+#server {
+#    listen 443 ssl;
+#    listen [::]:443 ssl;
+#
+#    server_name partage-photos.*; # This is Ente Locker for files, not only photos
+#
+#    include /config/nginx/ssl.conf;
+#
+#    client_max_body_size 0;
+#
+#    location / {
+#
+#        include /config/nginx/proxy.conf;
+#        include /config/nginx/resolver.conf;
+#        set $upstream_app ente-web;
+#        set $upstream_port 3005;
+#        set $upstream_proto http;
+#        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+#
+#    }
+#}
 
 server {
     listen 443 ssl;
     listen [::]:443 ssl;
 
-    server_name embed.photos.*;
+    server_name capsule-photos.*;
 
     include /config/nginx/ssl.conf;