From a8ba5ea96a59aa16116c07ae8dc59fc696768a9e Mon Sep 17 00:00:00 2001
From: Tobias Bouschen <tobias.bouschen@googlemail.com>
Date: Tue, 1 Jul 2025 18:59:45 +0200
Subject: [PATCH 1/4] Simplify recreate-site-branch.yml

Drops '/content/' dir and .htaccess.
---
 .github/workflows/recreate-site-branch.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/recreate-site-branch.yml b/.github/workflows/recreate-site-branch.yml
index a717289..d3913c4 100644
--- a/.github/workflows/recreate-site-branch.yml
+++ b/.github/workflows/recreate-site-branch.yml
@@ -76,7 +76,7 @@ jobs:
           git reset
           rm .gitignore
           git add target/site
-          git add .asf.yaml.publish .htaccess
+          git add .asf.yaml.publish
           git clean -df
 
 
@@ -84,8 +84,7 @@ jobs:
       - name: Move Content and Site Configuration
         if: success()
         run: |
-          mkdir -v content
-          git mv -v target/site/* content/
+          git mv -v target/site/* ./
           git mv -v .asf.yaml.publish .asf.yaml
 
 

From 0b6c4729274191c65d6de856345711ab6e4d40c1 Mon Sep 17 00:00:00 2001
From: Tobias Bouschen <tobias.bouschen@googlemail.com>
Date: Tue, 1 Jul 2025 19:01:13 +0200
Subject: [PATCH 2/4] Simplify deploy-site.yml

Removes '/content' and .htaccess.
---
 .github/workflows/deploy-site.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/deploy-site.yml b/.github/workflows/deploy-site.yml
index 6c8b978..ed67e29 100644
--- a/.github/workflows/deploy-site.yml
+++ b/.github/workflows/deploy-site.yml
@@ -20,7 +20,6 @@ on:
       - 'src/main/template/**'
       - 'src/main/resources/**'
       - '.asf.yaml.publish'
-      - '.htaccess'
       - 'pom.xml'
 
 
@@ -79,8 +78,6 @@ jobs:
         if: success()
         run: |
           cp -v .asf.yaml.publish target/site/.asf.yaml
-          cp -v .htaccess target/site/
-
 
       - name: Check Out Site Branch
         if: success()
@@ -107,7 +104,6 @@ jobs:
         if: success()
         run: |
           mv -v target/site/.asf.yaml ./
-          mv -v target/site/.htaccess ./
 
 
       # Moves the new site resources from the build directory to the content directory
@@ -115,7 +111,7 @@ jobs:
         if: success()
         run: |
           mkdir -v content
-          mv -v target/site/* content/
+          mv -v target/site/* ./
 
           # Explicitly removes build dir
           # This checks whether there are any remaining resources that were not moved to the correct location

From 7066a3a011d63876d0be9c3a072d051659fe0ac7 Mon Sep 17 00:00:00 2001
From: Tobias Bouschen <tobias.bouschen@googlemail.com>
Date: Tue, 1 Jul 2025 19:02:13 +0200
Subject: [PATCH 3/4] Delete .htaccess

---
 .htaccess | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 .htaccess

diff --git a/.htaccess b/.htaccess
deleted file mode 100644
index ebd3035..0000000
--- a/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-RewriteEngine On
-RewriteBase /jdo/
-RewriteRule ^(?!content/)(.*)$ content/$1

From 5ad62614d5d158b24f1cbb36522854bf03e34b5b Mon Sep 17 00:00:00 2001
From: Tobias Bouschen <tobias.bouschen@googlemail.com>
Date: Tue, 1 Jul 2025 19:02:39 +0200
Subject: [PATCH 4/4] Update .asf.yaml.publish

---
 .asf.yaml.publish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml.publish b/.asf.yaml.publish
index f72b21b..b08720c 100644
--- a/.asf.yaml.publish
+++ b/.asf.yaml.publish
@@ -3,4 +3,4 @@
 # This file is only used on the site publishing branch
 publish:
   whoami:  publish
-  subdir:  content/jdo
+  subdir:  jdo