makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

m 2 *: krebs.nginx -> services.nginx

Browse source
This commit is contained in:
makefu 2016-12-24 23:38:01 +01:00
parent 78c50fe495
commit 1745abde62
No known key found for this signature in database
GPG key ID: 36F7711F3FC0F225
9 changed files with 108 additions and 271 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
makefu/2configs/bepasty-dual.nix
View file

@ -20,42 +20,27 @@ let
ext-dom = "paste.krebsco.de" ; ext-dom = "paste.krebsco.de" ;
in { in {
krebs.nginx.enable = mkDefault true; services.nginx.enable = mkDefault true;
krebs.bepasty = { krebs.bepasty = {
enable = true; enable = true;
serveNginx= true; serveNginx= true;
servers = { servers = {
internal = { internal = {
domain = "paste.r";
nginx = { nginx = {
server-names = [ "paste.retiolum" "paste.r" "paste.${config.krebs.build.host.name}" ]; serverAliases = [ "paste.retiolum" "paste.${config.krebs.build.host.name}" ];
}; };
defaultPermissions = "admin,list,create,read,delete"; defaultPermissions = "admin,list,create,read,delete";
secretKey = secKey; secretKey = secKey;
}; };
external = { external = {
domain = ext-dom;
nginx = { nginx = {
server-names = [ ext-dom ]; enableSSL = true;
ssl = { forceSSL = true;
enable = true; enableACME = true;
certificate = "${acmepath}/${ext-dom}/fullchain.pem";
certificate_key = "${acmepath}/${ext-dom}/key.pem";
# these certs will be needed if acme has not yet created certificates:
#certificate = "${sec}/wildcard.krebsco.de.crt";
#certificate_key = "${sec}/wildcard.krebsco.de.key";
ciphers = "RC4:HIGH:!aNULL:!MD5" ;
force_encryption = true;
};
locations = singleton ( nameValuePair "/.well-known/acme-challenge" ''
root ${acmechall}/${ext-dom}/;
'');
extraConfig = ''
ssl_session_cache shared:SSL:1m;
ssl_session_timeout 10m;
ssl_verify_client off;
proxy_ssl_session_reuse off;
'';
}; };
defaultPermissions = "read"; defaultPermissions = "read";
secretKey = secKey; secretKey = secKey;

15
makefu/2configs/deployment/mycube.connector.one.nix
View file

@ -27,23 +27,18 @@ in {
}; };
}; };
krebs.nginx = { services.nginx = {
enable = mkDefault true; enable = mkDefault true;
servers = { virtualHosts."mybox.connector.one" = {
mybox-connector-one = { locations = {
listen = [ "${external-ip}:80" ]; "/".extraConfig = ''
server-names = [
"mycube.connector.one"
"mybox.connector.one"
];
locations = singleton (nameValuePair "/" ''
uwsgi_pass unix://${wsgi-sock}; uwsgi_pass unix://${wsgi-sock};
uwsgi_param UWSGI_CHDIR ${pkgs.mycube-flask}/${pkgs.python.sitePackages}; uwsgi_param UWSGI_CHDIR ${pkgs.mycube-flask}/${pkgs.python.sitePackages};
uwsgi_param UWSGI_MODULE mycube.websrv; uwsgi_param UWSGI_MODULE mycube.websrv;
uwsgi_param UWSGI_CALLABLE app; uwsgi_param UWSGI_CALLABLE app;
include ${pkgs.nginx}/conf/uwsgi_params; include ${pkgs.nginx}/conf/uwsgi_params;
''); '';
}; };
}; };
}; };

141
makefu/2configs/elchos/search.nix
View file

@ -1,11 +1,12 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
# graphite-web on port 8080 # search also generates ddclient entries for all other logs
# carbon cache on port 2003 (tcp/udp)
with import <stockholm/lib>; with import <stockholm/lib>;
let let
#primary-itf = "eth0"; #primary-itf = "eth0";
primary-itf = "wlp2s0"; #primary-itf = "wlp2s0";
primary-itf = config.makefu.server.primary-itf;
elch-sock = "${config.services.uwsgi.runDir}/uwsgi-elch.sock"; elch-sock = "${config.services.uwsgi.runDir}/uwsgi-elch.sock";
ddclientUser = "ddclient"; ddclientUser = "ddclient";
sec = toString <secrets>; sec = toString <secrets>;
@ -14,15 +15,7 @@ let
cfg = "${stateDir}/cfg"; cfg = "${stateDir}/cfg";
ddclientPIDFile = "${stateDir}/ddclient.pid"; ddclientPIDFile = "${stateDir}/ddclient.pid";
acmepath = "/var/lib/acme/";
acmechall = acmepath + "/challenges/";
# TODO: correct cert generation requires a `real` internet ip address # TODO: correct cert generation requires a `real` internet ip address
stats-dom = "stats.nsupdate.info";
search-dom = "search.nsupdate.info";
search_ssl_cert = "${acmepath}/${search-dom}/fullchain.pem";
search_ssl_key = "${acmepath}/${search-dom}/key.pem";
stats_ssl_cert = "${acmepath}/${stats-dom}/fullchain.pem";
stats_ssl_key = "${acmepath}/${stats-dom}/key.pem";
gen-cfg = dict: '' gen-cfg = dict: ''
ssl=yes ssl=yes
@ -64,75 +57,22 @@ in {
}; };
}; };
security.acme.certs = { services.nginx = {
"${stats-dom}" = {
email = "acme@syntax-fehler.de";
webroot = "${acmechall}/${stats-dom}/";
group = "nginx";
allowKeysForGroup = true;
postRun = "systemctl reload nginx.service";
extraDomains = {
"${stats-dom}" = null ;
};
};
"${search-dom}" = {
email = "acme@syntax-fehler.de";
webroot = "${acmechall}/${search-dom}/";
group = "nginx";
allowKeysForGroup = true;
postRun = "systemctl reload nginx.service";
extraDomains = {
"${stats-dom}" = null ;
};
};
};
krebs.nginx = {
enable = mkDefault true; enable = mkDefault true;
servers = { virtualHosts = {
elch-stats = { "search.nsupdate.info" = {
server-names = [ stats-dom ]; enableACME = true;
# listen = [ "80" "443 ssl" ]; forceSSL = true;
ssl = { locations = {
enable = true; "/".extraConfig = ''
certificate = stats_ssl_cert; uwsgi_pass unix://${elch-sock};
certificate_key = stats_ssl_key; uwsgi_param UWSGI_CHDIR ${pkgs.elchhub}/${pkgs.python3.sitePackages};
force_encryption = true; uwsgi_param UWSGI_MODULE elchhub.wsgi;
}; uwsgi_param UWSGI_CALLABLE app;
locations = [ include ${pkgs.nginx}/conf/uwsgi_params;
(nameValuePair "/" '' '';
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://localhost:3000/;
'')
(nameValuePair "/.well-known/acme-challenge" ''
root ${acmechall}/${search-dom}/;
'')
];
};
elchhub = {
server-names = [ "search.nsupdate.info" ];
# listen = [ "80" "443 ssl" ];
ssl = {
enable = true;
certificate = search_ssl_cert;
certificate_key = search_ssl_key;
force_encryption = true;
}; };
locations = [ (nameValuePair "/" ''
uwsgi_pass unix://${elch-sock};
uwsgi_param UWSGI_CHDIR ${pkgs.elchhub}/${pkgs.python3.sitePackages};
uwsgi_param UWSGI_MODULE elchhub.wsgi;
uwsgi_param UWSGI_CALLABLE app;
include ${pkgs.nginx}/conf/uwsgi_params;
'')
(nameValuePair "/.well-known/acme-challenge" ''
root ${acmechall}/${search-dom}/;
'')
];
}; };
}; };
}; };
@ -147,7 +87,7 @@ in {
ExecStart = "${pkgs.elchhub}/bin/elch-manager"; ExecStart = "${pkgs.elchhub}/bin/elch-manager";
}; };
}; };
register-elchos-nsupdate = { ddclient-nsupdate-elchos = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "ip-up.target" ]; after = [ "ip-up.target" ];
serviceConfig = { serviceConfig = {
@ -163,49 +103,8 @@ in {
}; };
}; };
services.grafana = {
enable = true;
addr = "127.0.0.1";
users.allowSignUp = false;
users.allowOrgCreate = false;
users.autoAssignOrg = false;
auth.anonymous.enable = true;
security = import <secrets/grafana_security.nix>; # { AdminUser = ""; adminPassword = ""}
};
services.graphite = {
api = {
enable = true;
listenAddress = "127.0.0.1";
port = 8080;
};
carbon = {
enableCache = true;
# save disk usage by restricting to 1 bulk update per second
config = ''
[cache]
MAX_CACHE_SIZE = inf
MAX_UPDATES_PER_SECOND = 1
MAX_CREATES_PER_MINUTE = 500
'';
storageSchemas = ''
[carbon]
pattern = ^carbon\.
retentions = 60:90d
[elchos]
patterhn = ^elchos\.
retentions = 10s:30d,60s:3y
[default]
pattern = .*
retentions = 30s:30d,300s:1y
'';
};
};
networking.firewall = { networking.firewall = {
allowedTCPPorts = [ 2003 80 443 ]; allowedTCPPorts = [ 80 443 ];
allowedUDPPorts = [ 2003 ]; allowedUDPPorts = [ ];
}; };
} }

29
makefu/2configs/nginx/euer.blog.nix
View file

@ -3,13 +3,9 @@
with import <stockholm/lib>; with import <stockholm/lib>;
let let
sec = toString <secrets>; sec = toString <secrets>;
ssl_cert = "${sec}/wildcard.krebsco.de.crt";
ssl_key = "${sec}/wildcard.krebsco.de.key";
hostname = config.krebs.build.host.name; hostname = config.krebs.build.host.name;
user = config.services.nginx.user; user = config.services.nginx.user;
group = config.services.nginx.group; group = config.services.nginx.group;
external-ip = config.krebs.build.host.nets.internet.ip4.addr;
internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;
base-dir = "/var/www/blog.euer"; base-dir = "/var/www/blog.euer";
in { in {
# Prepare Blog directory # Prepare Blog directory
@ -32,24 +28,15 @@ in {
}; };
}; };
krebs.nginx = { services.nginx = {
enable = mkDefault true; enable = mkDefault true;
servers = { virtualHosts = {
euer-blog = { "euer.krebsco.de" = {
listen = [ "${external-ip}:80" "${external-ip}:443 ssl" #serverAliases = [ "blog.euer.krebsco.de" "blog.${hostname}" ];
"${internal-ip}:80" "${internal-ip}:443 ssl" ]; enableSSL = true;
server-names = [ "euer.krebsco.de" "blog.euer.krebsco.de" "blog.${hostname}" ]; enableACME = true;
extraConfig = '' forceSSL = true;
gzip on; root = base-dir;
gzip_buffers 4 32k;
gzip_types text/plain application/x-javascript text/css;
ssl_certificate ${ssl_cert};
ssl_certificate_key ${ssl_key};
default_type text/plain;
'';
locations = singleton (nameValuePair "/" ''
root ${base-dir};
'');
}; };
}; };
}; };

14
makefu/2configs/nginx/euer.test.nix
View file

@ -8,18 +8,16 @@ let
external-ip = config.krebs.build.host.nets.internet.ip4.addr; external-ip = config.krebs.build.host.nets.internet.ip4.addr;
internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr; internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;
in { in {
krebs.nginx = { services.nginx = {
enable = mkDefault true; enable = mkDefault true;
servers = { virtualHosts."share.euer.krebsco.de" = {
euer-share = { locations."/" = {
listen = [ ]; proxyPass = "http://localhost:8000/";
server-names = [ "share.euer.krebsco.de" ]; extraConfig = ''
locations = singleton (nameValuePair "/" ''
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass http://localhost:8000/; '';
'');
}; };
}; };
}; };

84
makefu/2configs/nginx/euer.wiki.nix
View file

@ -4,13 +4,6 @@ with import <stockholm/lib>;
let let
sec = toString <secrets>; sec = toString <secrets>;
ext-dom = "wiki.euer.krebsco.de"; ext-dom = "wiki.euer.krebsco.de";
acmepath = "/var/lib/acme/";
acmechall = acmepath + "/challenges/";
#ssl_cert = "${sec}/wildcard.krebsco.de.crt";
#ssl_key = "${sec}/wildcard.krebsco.de.key";
ssl_cert = "${acmepath}/${ext-dom}/fullchain.pem";
ssl_key = "${acmepath}/${ext-dom}/key.pem";
user = config.services.nginx.user; user = config.services.nginx.user;
group = config.services.nginx.group; group = config.services.nginx.group;
@ -25,8 +18,7 @@ let
# user1 = pass1 # user1 = pass1
# userN = passN # userN = passN
tw-pass-file = "${sec}/tw-pass.ini"; tw-pass-file = "${sec}/tw-pass.ini";
external-ip = config.krebs.build.host.nets.internet.ip4.addr;
internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;
in { in {
services.phpfpm = { services.phpfpm = {
# phpfpm does not have an enable option # phpfpm does not have an enable option
@ -79,24 +71,18 @@ in {
}; };
}; };
krebs.nginx = { services.nginx = {
enable = mkDefault true; enable = mkDefault true;
servers = { virtualHosts = {
euer-wiki = { "${ext-dom}" = {
listen = [ "${external-ip}:80" "${external-ip}:443 ssl" #serverAliases = [
"${internal-ip}:80" "${internal-ip}:443 ssl" ]; # "wiki.makefu.retiolum"
server-names = [ # "wiki.makefu"
ext-dom #];
"wiki.makefu.retiolum" enableSSL = true;
"wiki.makefu" forceSSL = true;
]; enableACME = true;
ssl = { # recommendedGzipSettings = true;
enable = true;
# these certs will be needed if acme has not yet created certificates:
certificate = ssl_cert;
certificate_key = ssl_key;
force_encryption = true;
};
extraConfig = '' extraConfig = ''
gzip on; gzip on;
gzip_buffers 4 32k; gzip_buffers 4 32k;
@ -104,34 +90,26 @@ in {
default_type text/plain; default_type text/plain;
''; '';
locations = [ locations = {
(nameValuePair "/" '' "/" = {
root ${wiki-dir}; root = wiki-dir;
expires -1; extraConfig = ''
autoindex on; expires -1;
'') autoindex on;
(nameValuePair "/store.php" '' '';
root ${tw-upload}; };
client_max_body_size 200M; "/store.php" = {
fastcgi_split_path_info ^(.+\.php)(/.+)$; root = tw-upload;
fastcgi_pass unix:${fpm-socket}; extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params; client_max_body_size 200M;
include ${pkgs.nginx}/conf/fastcgi.conf; fastcgi_split_path_info ^(.+\.php)(/.+)$;
'') fastcgi_pass unix:${fpm-socket};
(nameValuePair "/.well-known/acme-challenge" '' include ${pkgs.nginx}/conf/fastcgi_params;
root ${acmechall}/${ext-dom}/; include ${pkgs.nginx}/conf/fastcgi.conf;
'') '';
};
]; };
}; };
}; };
}; };
security.acme.certs."${ext-dom}" = {
email = "acme@syntax-fehler.de";
webroot = "${acmechall}/${ext-dom}/";
group = "nginx";
allowKeysForGroup = true;
postRun = "systemctl reload nginx.service";
extraDomains."${ext-dom}" = null ;
};
} }

20
makefu/2configs/nginx/icecult.nix
View file

@ -10,19 +10,17 @@ let
sha256 = "0l8q7kw3w1kpvmy8hza9vr5liiycivbljkmwpacaifbay5y98z58"; sha256 = "0l8q7kw3w1kpvmy8hza9vr5liiycivbljkmwpacaifbay5y98z58";
}; };
in{ in{
krebs.nginx = { services.nginx = {
enable = true; enable = true;
servers.default = { virtualHosts.default = {
extraConfig = '' root = "${icecult}/app";
root ${icecult}/app; locations = {
"/rpc".proxyPass = "http://10.42.22.163:3121";
"/rpc".extraConfig = ''
rewrite /rpc/(.*) /$1 break;
proxy_http_version 1.1;
''; '';
locations = [ };
(nameValuePair "/rpc" ''
rewrite /rpc/(.*) /$1 break;
proxy_http_version 1.1;
proxy_pass http://10.42.22.163:3121;
'')
];
}; };
}; };
} }

17
makefu/2configs/nginx/public_html.nix
View file

@ -3,13 +3,16 @@
with import <stockholm/lib>; with import <stockholm/lib>;
{ {
krebs.nginx = { services.nginx = {
enable = true; enable = true;
servers.default.locations = [ virtualHosts.default = {
(nameValuePair "~ ^/~(.+?)(/.*)?\$" '' default = true;
alias /home/$1/public_html$2; locations = {
autoindex on; "~ ^/~(.+?)(/.*)?\$".extraConfig = ''
'') alias /home/$1/public_html$2;
]; autoindex on;
'';
};
};
}; };
} }

30
makefu/2configs/nginx/update.connector.one.nix
View file

@ -1,25 +1,19 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with import <stockholm/lib>; with import <stockholm/lib>;
let {
hostname = config.krebs.build.host.name; services.nginx = {
external-ip = config.krebs.build.host.nets.internet.ip4.addr;
in {
krebs.nginx = {
enable = mkDefault true; enable = mkDefault true;
servers = { virtualHosts."update.connector.one" = {
update-connector-one = { locations = {
listen = [ "${external-ip}:80" ]; "/" = {
server-names = [ root = "/var/www/update.connector.one";
"update.connector.one" extraConfig = ''
"firmware.connector.one" autoindex on;
]; sendfile on;
locations = singleton (nameValuePair "/" '' gzip on;
autoindex on; '';
root /var/www/update.connector.one; };
sendfile on;
gzip on;
'');
}; };
}; };
}; };