Compare commits
3 Commits
4bafb2fda8
...
811aa664a0
Author | SHA1 | Date | |
---|---|---|---|
|
811aa664a0 | ||
|
1bb71f7466 | ||
|
b57c039f70 |
@ -37,7 +37,6 @@ in
|
|||||||
#./calibre.nix
|
#./calibre.nix
|
||||||
./docker.nix
|
./docker.nix
|
||||||
./keycloak.nix
|
./keycloak.nix
|
||||||
./lezzo.nix
|
|
||||||
./runas.nix
|
./runas.nix
|
||||||
./tailscale.nix
|
./tailscale.nix
|
||||||
./searx.nix
|
./searx.nix
|
||||||
|
@ -133,6 +133,11 @@ in
|
|||||||
type filter hook forward priority filter; policy drop;
|
type filter hook forward priority filter; policy drop;
|
||||||
ct state established,related accept
|
ct state established,related accept
|
||||||
|
|
||||||
|
# client to client
|
||||||
|
ip saddr {${lib.concatStringsSep "," c2c-wg}} ip daddr {${
|
||||||
|
lib.concatStringsSep "," c2c-wg
|
||||||
|
}} accept
|
||||||
|
|
||||||
# nat to wan
|
# nat to wan
|
||||||
oifname ${wan-if} ip saddr {${
|
oifname ${wan-if} ip saddr {${
|
||||||
lib.concatStringsSep "," towan-wg
|
lib.concatStringsSep "," towan-wg
|
||||||
|
@ -1,46 +0,0 @@
|
|||||||
{ services, pkgs, lib, makeBinPath, ... }:
|
|
||||||
let
|
|
||||||
domain = "lezzo.org";
|
|
||||||
lezzo_root = "/var/lib/lezzo.org";
|
|
||||||
service_name = "lezzo-pull";
|
|
||||||
network = import ./network.nix;
|
|
||||||
mkStartScript = name: pkgs.writeShellScript "${name}.sh" ''
|
|
||||||
set -euo pipefail
|
|
||||||
cd ${lezzo_root}
|
|
||||||
git pull origin master --rebase
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.nginx.virtualHosts.${domain} = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
|
|
||||||
root = lezzo_root;
|
|
||||||
|
|
||||||
locations."/.git" = { return = "404"; };
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd = {
|
|
||||||
services.${service_name} = {
|
|
||||||
path = [ pkgs.git ];
|
|
||||||
enable = true;
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecStart = mkStartScript "${service_name}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
timers.${service_name} = {
|
|
||||||
wantedBy = [ "timers.target" ];
|
|
||||||
timerConfig = {
|
|
||||||
OnCalendar = "hourly";
|
|
||||||
Unit = "${service_name}.service";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.extraHosts = ''
|
|
||||||
${network.architect-lan} ${domain}
|
|
||||||
${network.architect-wg} ${domain}
|
|
||||||
${network.architect-ts} ${domain}
|
|
||||||
'';
|
|
||||||
}
|
|
@ -56,6 +56,7 @@ rec {
|
|||||||
dodino-ts = "100.106.244.35";
|
dodino-ts = "100.106.244.35";
|
||||||
|
|
||||||
framecca-devices = [ framecca-wg framecca_one-wg framecca_three-wg framecca_four-wg ];
|
framecca-devices = [ framecca-wg framecca_one-wg framecca_three-wg framecca_four-wg ];
|
||||||
|
c2c-wg = framecca-devices;
|
||||||
|
|
||||||
# groups
|
# groups
|
||||||
gdevices = [ giuliophone-ts architect-ts giuliopc-ts dodino-ts ];
|
gdevices = [ giuliophone-ts architect-ts giuliopc-ts dodino-ts ];
|
||||||
|
Loading…
Reference in New Issue
Block a user