Update the nginx configs to include an fpm config
This commit is contained in:
parent
cd6b1f9ca3
commit
6da69b8bf3
|
@ -1,6 +1,7 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
networking.firewall.allowedTCPPorts = [
|
networking.firewall.allowedTCPPorts = [
|
||||||
|
80
|
||||||
443
|
443
|
||||||
];
|
];
|
||||||
security.acme = {
|
security.acme = {
|
||||||
|
@ -9,8 +10,31 @@
|
||||||
};
|
};
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
commonHttpConfig = ''
|
||||||
|
# Add HSTS header with preloading to HTTPS requests.
|
||||||
|
# Adding this header to HTTP requests is discouraged
|
||||||
|
map $scheme $hsts_header {
|
||||||
|
https "max-age=63072000; includeSubdomains; preload";
|
||||||
|
}
|
||||||
|
add_header Strict-Transport-Security $hsts_header;
|
||||||
|
|
||||||
|
# Enable CSP for your services.
|
||||||
|
#add_header Content-Security-Policy "script-src 'self'; object-src 'none'; base-uri 'none';" always;
|
||||||
|
|
||||||
|
# Minimize information leaked to other domains
|
||||||
|
add_header 'Referrer-Policy' 'origin-when-cross-origin';
|
||||||
|
|
||||||
|
# Prevent injection of code in other mime types (XSS Attacks)
|
||||||
|
add_header X-Content-Type-Options nosniff;
|
||||||
|
|
||||||
|
# Enable XSS protection of the browser.
|
||||||
|
# May be unnecessary when CSP is configured properly (see above)
|
||||||
|
add_header X-XSS-Protection "1; mode=block";
|
||||||
|
|
||||||
|
# This might create errors
|
||||||
|
proxy_cookie_path / "/; secure; HttpOnly; SameSite=strict";
|
||||||
|
'';
|
||||||
recommendedOptimisation = true;
|
recommendedOptimisation = true;
|
||||||
recommendedProxySettings = true;
|
|
||||||
recommendedTlsSettings = true;
|
recommendedTlsSettings = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
{ domain, inputs, port ? "8080", ... }:
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
"${inputs.self}/modules/nginx-acme-base"
|
|
||||||
];
|
|
||||||
services.nginx = {
|
|
||||||
commonHttpConfig = ''
|
|
||||||
# Add HSTS header with preloading to HTTPS requests.
|
|
||||||
# Adding this header to HTTP requests is discouraged
|
|
||||||
map $scheme $hsts_header {
|
|
||||||
https "max-age=63072000; includeSubdomains; preload";
|
|
||||||
}
|
|
||||||
add_header Strict-Transport-Security $hsts_header;
|
|
||||||
|
|
||||||
# Enable CSP for your services.
|
|
||||||
#add_header Content-Security-Policy "script-src 'self'; object-src 'none'; base-uri 'none';" always;
|
|
||||||
|
|
||||||
# Minimize information leaked to other domains
|
|
||||||
add_header 'Referrer-Policy' 'origin-when-cross-origin';
|
|
||||||
|
|
||||||
# Disable embedding as a frame
|
|
||||||
add_header X-Frame-Options DENY;
|
|
||||||
|
|
||||||
# Prevent injection of code in other mime types (XSS Attacks)
|
|
||||||
add_header X-Content-Type-Options nosniff;
|
|
||||||
|
|
||||||
# Enable XSS protection of the browser.
|
|
||||||
# May be unnecessary when CSP is configured properly (see above)
|
|
||||||
add_header X-XSS-Protection "1; mode=block";
|
|
||||||
|
|
||||||
# This might create errors
|
|
||||||
proxy_cookie_path / "/; secure; HttpOnly; SameSite=strict";
|
|
||||||
'';
|
|
||||||
virtualHosts."${domain}" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:${port}";
|
|
||||||
proxyWebsockets = true; # needed if you need to use WebSocket
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
{ dataDir, documentRoot ? "/var/www/html", domain, inputs, pkgs, port ? "9000", ... }:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
"${inputs.self}/modules/nginx-acme-base"
|
||||||
|
];
|
||||||
|
services.nginx = {
|
||||||
|
appendHttpConfig = ''
|
||||||
|
index index.php;
|
||||||
|
'';
|
||||||
|
virtualHosts."${domain}" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
root = dataDir;
|
||||||
|
locations = {
|
||||||
|
"~ \\.php$" = {
|
||||||
|
extraConfig = ''
|
||||||
|
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
||||||
|
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||||
|
include ${pkgs.nginx}/conf/fastcgi.conf;
|
||||||
|
fastcgi_param SCRIPT_FILENAME ${documentRoot}$fastcgi_script_name;
|
||||||
|
fastcgi_index index.php;
|
||||||
|
fastcgi_pass 127.0.0.1:${port};
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,20 @@
|
||||||
|
{ domain, inputs, port ? "8080", ... }: {
|
||||||
|
imports = [
|
||||||
|
"${inputs.self}/modules/nginx-acme-base"
|
||||||
|
];
|
||||||
|
services.nginx = {
|
||||||
|
appendHttpConfig = ''
|
||||||
|
# Disable embedding as a frame
|
||||||
|
add_header X-Frame-Options DENY;
|
||||||
|
'';
|
||||||
|
recommendedProxySettings = true;
|
||||||
|
virtualHosts."${domain}" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://127.0.0.1:${port}";
|
||||||
|
proxyWebsockets = true; # needed if you need to use WebSocket
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -8,7 +8,7 @@
|
||||||
(import "${inputs.self}/modules/restic-server-mysql-client" {
|
(import "${inputs.self}/modules/restic-server-mysql-client" {
|
||||||
time = "03:00"; inherit custom hostname inputs pkgs;
|
time = "03:00"; inherit custom hostname inputs pkgs;
|
||||||
})
|
})
|
||||||
(import "${inputs.self}/modules/nginx-acme" {
|
(import "${inputs.self}/modules/nginx-proxy" {
|
||||||
domain = "git.2li.ch"; inherit inputs;
|
domain = "git.2li.ch"; inherit inputs;
|
||||||
})
|
})
|
||||||
"${inputs.self}/modules/docker"
|
"${inputs.self}/modules/docker"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
(import "${inputs.self}/modules/restic-server-client" {
|
(import "${inputs.self}/modules/restic-server-client" {
|
||||||
time = "04:30"; inherit custom hostname inputs pkgs;
|
time = "04:30"; inherit custom hostname inputs pkgs;
|
||||||
})
|
})
|
||||||
(import "${inputs.self}/modules/nginx-acme" {
|
(import "${inputs.self}/modules/nginx-proxy" {
|
||||||
domain = "mail.zweili.org"; inherit inputs;
|
domain = "mail.zweili.org"; inherit inputs;
|
||||||
})
|
})
|
||||||
"${inputs.self}/modules/docker"
|
"${inputs.self}/modules/docker"
|
||||||
|
|
|
@ -14,34 +14,11 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
commonHttpConfig = ''
|
appendHttpConfig = ''
|
||||||
# Add HSTS header with preloading to HTTPS requests.
|
|
||||||
# Adding this header to HTTP requests is discouraged
|
|
||||||
map $scheme $hsts_header {
|
|
||||||
https "max-age=63072000; includeSubdomains; preload";
|
|
||||||
}
|
|
||||||
add_header Strict-Transport-Security $hsts_header;
|
|
||||||
|
|
||||||
# Enable CSP for your services.
|
|
||||||
#add_header Content-Security-Policy "script-src 'self'; object-src 'none'; base-uri 'none';" always;
|
|
||||||
|
|
||||||
# Minimize information leaked to other domains
|
|
||||||
add_header 'Referrer-Policy' 'origin-when-cross-origin';
|
|
||||||
|
|
||||||
# Allow embedding from same domain
|
# Allow embedding from same domain
|
||||||
add_header X-Frame-Options SAMEORIGIN;
|
add_header X-Frame-Options SAMEORIGIN;
|
||||||
|
|
||||||
# Prevent injection of code in other mime types (XSS Attacks)
|
|
||||||
add_header X-Content-Type-Options nosniff;
|
|
||||||
|
|
||||||
# Enable XSS protection of the browser.
|
|
||||||
# May be unnecessary when CSP is configured properly (see above)
|
|
||||||
add_header X-XSS-Protection "1; mode=block";
|
|
||||||
|
|
||||||
# This might create errors
|
|
||||||
proxy_cookie_path / "/; secure; HttpOnly; SameSite=strict";
|
|
||||||
|
|
||||||
'';
|
'';
|
||||||
|
clientMaxBodySize = "20G";
|
||||||
virtualHosts."nextcloud.2li.ch" = {
|
virtualHosts."nextcloud.2li.ch" = {
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
|
@ -52,7 +29,6 @@
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
# Required for large downloads
|
# Required for large downloads
|
||||||
proxy_buffering off;
|
proxy_buffering off;
|
||||||
client_max_body_size 20G;
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,15 +1,30 @@
|
||||||
{ hostname, inputs, pkgs, ... }:
|
{ hostname, inputs, pkgs, ... }:
|
||||||
|
let
|
||||||
|
domain = "test.2li.ch";
|
||||||
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(import "${inputs.self}/systems/raspi4" {
|
(import "${inputs.self}/systems/raspi4" {
|
||||||
ip = "10.7.89.150";
|
ip = "10.7.89.150";
|
||||||
inherit hostname inputs pkgs;
|
inherit hostname inputs pkgs;
|
||||||
})
|
})
|
||||||
(import "${inputs.self}/modules/nginx-acme" {
|
(import "${inputs.self}/modules/nginx-fpm" {
|
||||||
domain = "test.2li.ch";
|
dataDir = "/var/www/ttrss/app";
|
||||||
inherit inputs;
|
inherit domain inputs pkgs;
|
||||||
})
|
})
|
||||||
"${inputs.self}/modules/docker"
|
"${inputs.self}/modules/docker"
|
||||||
"${inputs.self}/modules/tmux"
|
"${inputs.self}/modules/tmux"
|
||||||
];
|
];
|
||||||
|
services.nginx.virtualHosts."${domain}".locations = {
|
||||||
|
"/".extraConfig = ''
|
||||||
|
try_files $uri $uri/ = 404;
|
||||||
|
'';
|
||||||
|
"/tt-rss/cache".extraConfig = ''
|
||||||
|
aio threads;
|
||||||
|
internal;
|
||||||
|
'';
|
||||||
|
"/tt-rss/backups".extraConfig = ''
|
||||||
|
internal;
|
||||||
|
'';
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
ip = "10.7.89.115";
|
ip = "10.7.89.115";
|
||||||
inherit hostname inputs;
|
inherit hostname inputs;
|
||||||
})
|
})
|
||||||
(import "${inputs.self}/modules/nginx-acme" {
|
(import "${inputs.self}/modules/nginx-proxy" {
|
||||||
domain = "ttrss.2li.ch"; inherit inputs;
|
domain = "ttrss.2li.ch"; inherit inputs;
|
||||||
})
|
})
|
||||||
(import "${inputs.self}/modules/restic-server-mysql-client" {
|
(import "${inputs.self}/modules/restic-server-mysql-client" {
|
||||||
|
|
Loading…
Reference in New Issue