Merge branch 'nkupdates-edge' into 'edge'

fix: fixed naming of nginx ssl config file

See merge request !26

Dockerfile

@@ -44,7 +44,7 @@ RUN set -eux; \
 
 # Nginx - override the default vhost to include UWSGI support
 COPY etc/nginx/http.d/50_vhost_default.conf.template /etc/nginx/http.d
-COPY etc/nginx/http.d/50_vhost_default-ssl-certbot.conf.template /etc/nginx/http.d
+COPY etc/nginx/http.d/55_vhost_default-ssl-certbot.conf.template /etc/nginx/http.d
 
 
 # UWSGI
@@ -61,12 +61,12 @@ RUN set -eux; \
 	chown root:root \
 		/app \
 		/etc/nginx/http.d/50_vhost_default.conf.template \
-		/etc/nginx/http.d/50_vhost_default-ssl-certbot.conf.template \
+		/etc/nginx/http.d/55_vhost_default-ssl-certbot.conf.template \
 		/etc/uwsgi/uwsgi.ini \
 		/usr/local/sbin/start-uwsgi; \
 	chmod 0644 \
 		/etc/nginx/http.d/50_vhost_default.conf.template \
-		/etc/nginx/http.d/50_vhost_default-ssl-certbot.conf.template \
+		/etc/nginx/http.d/55_vhost_default-ssl-certbot.conf.template \
 		/etc/uwsgi/uwsgi.ini; \
 	chmod 0755 \
 		/app \