diff options
| -rw-r--r-- | config/hydra.nix | 3 | ||||
| -rw-r--r-- | config/web-server.nix | 4 | ||||
| -rw-r--r-- | config/weechat.nix | 19 | ||||
| -rw-r--r-- | data/dns/db.orbekk.shared.zone | 9 | ||||
| -rw-r--r-- | machines/dragon.nix | 20 |
5 files changed, 34 insertions, 21 deletions
diff --git a/config/hydra.nix b/config/hydra.nix index 6175bc5..bfa985a 100644 --- a/config/hydra.nix +++ b/config/hydra.nix @@ -5,6 +5,8 @@ in { networking.firewall.allowedTCPPorts = [ hydraPort ]; + virtualisation.virtualbox.host.enable = true; + services.hydra = { enable = true; hydraURL = "https://hydra.orbekk.com"; @@ -12,7 +14,6 @@ in port = hydraPort; extraConfig = '' store-uri = file:///nix/store?secret-key=/opt/secret/hydra_key/hydra.orbekk.com-1/secret - binary_cache_secret_key_file = /opt/secret/hydra_key/hydra.orbekk.com-1/secret ''; }; diff --git a/config/web-server.nix b/config/web-server.nix index 5c9a70e..84d52be 100644 --- a/config/web-server.nix +++ b/config/web-server.nix @@ -60,11 +60,11 @@ }; }; "git.orbekk.com" = template // { - locations."/".proxyPass = "http://10.0.20.15:11103"; + locations."/".proxyPass = "http://10.0.20.2:11103"; }; "hydra.orbekk.com" = template // { locations."/" = { - proxyPass = "http://10.0.20.15:11101"; + proxyPass = "http://10.0.20.2:11101"; }; }; "kufieta.net" = template // { diff --git a/config/weechat.nix b/config/weechat.nix index ae08c21..70d1953 100644 --- a/config/weechat.nix +++ b/config/weechat.nix @@ -1,12 +1,12 @@ { config, pkgs, ... }: { - # nixpkgs.config.packageOverrides = pkgs: { - # weechat = pkgs.weechat.override { - # extraBuildInputs = with pkgs; [ - # luaPackages.cjson - # ]; - # }; - # }; + nixpkgs.config.packageOverrides = pkgs: { + weechat = pkgs.weechat.override { + extraBuildInputs = with pkgs; [ + pythonPackages.potr + ]; + }; + }; systemd.services = { weechat = { @@ -14,6 +14,11 @@ path = [ pkgs.weechat pkgs.tmux pkgs.coreutils ]; after = [ "networking.target" ]; wantedBy = [ "multi-user.target" ]; + environment = { + LANG = "en_US.utf8"; + LC_ALL = "en_US.utf8"; + TERM = "${pkgs.rxvt_unicode.terminfo}"; + }; serviceConfig = { Type = "oneshot"; User = "orbekk"; diff --git a/data/dns/db.orbekk.shared.zone b/data/dns/db.orbekk.shared.zone index ea4ae75..7e0792c 100644 --- a/data/dns/db.orbekk.shared.zone +++ b/data/dns/db.orbekk.shared.zone @@ -22,17 +22,16 @@ home IN CNAME orbekk.duckdns.org. minecraft IN CNAME orbekk.duckdns.org. terraria IN CNAME orbekk.duckdns.org. -git IN CNAME shape -hydra IN CNAME shape -kj IN CNAME shape -dashboard IN CNAME shape +git IN CNAME dragon +hydra IN CNAME dragon +kj IN CNAME dragon raigh IN AAAA 2001:67c:29f4:1008:216:3eff:fe33:4512 gw IN AAAA 2001:470:8e2e:20::1 gw IN A 96.232.156.38 -dragon IN AAAA 2001:470:8e2e:20:eca0:41ff:feef:92 +dragon IN AAAA 2001:470:8e2e:20::d dragon IN A 96.232.156.38 sabaki IN AAAA 2001:470:8e2e:20:f05b:e3ff:fed9:5817 diff --git a/machines/dragon.nix b/machines/dragon.nix index 0518cb0..8b966db 100644 --- a/machines/dragon.nix +++ b/machines/dragon.nix @@ -3,10 +3,13 @@ imports = [ ../config/common.nix ../config/users.nix + ../config/weechat.nix + ../config/dns.nix + ../config/hydra.nix + ../config/web-server.nix + ../config/cgit.nix ]; - virtualisation.lxc.enable = true; - virtualisation.lxc.lxcfs.enable = true; virtualisation.lxd.enable = true; security.apparmor = { enable = true; @@ -35,10 +38,15 @@ }; }; - interfaces.br0.ip6 = [ - { address = "2001:470:8e2e:20:eca0:41ff:feef:92"; prefixLength = 64; } - { address = "2001:470:8e2e:20::d"; prefixLength = 64; } - ]; + # interfaces.br0.ip6 = [ + # # { address = "2001:470:8e2e:20:eca0:41ff:feef:92"; prefixLength = 64; } + # { address = "2001:470:8e2e:20::d"; prefixLength = 64; } + # ]; + + localCommands = '' + ip -6 addr add 2001:470:8e2e:20::d/64 dev br0 || true + ip -6 route add default via fe80::822a:a8ff:fe4d:f5d6 dev br0 metric 512 src 2001:470:8e2e:20::d || true + ''; }; services = { |