reformat and restructure
This commit is contained in:
parent
cbb12c73e7
commit
dc6b3805f6
20 changed files with 173 additions and 158 deletions
|
|
@ -6,9 +6,7 @@
|
|||
../../services/openssh.nix
|
||||
./openssh.nix
|
||||
../../services/prometheus-node.nix
|
||||
../../services/nginx.nix
|
||||
./nginx.nix
|
||||
../../services/prometheus-nginx.nix
|
||||
];
|
||||
|
||||
networking = {
|
||||
|
|
|
|||
|
|
@ -4,10 +4,15 @@ let
|
|||
# TODO: mkVHost
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
../../services/nginx.nix
|
||||
../../services/prometheus-nginx.nix
|
||||
];
|
||||
|
||||
services.nginx.virtualHosts = {
|
||||
"www.${config.networking.domain}" = {
|
||||
default = true;
|
||||
serverAliases = [config.networking.domain];
|
||||
serverAliases = [ config.networking.domain ];
|
||||
quic = true;
|
||||
kTLS = true;
|
||||
forceSSL = true;
|
||||
|
|
@ -77,4 +82,3 @@ in
|
|||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
"command=\"${pkgs.rsync}/bin/rsync --server -vlogDtpre.iLsfxCIvu . /srv/http/www-staging/\",restrict ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjjLtnGf7w5D/ON+P2HpMZ5HA2fWp5YSQMGMuu5CjUt deploy@www.berlin.ccc.de staging"
|
||||
];
|
||||
};
|
||||
groups.deploy = {};
|
||||
groups.deploy = { };
|
||||
};
|
||||
|
||||
services.openssh.extraConfig = ''
|
||||
|
|
@ -20,4 +20,3 @@
|
|||
Banner none
|
||||
'';
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue