From fc576fb730c1f6d262d1c5925c538c58fafc5b36 Mon Sep 17 00:00:00 2001 From: Greg Sarjeant <1686767+gsarjeant@users.noreply.github.com> Date: Sat, 31 May 2025 21:39:56 -0400 Subject: [PATCH] Move server confs to examples. Add atom link in navbar. --- docker-compose.yml => examples/nginx/docker-compose.yml | 4 ++-- tkr-nginx-folder.conf => examples/nginx/tkr-nginx-folder.conf | 4 ---- tkr-nginx.conf => examples/nginx/tkr-nginx.conf | 0 tkr/public/index.php | 1 + 4 files changed, 3 insertions(+), 6 deletions(-) rename docker-compose.yml => examples/nginx/docker-compose.yml (78%) rename tkr-nginx-folder.conf => examples/nginx/tkr-nginx-folder.conf (81%) rename tkr-nginx.conf => examples/nginx/tkr-nginx.conf (100%) diff --git a/docker-compose.yml b/examples/nginx/docker-compose.yml similarity index 78% rename from docker-compose.yml rename to examples/nginx/docker-compose.yml index 72122eb..72631d4 100644 --- a/docker-compose.yml +++ b/examples/nginx/docker-compose.yml @@ -5,8 +5,8 @@ services: - "80:80" volumes: - ./tkr-nginx-folder.conf:/etc/nginx/conf.d/default.conf - - ./tkr:/tkr + - ./../../tkr:/tkr php: image: php:fpm volumes: - - ./tkr:/tkr \ No newline at end of file + - ./../../tkr:/tkr \ No newline at end of file diff --git a/tkr-nginx-folder.conf b/examples/nginx/tkr-nginx-folder.conf similarity index 81% rename from tkr-nginx-folder.conf rename to examples/nginx/tkr-nginx-folder.conf index c90a0e1..b38f449 100644 --- a/tkr-nginx-folder.conf +++ b/examples/nginx/tkr-nginx-folder.conf @@ -6,10 +6,6 @@ server { index index.php; alias /tkr/public; - #location ~ "^/tkr/([0-9]{4}/[0-9]{2}/[0-9]{2}/[0-9]{2}/[0-9]{2}/[0-9]{2})$" { - # rewrite "^/tkr/([0-9/]{19})$ /tkr/tick.php?path=$1" break; - #} - location ~ ^/tkr(/.+\.php)$ { fastcgi_pass php:9000; include fastcgi_params; diff --git a/tkr-nginx.conf b/examples/nginx/tkr-nginx.conf similarity index 100% rename from tkr-nginx.conf rename to examples/nginx/tkr-nginx.conf diff --git a/tkr/public/index.php b/tkr/public/index.php index d6afff5..b0d54f6 100644 --- a/tkr/public/index.php +++ b/tkr/public/index.php @@ -30,6 +30,7 @@ $ticks = iterator_to_array(stream_ticks($limit, $offset));
rss + atom login