aboutsummaryrefslogtreecommitdiffstats
path: root/docker/apache
diff options
context:
space:
mode:
authorlolcat <will@lolcat.ca>2025-02-01 22:53:06 -0500
committerlolcat <will@lolcat.ca>2025-02-01 22:53:06 -0500
commit36b0c570aaa27cd8ca7d7bc1ec9232339afc5d4e (patch)
treecfe8b1a638df98e5b3d23ed934a79f1938e610e2 /docker/apache
parent47a7a2a224620bcbeea822c9201bc76c94f191fe (diff)
parent0180cf5224c8287975b1a091612887a9ca0256f6 (diff)
Merge branch 'master' of https://git.lolcat.ca/lolcat/4get
Diffstat (limited to 'docker/apache')
-rw-r--r--docker/apache/http/conf.d/ssl.conf1
-rw-r--r--docker/apache/http/httpd.conf (renamed from docker/apache/http.conf)0
-rw-r--r--docker/apache/https/conf.d/ssl.conf (renamed from docker/apache/conf.d/ssl.conf)0
-rw-r--r--docker/apache/https/httpd.conf (renamed from docker/apache/https.conf)0
4 files changed, 1 insertions, 0 deletions
diff --git a/docker/apache/http/conf.d/ssl.conf b/docker/apache/http/conf.d/ssl.conf
new file mode 100644
index 0000000..1357f56
--- /dev/null
+++ b/docker/apache/http/conf.d/ssl.conf
@@ -0,0 +1 @@
+# intentionally blank
diff --git a/docker/apache/http.conf b/docker/apache/http/httpd.conf
index f496ba5..f496ba5 100644
--- a/docker/apache/http.conf
+++ b/docker/apache/http/httpd.conf
diff --git a/docker/apache/conf.d/ssl.conf b/docker/apache/https/conf.d/ssl.conf
index 7b0dd15..7b0dd15 100644
--- a/docker/apache/conf.d/ssl.conf
+++ b/docker/apache/https/conf.d/ssl.conf
diff --git a/docker/apache/https.conf b/docker/apache/https/httpd.conf
index ca5edf5..ca5edf5 100644
--- a/docker/apache/https.conf
+++ b/docker/apache/https/httpd.conf
send patches to the email below
yukais@pinapelz.com
include the subject [PATCH repo_name]
pinapelz.com
homepage