From: Kai Moritz Date: Mon, 8 Dec 2025 18:07:03 +0000 (+0100) Subject: Hugo-Content wird von nginx mit ausgeliefert (= ist in Thymeroot sichtbar) X-Git-Tag: hugo--rebase--2025-12-17--20-25~8 X-Git-Url: https://juplo.de/gitweb/?a=commitdiff_plain;h=f0eee09c2ae5f62eacd9ed922db80cdc001c40c7;p=website Hugo-Content wird von nginx mit ausgeliefert (= ist in Thymeroot sichtbar) --- diff --git a/.gitmodules b/.gitmodules index 325eddef..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +0,0 @@ -[submodule "juplo.de"] - path = juplo.de - url = juplo.de:/var/lib/git/juplo/website - branch = frontend diff --git a/docker-compose.yml b/docker-compose.yml index 13085442..b47d6012 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ services: nginx: image: nginx:mainline-alpine ports: - - 8888:80 + - 8888:8888 volumes: - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro - ./:/usr/share/nginx/html:ro diff --git a/juplo.de b/juplo.de deleted file mode 160000 index d306ede4..00000000 --- a/juplo.de +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d306ede4bcd5c07c74288921d8117bd32735e352 diff --git a/nginx.conf b/nginx.conf index b5a1b87c..c2ec7bbc 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,15 +1,101 @@ server { - listen 80; - listen [::]:80; + listen 8888; + listen [::]:8888; server_name localhost; index index.html index.htm; - root /usr/share/nginx/html/juplo.de/dist; + root /usr/share/nginx/html/hugo/public; location / { expires 0; } + + location /about.html { + alias /usr/share/nginx/html/juplo.de/dist/about.html; + expires 0; + } + location /agb.html { + alias /usr/share/nginx/html/juplo.de/dist/agb.html; + expires 0; + } + location /contact.html { + alias /usr/share/nginx/html/juplo.de/dist/contact.html; + expires 0; + } + location /css { + alias /usr/share/nginx/html/juplo.de/dist/css; + expires 0; + } + location /datenschutz.html { + alias /usr/share/nginx/html/juplo.de/dist/datenschutz.html; + expires 0; + } + location /error { + alias /usr/share/nginx/html/juplo.de/dist/error; + expires 0; + } + location /expertise.html { + alias /usr/share/nginx/html/juplo.de/dist/expertise.html; + expires 0; + } + location /favicon.ico { + alias /usr/share/nginx/html/juplo.de/dist/favicon.ico; + expires 0; + } + location /fonts { + alias /usr/share/nginx/html/juplo.de/dist/fonts; + expires 0; + } + location /google-analytics.html { + alias /usr/share/nginx/html/juplo.de/dist/google-analytics.html; + expires 0; + } + location /haftung-inhalte.html { + alias /usr/share/nginx/html/juplo.de/dist/haftung-inhalte.html; + expires 0; + } + location /haftung-links.html { + alias /usr/share/nginx/html/juplo.de/dist/haftung-links.html; + expires 0; + } + location /img { + alias /usr/share/nginx/html/juplo.de/dist/img; + expires 0; + } + location /impressum.html { + alias /usr/share/nginx/html/juplo.de/dist/impressum.html; + expires 0; + } + location /index.html { + alias /usr/share/nginx/html/juplo.de/dist/index.html; + expires 0; + } + location /js { + alias /usr/share/nginx/html/juplo.de/dist/js; + expires 0; + } + location /projects.html { + alias /usr/share/nginx/html/juplo.de/dist/projects.html; + expires 0; + } + location /references.html { + alias /usr/share/nginx/html/juplo.de/dist/references.html; + expires 0; + } + location /sitemap.json { + alias /usr/share/nginx/html/juplo.de/dist/sitemap.json; + expires 0; + } + location /templates { + alias /usr/share/nginx/html/juplo.de/dist/templates; + expires 0; + } + location /urheberrechte.html { + alias /usr/share/nginx/html/juplo.de/dist/urheberrechte.html; + expires 0; + } + location /projects/ { alias /usr/share/nginx/html/projects/; expires 0;