all: use shared caddy and frp config
This commit is contained in:
parent
514eca685c
commit
b5d73083bd
6 changed files with 28 additions and 27 deletions
|
@ -1,7 +0,0 @@
|
|||
_: {
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
acmeCA = "https://acme-v02.api.letsencrypt.org/directory";
|
||||
email = "admin@acomputer.lol";
|
||||
};
|
||||
}
|
|
@ -1,3 +1,9 @@
|
|||
_: {
|
||||
imports = [ ./apps ./caddy.nix ./btrfs.nix ./ssh.nix ];
|
||||
imports = [
|
||||
./apps
|
||||
./btrfs.nix
|
||||
./ssh.nix
|
||||
../../shared/caddy.nix
|
||||
../../shared/frp.nix
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
_: {
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
acmeCA = "https://acme-v02.api.letsencrypt.org/directory";
|
||||
email = "admin@acomputer.lol";
|
||||
|
||||
virtualHosts."frp.labs.adtya.xyz" = {
|
||||
extraConfig = ''
|
||||
reverse_proxy 10.10.10.1:7500
|
||||
tls /persist/secrets/caddy/certs/default.crt /persist/secrets/caddy/certs/default.key
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,9 +1,18 @@
|
|||
_: {
|
||||
imports = [
|
||||
./btrfs.nix
|
||||
./caddy.nix
|
||||
./ssh.nix
|
||||
|
||||
./apps
|
||||
./btrfs.nix
|
||||
./ssh.nix
|
||||
../../shared/caddy.nix
|
||||
../../shared/frp.nix
|
||||
];
|
||||
|
||||
services.caddy = {
|
||||
virtualHosts."frp.labs.adtya.xyz" = {
|
||||
extraConfig = ''
|
||||
reverse_proxy 10.10.10.1:7500
|
||||
tls /persist/secrets/caddy/certs/default.crt /persist/secrets/caddy/certs/default.key
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,6 +2,8 @@ _: {
|
|||
imports = [
|
||||
./btrfs.nix
|
||||
./ssh.nix
|
||||
../../shared/caddy.nix
|
||||
../../shared/frp.nix
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
_: {
|
||||
imports = [ ./btrfs.nix ./ssh.nix ];
|
||||
imports = [
|
||||
./btrfs.nix
|
||||
./ssh.nix
|
||||
../../shared/caddy.nix
|
||||
../../shared/frp.nix
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue