Attachment #10122 for bug #49844

View | Details | Raw Unified | Return to bug 49844
Collapse All | Expand All




	domains = []

if configRegistry.is_true('letsencrypt/services/apache2'):
	try:
		with open('/etc/univention/templates/files/etc/apache2/sites-available/ssl.d/10hsts') as fd:
			hsts = run_filter(fd.read(), configRegistry)
	except IOERror:
		hsts = ''
	for domain in domains:
		if domain == fqdn:
			continue

	SSLCertificateKeyFile {key}

	{docker_apps_reverse_proxy}
	{hsts}

</VirtualHost>""".format(
			domain=domain,
			cert=cert_path,
			key=key_path,
			docker_apps_reverse_proxy=docker_apps_reverse_proxy,
			hsts=hsts,
		))
@!@
</IfModule>

Lines 10-16 Build-Depends: debhelper (>> 7), Link Here

(-)a/univention-letsencrypt/debian/control (-1 / +1 lines)
10		10
11	Package: univention-letsencrypt	11	Package: univention-letsencrypt
12	Architecture: all	12	Architecture: all
13	Depends: python, univention-config	13	Depends: python, univention-config, univention-apache
14	Recommends: apache2	14	Recommends: apache2
15	Description: univention-letsencrypt - automatically request SSL certificates	15	Description: univention-letsencrypt - automatically request SSL certificates
16	This package contains acme_tiny.py for semi-automatic request of SSL	16	This package contains acme_tiny.py for semi-automatic request of SSL

Return to bug 49844

Lines 27-32 except AttributeError as e: Link Here

(-)a/univention-letsencrypt/conffiles/etc/apache2/sites-available/univention-letsencrypt.conf (-1 / +8 lines)
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)
		33	except IOERror:
		34	hsts = ''
30	for domain in domains:	35	for domain in domains:
31	if domain == fqdn:	36	if domain == fqdn:
32	continue	37	continue
Lines 51-62 if configRegistry.is_true('letsencrypt/services/apache2'): Link Here
51	SSLCertificateKeyFile {key}	56	SSLCertificateKeyFile {key}
52		57
53	{docker_apps_reverse_proxy}	58	{docker_apps_reverse_proxy}
		59	{hsts}
54		60
55	</VirtualHost>""".format(	61	</VirtualHost>""".format(
56	domain=domain,	62	domain=domain,
57	cert=cert_path,	63	cert=cert_path,
58	key=key_path,	64	key=key_path,
59	docker_apps_reverse_proxy = docker_apps_reverse_proxy	65	docker_apps_reverse_proxy=docker_apps_reverse_proxy,
		66	hsts=hsts,
60	))	67	))
61	@!@	68	@!@
62	</IfModule>	69	</IfModule>