Merge pull request #3089 from NginxProxyManager/develop

v2.10.4

docker/rootfs/etc/nginx/conf.d/include/force-ssl.conf

@@ -1,14 +1,3 @@
-# Since force-ssl.conf has now moved to the server section it overrides
-# the LetsEncrypt config which is inside a location section
-# Set FORCE variable in first two if tests pass and action in the third
-set $FORCE "";
 if ($scheme = "http") {
-        set $FORCE 'H';
+	return 301 https://$host$request_uri;
 }
-if ($request_uri !~ "^\/\.well-known\/acme-challenge\/(.*)") {
-        set $FORCE "${FORCE}D";
-}
-# If we are http and outside the LetsEncrypt directories redirect to https via 301
-if ($FORCE = HD) {
-        return 301 https://$host$request_uri;
-}