diff options
| author | lolcat <will@lolcat.ca> | 2025-01-24 15:41:41 +0000 |
|---|---|---|
| committer | lolcat <will@lolcat.ca> | 2025-01-24 15:41:41 +0000 |
| commit | 0180cf5224c8287975b1a091612887a9ca0256f6 (patch) | |
| tree | f1e4c3b7df3e1d06b1af387d4184e5b978a38957 /docker/apache | |
| parent | f9f3c919d6df45da859ba46d3ba823e543ca636e (diff) | |
| parent | eed32a153c862cec31d1353ea0ed6e01fc70b8da (diff) | |
Merge pull request 'override ssl.conf when using http config' (#63) from docker_fix_conf into master
Reviewed-on: https://git.lolcat.ca/lolcat/4get/pulls/63
Diffstat (limited to 'docker/apache')
| -rw-r--r-- | docker/apache/http/conf.d/ssl.conf | 1 | ||||
| -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 |