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 69a0f23..c6435cd 100644 Binary files a/ddclient/ddclient.conf and b/ddclient/ddclient.conf differ 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;