From 7607d807fe2fb3d9a89ea008b7d24655d1e68ce3 Mon Sep 17 00:00:00 2001 From: James Downie Date: Tue, 1 Jul 2025 20:31:05 +1000 Subject: [PATCH] Moving pages into sub-folders. --- docker-compose.yaml | 16 ++++++++++++++-- {agenda => web/agenda}/20250708.md | 0 {agenda => web/agenda}/20250724.md | 0 cal.php => web/cal.php | 0 cal_testing.php => web/cal_testing.php | 0 events.json => web/events.json | 0 events_testing.json => web/events_testing.json | 0 {image => web/image}/icon/calendar.png | Bin {image => web/image}/icon/chat.png | Bin {image => web/image}/icon/email.png | Bin {image => web/image}/icon/handshake.png | Bin {image => web/image}/icon/jitsi.svg | 0 {image => web/image}/icon/webcam.png | Bin index.css => web/index.css | 0 index.js => web/index.js | 0 index.php => web/index.php | 0 {minutes => web/minutes}/20250619.md | 0 17 files changed, 14 insertions(+), 2 deletions(-) rename {agenda => web/agenda}/20250708.md (100%) rename {agenda => web/agenda}/20250724.md (100%) rename cal.php => web/cal.php (100%) rename cal_testing.php => web/cal_testing.php (100%) rename events.json => web/events.json (100%) rename events_testing.json => web/events_testing.json (100%) rename {image => web/image}/icon/calendar.png (100%) rename {image => web/image}/icon/chat.png (100%) rename {image => web/image}/icon/email.png (100%) rename {image => web/image}/icon/handshake.png (100%) rename {image => web/image}/icon/jitsi.svg (100%) rename {image => web/image}/icon/webcam.png (100%) rename index.css => web/index.css (100%) rename index.js => web/index.js (100%) rename index.php => web/index.php (100%) rename {minutes => web/minutes}/20250619.md (100%) diff --git a/docker-compose.yaml b/docker-compose.yaml index f15db2e..24ff66a 100755 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,10 +5,22 @@ services: ports: - "8080:80" volumes: - - ./:/var/www/html:Z + - ./web/:/var/www/html:Z + - ./vendor/:/var/www/html/vendor:Z networks: - labnet - + cal: + image: php:8.2-apache + container_name: calendar + ports: + - "8081:80" + volumes: + - ./cal/:/var/www/html:Z + - ./vendor/:/var/www/html/vendor:Z + networks: + - labnet + profiles: + - cal networks: labnet: external: true diff --git a/agenda/20250708.md b/web/agenda/20250708.md similarity index 100% rename from agenda/20250708.md rename to web/agenda/20250708.md diff --git a/agenda/20250724.md b/web/agenda/20250724.md similarity index 100% rename from agenda/20250724.md rename to web/agenda/20250724.md diff --git a/cal.php b/web/cal.php similarity index 100% rename from cal.php rename to web/cal.php diff --git a/cal_testing.php b/web/cal_testing.php similarity index 100% rename from cal_testing.php rename to web/cal_testing.php diff --git a/events.json b/web/events.json similarity index 100% rename from events.json rename to web/events.json diff --git a/events_testing.json b/web/events_testing.json similarity index 100% rename from events_testing.json rename to web/events_testing.json diff --git a/image/icon/calendar.png b/web/image/icon/calendar.png similarity index 100% rename from image/icon/calendar.png rename to web/image/icon/calendar.png diff --git a/image/icon/chat.png b/web/image/icon/chat.png similarity index 100% rename from image/icon/chat.png rename to web/image/icon/chat.png diff --git a/image/icon/email.png b/web/image/icon/email.png similarity index 100% rename from image/icon/email.png rename to web/image/icon/email.png diff --git a/image/icon/handshake.png b/web/image/icon/handshake.png similarity index 100% rename from image/icon/handshake.png rename to web/image/icon/handshake.png diff --git a/image/icon/jitsi.svg b/web/image/icon/jitsi.svg similarity index 100% rename from image/icon/jitsi.svg rename to web/image/icon/jitsi.svg diff --git a/image/icon/webcam.png b/web/image/icon/webcam.png similarity index 100% rename from image/icon/webcam.png rename to web/image/icon/webcam.png diff --git a/index.css b/web/index.css similarity index 100% rename from index.css rename to web/index.css diff --git a/index.js b/web/index.js similarity index 100% rename from index.js rename to web/index.js diff --git a/index.php b/web/index.php similarity index 100% rename from index.php rename to web/index.php diff --git a/minutes/20250619.md b/web/minutes/20250619.md similarity index 100% rename from minutes/20250619.md rename to web/minutes/20250619.md