(attic-docker) branch main updated: Rearrange files ready for merge with main attic repo

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/attic-docker.git


The following commit(s) were added to refs/heads/main by this push:
     new 1b44c9a  Rearrange files ready for merge with main attic repo
1b44c9a is described below

commit 1b44c9ad6cd9d7bb116fa16fe2a9fff260828838
Author: Sebb <s...@apache.org>
AuthorDate: Sun Oct 5 17:18:03 2025 +0100

    Rearrange files ready for merge with main attic repo
---
 .dockerignore                        | 3 ++-
 Dockerfile                           | 4 ++--
 README.md                            | 2 +-
 {config => _docker}/000-default.conf | 0
 compose.yaml                         | 6 +++---
 {config => scripts}/attic_filter.lua | 0
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 78af629..fe080ff 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,4 +2,5 @@
 **
 
 # Allow what we want
-!config/**
+!_docker/**
+!scripts/attic_filter.lua
diff --git a/Dockerfile b/Dockerfile
index 6585b69..3e483ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,8 +23,8 @@ RUN a2enmod cgi && \
 RUN apt-get update && DEBIAN_FRONTEND='noninteractive' apt-get install -y \
   vim
     
-COPY config/000-default.conf /etc/apache2/sites-enabled/000-default.conf
-COPY config/attic_filter.lua /etc/apache2/conf-enabled/attic_filter.lua
+COPY _docker/000-default.conf /etc/apache2/sites-enabled/000-default.conf
+COPY scripts/attic_filter.lua /etc/apache2/conf-enabled/attic_filter.lua
 
 EXPOSE 80
 
diff --git a/README.md b/README.md
index 30b34c2..c72734d 100644
--- a/README.md
+++ b/README.md
@@ -43,5 +43,5 @@ Stop httpd server (and the container):
 `docker compose exec attic_lua_csp apachectl stop`
 
 To make changes to the CSP, edit the 
-file 
[config/000-default.conf#L9-L17](https://github.com/apache/attic-docker/blob/main/config/000-default.conf#L9-L17)
+file 
[_docker/000-default.conf#L9-L17](https://github.com/apache/attic-docker/blob/main/_docker/000-default.conf#L9-L17)
 Then rebuild the image (should be very quick) and restart.
diff --git a/config/000-default.conf b/_docker/000-default.conf
similarity index 100%
rename from config/000-default.conf
rename to _docker/000-default.conf
diff --git a/compose.yaml b/compose.yaml
index 456befb..e00fed9 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -9,10 +9,10 @@ services:
       # (e.g. set this to a checkout of 
infrastructure-p6/modules/closer_cgi/files)
       - ${VAR_DYN:-.}:/var/www/dyn
       # Needs to match xxx.apache.org or closer.lua reverts to default template
-      - ${VAR_HTML:-./www}:/var/www/site.apache.org
-      - ${VAR_LOG:-./log}:/var/log/apache2
+      - ${VAR_HTML:-./_docker/www}:/var/www/site.apache.org
+      - ${VAR_LOG:-./_docker/log}:/var/log/apache2
     environment:
       # Pass in site name
       - VAR_NAME=${VAR_NAME:-localhost}
       # Act as though _ATTIC directory is present (if yes)
-      - VAR_ATTIC=${VAR_ATTIC:-no}
\ No newline at end of file
+      - VAR_ATTIC=${VAR_ATTIC:-no}
diff --git a/config/attic_filter.lua b/scripts/attic_filter.lua
similarity index 100%
rename from config/attic_filter.lua
rename to scripts/attic_filter.lua