diff options
| author | Zuul <zuul@review.opendev.org> | 2023-10-30 09:51:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-10-30 09:51:05 +0000 |
| commit | 100b8b9aba9eb04dee8a3393afb2686f90f4991d (patch) | |
| tree | f202d0464b1ad50350b9126fc8fb30384e13ea1c /docker/letsencrypt/letsencrypt-webserver | |
| parent | 5e7e80fd8828b6614fedc46cc967fe786e780219 (diff) | |
| parent | 3213dccb8c318134695bcc9c9ba480448964314f (diff) | |
| download | kolla-100b8b9aba9eb04dee8a3393afb2686f90f4991d.tar.gz kolla-100b8b9aba9eb04dee8a3393afb2686f90f4991d.zip | |
Merge "Rework letsencrypt"
Diffstat (limited to 'docker/letsencrypt/letsencrypt-webserver')
| -rw-r--r-- | docker/letsencrypt/letsencrypt-webserver/Dockerfile.j2 | 32 | ||||
| -rw-r--r-- | docker/letsencrypt/letsencrypt-webserver/extend_start.sh | 3 |
2 files changed, 35 insertions, 0 deletions
diff --git a/docker/letsencrypt/letsencrypt-webserver/Dockerfile.j2 b/docker/letsencrypt/letsencrypt-webserver/Dockerfile.j2 new file mode 100644 index 000000000..d97af8f9c --- /dev/null +++ b/docker/letsencrypt/letsencrypt-webserver/Dockerfile.j2 @@ -0,0 +1,32 @@ +FROM {{ namespace }}/{{ image_prefix }}letsencrypt-base:{{ tag }} +{% block labels %} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} + +{% block letsencrypt_webserver_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if base_package_type == 'rpm' %} + {% set letsencrypt_webserver_packages = [ + 'httpd', + 'mod_ssl' + ] %} +{% elif base_package_type == 'deb' %} + {% set letsencrypt_webserver_packages = [ + 'apache2' + ] %} +{% endif %} +{{ macros.install_packages(letsencrypt_webserver_packages | customizable("packages")) }} + +{% if base_package_type == 'rpm' %} +RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ + && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf +{% elif base_package_type == 'deb' %} +RUN echo > /etc/apache2/ports.conf +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_letsencrypt_extend_start + +{% block letsencrypt_webserver_footer %}{% endblock %} +{% block footer %}{% endblock %} diff --git a/docker/letsencrypt/letsencrypt-webserver/extend_start.sh b/docker/letsencrypt/letsencrypt-webserver/extend_start.sh new file mode 100644 index 000000000..c55f0b199 --- /dev/null +++ b/docker/letsencrypt/letsencrypt-webserver/extend_start.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +. /usr/local/bin/kolla_httpd_setup |
