Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit fc1f6139 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

fix(nginx): add http_x_forwarded_proto to manage nginx redirect properly

parent fe692882

config/nginx/templates/default.conf.template

+9 −4
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ map $arg_v $asset_immutable { 
    default ", immutable";

}



map $http_x_forwarded_proto $real_scheme {

  default $http_x_forwarded_proto;

  ''      $scheme;

}



# use docker DNS resolver with limited cache value for nc update or scaling

resolver 127.0.0.11 valid=5s;
@@ -106,15 +111,15 @@ server { 
        # The rules in this block are an adaptation of the rules

        # in `.htaccess` that concern `/.well-known`.



        location = /.well-known/carddav { return 301 $scheme://$http_host/remote.php/dav/; }

        location = /.well-known/caldav  { return 301 $scheme://$http_host/remote.php/dav/; }

        location = /.well-known/carddav { return 301 $real_scheme://$http_host/remote.php/dav/; }

        location = /.well-known/caldav  { return 301 $real_scheme://$http_host/remote.php/dav/; }



        location /.well-known/acme-challenge    { try_files $uri $uri/ =404; }

        location /.well-known/pki-validation    { try_files $uri $uri/ =404; }



        # Let Nextcloud's API for `/.well-known` URIs handle all other

        # requests by passing them to the front-end controller.

        return 301 $scheme://$http_host/index.php$request_uri;

        return 301 $real_scheme://$http_host/index.php$request_uri;

    }



    # Rules borrowed from `.htaccess` to hide certain paths from clients
@@ -171,7 +176,7 @@ server { 


    # Rule borrowed from `.htaccess`

    location /remote {

        return 301 $scheme://$http_host/remote.php$request_uri;

        return 301 $real_scheme://$http_host/remote.php$request_uri;

    }



    location / {

docker-compose.yml

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ services: 
        - "traefik.enable=true"

        - "traefik.http.routers.${DB_USER}-nextcloud.rule=Host(`${DOMAIN}`)"

        - "traefik.http.services.${DB_USER}-nextcloud.loadbalancer.server.port=80"

        - "traefik.http.middlewares.${DB_USER}-nextcloud.headers.customrequestheaders.X-Forwarded-Proto=https"



networks:

  proxy-network: