Comparar texto

Encuentra la diferencia entre dos archivos de texto

Editor live

Ocultar sin cambios

Sin ajuste de línea

Vista

Nivel de detalle

Resaltado de sintaxis

Diffchecker Desktop La forma más segura de usar Diffchecker. ¡Obtén la app de Diffchecker Desktop: tus diffs nunca salen de tu computadora!Obtener Desktop

default.conf

Creado el año pasadoEl diff nunca expira

3 eliminaciones

Líneas
Total
Eliminado

Caracteres
Total
Eliminado

Para continuar usando esta función, actualice a Diffchecker Pro Ver precios

84 líneas

1 adición

Líneas
Total
Añadido

Caracteres
Total
Añadido

Para continuar usando esta función, actualice a Diffchecker Pro Ver precios

82 líneas

## Version 2024/07/16 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample

## Version 2024/12/17 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample

# redirect all traffic to https

server {

listen 80 default_server;

listen [::]:80 default_server;

location / {

return 301 https://$host$request_uri;

}

# main server block

server {

listen 443 ssl default_server;

listen [::]:443 ssl default_server;

server_name _;

include /config/nginx/ssl.conf;

root /config/www;

index index.html index.htm index.php;

# enable subfolder method reverse proxy confs

include /config/nginx/proxy-confs/*.subfolder.conf;

# enable for ldap auth (requires ldap-location.conf in the location block)

#include /config/nginx/ldap-server.conf;

# enable for Authelia (requires authelia-location.conf in the location block)

#include /config/nginx/authelia-server.conf;

# enable for Authentik (requires authentik-location.conf in the location block)

#include /config/nginx/authentik-server.conf;

location / {

# enable for basic auth

#auth_basic "Restricted";

#auth_basic_user_file /config/nginx/.htpasswd;

# enable for ldap auth (requires ldap-server.conf in the server block)

#include /config/nginx/ldap-location.conf;

# enable for Authelia (requires authelia-server.conf in the server block)

#include /config/nginx/authelia-location.conf;

# enable for Authentik (requires authentik-server.conf in the server block)

#include /config/nginx/authentik-location.conf;

try_files $uri $uri/ /index.html /index.htm /index.php$is_args$args;

}

location ~ ^(.+\.php)(.*)$ {

# enable the next two lines for http auth

#auth_basic "Restricted";

#auth_basic_user_file /config/nginx/.htpasswd;

# enable for ldap auth (requires ldap-server.conf in the server block)

#include /config/nginx/ldap-location.conf;

# enable for Authelia (requires authelia-server.conf in the server block)

#include /config/nginx/authelia-location.conf;

# enable for Authentik (requires authentik-server.conf in the server block)

#include /config/nginx/authentik-location.conf;

fastcgi_split_path_info ^(.+\.php)(.*)$;

if (!-f $document_root$fastcgi_script_name) { return 404; }

fastcgi_pass 127.0.0.1:9000;

fastcgi_index index.php;

include /etc/nginx/fastcgi_params;

}

# deny access to .htaccess/.htpasswd files

location ~ /\.ht {

deny all;

}

# enable subdomain method reverse proxy confs

include /config/nginx/proxy-confs/*.subdomain.conf;

# enable proxy cache for auth

proxy_cache_path cache/ keys_zone=auth_cache:10m;

Diferencias guardadas

Texto original

Abrir archivo

## Version 2024/07/16 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample

# redirect all traffic to https
server {
    listen 80 default_server;
    listen [::]:80 default_server;

location / {
        return 301 https://$host$request_uri;
    }
}

# main server block
server {
    listen 443 ssl default_server;
    listen [::]:443 ssl default_server;

server_name _;

include /config/nginx/ssl.conf;

root /config/www;
    index index.html index.htm index.php;

# enable subfolder method reverse proxy confs
    include /config/nginx/proxy-confs/*.subfolder.conf;

# enable for ldap auth (requires ldap-location.conf in the location block)
    #include /config/nginx/ldap-server.conf;

# enable for Authelia (requires authelia-location.conf in the location block)
    #include /config/nginx/authelia-server.conf;

# enable for Authentik (requires authentik-location.conf in the location block)
    #include /config/nginx/authentik-server.conf;

location / {
        # enable for basic auth
        #auth_basic "Restricted";
        #auth_basic_user_file /config/nginx/.htpasswd;

# enable for ldap auth (requires ldap-server.conf in the server block)
        #include /config/nginx/ldap-location.conf;

# enable for Authelia (requires authelia-server.conf in the server block)
        #include /config/nginx/authelia-location.conf;

# enable for Authentik (requires authentik-server.conf in the server block)
        #include /config/nginx/authentik-location.conf;

try_files $uri $uri/ /index.html /index.htm /index.php$is_args$args;
    }

location ~ ^(.+\.php)(.*)$ {
        # enable the next two lines for http auth
        #auth_basic "Restricted";
        #auth_basic_user_file /config/nginx/.htpasswd;

# enable for ldap auth (requires ldap-server.conf in the server block)
        #include /config/nginx/ldap-location.conf;

# enable for Authelia (requires authelia-server.conf in the server block)
        #include /config/nginx/authelia-location.conf;

# enable for Authentik (requires authentik-server.conf in the server block)
        #include /config/nginx/authentik-location.conf;

fastcgi_split_path_info ^(.+\.php)(.*)$;
        if (!-f $document_root$fastcgi_script_name) { return 404; }
        fastcgi_pass 127.0.0.1:9000;
        fastcgi_index index.php;
        include /etc/nginx/fastcgi_params;
    }

# deny access to .htaccess/.htpasswd files
    location ~ /\.ht {
        deny all;
    }
}

# enable subdomain method reverse proxy confs
include /config/nginx/proxy-confs/*.subdomain.conf;
# enable proxy cache for auth
proxy_cache_path cache/ keys_zone=auth_cache:10m;

Texto modificado