Fix nginx SSL

guimard · Aug 16, 2024 · bc58c54 · bc58c54
1 parent 513adad
commit bc58c54
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/portal/install/etc/cont-init.d/update-nginx-portal-conf b/portal/install/etc/cont-init.d/update-nginx-portal-conf
@@ -16,7 +16,7 @@ s#__PORTALSTATICDIR__#/usr/share/lemonldap-ng/portal/htdocs/static/#g;
 ' /etc/lemonldap-ng/portal-nginx.conf
 
 if test "$TLS_CERT_FILE"; then
-	perl -i -pe 's/^(\s*listen.*)80/${1}443/' /etc/lemonldap-ng/portal-nginx.conf
+	perl -i -pe 's/^(\s*listen.*)80/${1}443 ssl/' /etc/lemonldap-ng/portal-nginx.conf
 	if grep ssl_certificate /etc/lemonldap-ng/portal-nginx.conf; then
 		echo "SSL already configured ?"
 	else

diff --git a/uwsgi-portal/install/etc/cont-init.d/update-nginx-portal-conf b/uwsgi-portal/install/etc/cont-init.d/update-nginx-portal-conf
@@ -15,6 +15,19 @@ s#__PORTALSITEDIR__#/usr/share/lemonldap-ng/portal/htdocs/#g;
 s#__PORTALSTATICDIR__#/usr/share/lemonldap-ng/portal/htdocs/static/#g;
 ' /etc/lemonldap-ng/portal-nginx.conf
 
+if test "$TLS_CERT_FILE"; then
+	perl -i -pe 's/^(\s*listen.*)80/${1}443 ssl/' /etc/lemonldap-ng/portal-nginx.conf
+	if grep ssl_certificate /etc/lemonldap-ng/portal-nginx.conf; then
+		echo "SSL already configured ?"
+	else
+		perl -i -pe 'BEGIN{our $setCert="
+  ssl_certificate $ENV{TLS_CERT_FILE};
+  ssl_certificate_key $ENV{TLS_KEY_FILE};
+"};s/^(\s*server_name)/$setCert$1/' /etc/lemonldap-ng/portal-nginx.conf
+	fi
+	cat /etc/lemonldap-ng/portal-nginx.conf
+fi
+
 if test "$RELAY" != ''; then
 	set -e
 	perl -e '