From 07d3895eb57142db63a8e787c09d9061606be336 Mon Sep 17 00:00:00 2001
From: matt <matt@theregion.beer>
Date: Wed, 28 Oct 2026 21:56:05 -0700
Subject: [PATCH] OIDC test - test jumbojett oidc round two change root paths

---
 Dockerfile                           | 2 +-
 web/{ => html}/auth.php              | 4 ++--
 web/{ => html}/callback.php          | 4 ++--
 web/{ => html}/index.php             | 2 +-
 web/{ => html}/photos/photos-old.php | 0
 web/{ => html}/photos/photos.php     | 0
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename web/{ => html}/auth.php (87%)
 rename web/{ => html}/callback.php (90%)
 rename web/{ => html}/index.php (93%)
 rename web/{ => html}/photos/photos-old.php (100%)
 rename web/{ => html}/photos/photos.php (100%)

diff --git a/Dockerfile b/Dockerfile
index fa45aba..6b2fb56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 # Apache on 8069
 COPY apache_ports.conf /etc/apache2/ports.conf
 COPY apache_vhost.conf /etc/apache2/sites-available/000-default.conf
-COPY web/ /var/www/html/
+COPY web/ /var/www/
 # Set up composer
 WORKDIR /var/www/html/
 RUN composer require jumbojett/openid-connect-php
diff --git a/web/auth.php b/web/html/auth.php
similarity index 87%
rename from web/auth.php
rename to web/html/auth.php
index 2521787..a16cfec 100644
--- a/web/auth.php
+++ b/web/html/auth.php
@@ -1,9 +1,9 @@
 <?php
-require __DIR__ . '/vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 use Jumbojett\OpenIDConnectClient;
 
 session_start();
-$config = require __DIR__ . '/config.php';
+$config = require __DIR__ . '/../config.php';
 
 $oidc = new OpenIDConnectClient(
     $config['provider_url'],
diff --git a/web/callback.php b/web/html/callback.php
similarity index 90%
rename from web/callback.php
rename to web/html/callback.php
index 45bc810..7e667a3 100644
--- a/web/callback.php
+++ b/web/html/callback.php
@@ -1,9 +1,9 @@
 <?php
-require __DIR__ . '/vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 use Jumbojett\OpenIDConnectClient;
 
 session_start();
-$config = require __DIR__ . '/config.php';
+$config = require __DIR__ . '/../config.php';
 
 $oidc = new OpenIDConnectClient(
     $config['provider_url'],
diff --git a/web/index.php b/web/html/index.php
similarity index 93%
rename from web/index.php
rename to web/html/index.php
index eabed61..d48fae8 100644
--- a/web/index.php
+++ b/web/html/index.php
@@ -1,6 +1,6 @@
 <?php
 session_start();
-$config = require __DIR__ . '/config.php';
+$config = require __DIR__ . '/../config.php';
 
 if (!isset($_SESSION['authenticated'])) {
     // User not logged in – show a login button
diff --git a/web/photos/photos-old.php b/web/html/photos/photos-old.php
similarity index 100%
rename from web/photos/photos-old.php
rename to web/html/photos/photos-old.php
diff --git a/web/photos/photos.php b/web/html/photos/photos.php
similarity index 100%
rename from web/photos/photos.php
rename to web/html/photos/photos.php