|
|
|---|
| 0 |
-- A/etc/univention/templates/files/etc/apache2/sites-available/univention-letsencrypt.conf 2023-02-22 21:54:20.463097949 +0100 |
0 |
++ B/etc/univention/templates/files/etc/apache2/sites-available/univention-letsencrypt.conf 2023-12-31 14:40:58.694411057 +0100 |
|
|
|---|
| 27 |
domains = [] |
27 |
domains = [] |
| 28 |
|
28 |
|
| 29 |
if configRegistry.is_true('letsencrypt/services/apache2'): |
29 |
if configRegistry.is_true('letsencrypt/services/apache2'): |
|
|
30 |
try: |
| 31 |
with open('/etc/univention/templates/files/etc/apache2/sites-available/ssl.d/10hsts') as fd: |
| 32 |
hsts = run_filter(fd.read(), configRegistry).decode('UTF-8').replace('\n','\n\t') |
| 33 |
except IOError: |
| 34 |
hsts = '' |
| 35 |
|
| 30 |
for domain in domains: |
36 |
for domain in domains: |
| 31 |
if domain == fqdn: |
37 |
if domain == fqdn: |
| 32 |
continue |
38 |
continue |
|
|
|---|
| 51 |
SSLCertificateKeyFile {key} |
57 |
SSLCertificateKeyFile {key} |
| 52 |
|
58 |
|
| 53 |
{docker_apps_reverse_proxy} |
59 |
{docker_apps_reverse_proxy} |
|
|
60 |
{hsts} |
| 54 |
|
61 |
|
| 55 |
</VirtualHost>""".format( |
62 |
</VirtualHost>""".format( |
| 56 |
domain=domain, |
63 |
domain=domain, |
| 57 |
cert=cert_path, |
64 |
cert=cert_path, |
| 58 |
key=key_path, |
65 |
key=key_path, |
| 59 |
docker_apps_reverse_proxy = docker_apps_reverse_proxy |
66 |
docker_apps_reverse_proxy=docker_apps_reverse_proxy, |
|
|
67 |
hsts=hsts, |
| 60 |
)) |
68 |
)) |
| 61 |
@!@ |
69 |
@!@ |
| 62 |
</IfModule> |
70 |
</IfModule> |