kat/nixfiles
1
0
Fork 0
mirror of https://github.com/kittywitch/nixfiles.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity

Fix deploy bug which is https://github.com/NixOS/nix/issues/3017

Browse source
This commit is contained in:
Kat Inskip 2023-07-21 10:47:33 -07:00
parent cab29edaac
commit 229abb8a5e
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
5 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -78,11 +78,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689516967, "lastModified": 1689825754,
"narHash": "sha256-sFAa33wkQHanmij/uhfGduIDK8z4dJAita/rK6u9pvE=", "narHash": "sha256-u3W3WGO3BA63nb+CeNLBajbJ/sl8tDXBHKxxeTOCxfo=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "61662a63bfe1726588c1da6b412df86d8ca94d63", "rev": "531c3de7eccf95155828e0cd9f18c25e7f937777",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -175,11 +175,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689495092, "lastModified": 1689875525,
"narHash": "sha256-yZu2j5FpLZEPhJQQutMCPTxa1VMigLPabLYvLTq6ASM=", "narHash": "sha256-fgUrFH3bMZ6R7qgBTfuTRGlkZXIkdyjndl6ZbExbjE8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f84579a70b8c74e5ebb37299a0c3ba279f09382", "rev": "1443abd2696ec6bd6fb9701e6c26b277a27b4a3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -274,11 +274,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1689444953, "lastModified": 1689679375,
"narHash": "sha256-0o56bfb2LC38wrinPdCGLDScd77LVcr7CrH1zK7qvDg=", "narHash": "sha256-LHUC52WvyVDi9PwyL1QCpaxYWBqp4ir4iL6zgOkmcb8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8acef304efe70152463a6399f73e636bcc363813", "rev": "684c17c429c42515bafb3ad775d2a710947f3d67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -330,11 +330,11 @@
"pypi-deps-db": { "pypi-deps-db": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1685526402, "lastModified": 1689774708,
"narHash": "sha256-V0SXx0dWlUBL3E/wHWTszrkK2dOnuYYnBc7n6e0+NQU=", "narHash": "sha256-36Zwo1G2oi+Gg3Cpp3EOwDzBkmpqyRlzL8OLBN2rgu4=",
"owner": "DavHau", "owner": "DavHau",
"repo": "pypi-deps-db", "repo": "pypi-deps-db",
"rev": "ba35683c35218acb5258b69a9916994979dc73a9", "rev": "944094e4184b4079298d44a7697118f998288964",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
nixos/roles/irc-client/nginx.nix Normal file
View file

@ -0,0 +1,14 @@
_: {
services.nginx = {
virtualHosts = {
"irc.kittywit.ch" = {
enableACME = true;
forceSSL = true;
locations."/" = {
proxyPass = "http://[::1]:9000";
proxyWebsockets = true;
};
};
};
};
}

0
nixos/roles/irc-client.nix → nixos/roles/irc-client/thelounge.nix
View file

7
nixos/roles/matrix-homeserver/nginx.nix
View file

@ -13,13 +13,6 @@
in { in {
services.nginx = { services.nginx = {
virtualHosts = { virtualHosts = {
"kittywit.ch" = {
enableACME = true;
forceSSL = true;
acmeRoot = null;
locations."= /.well-known/matrix/server".extraConfig = mkWellKnown serverConfig;
locations."= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig;
};
"${fqdn}" = { "${fqdn}" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;

8
systems/default.nix
View file

@ -142,19 +142,19 @@
magicRollback = true; magicRollback = true;
}; };
}) })
(set.optional (name != "renko") { (set.optional (name != "renko" && host.folder == "nixos") {
${name} = { ${name} = {
hostname = "${name}.inskip.me"; hostname = "${name}.inskip.me";
sshUser = "deploy"; sshUser = "deploy";
sshOpts = ["-p" "${builtins.toString (builtins.head inputs.self.nixosConfigurations.${name}.config.services.openssh.ports)}"]; sshOpts = ["-oControlMaster=no" "-oControlPath=/tmp/willneverexist" "-p" "${builtins.toString (builtins.head inputs.self.nixosConfigurations.${name}.config.services.openssh.ports)}"];
}; };
}) })
(set.optional (name == "renko") { (set.optional (name == "renko" && host.folder == "nixos") {
${name} = { ${name} = {
sshUser = "nixos"; sshUser = "nixos";
hostname = "orb"; hostname = "orb";
fastConnection = true; fastConnection = true;
sshOpts = ["-p" "32222"]; sshOpts = ["-oControlMaster=no" "-oControlPath=/tmp/willneverexist" "-p" "32222"];
}; };
}) })
]; ];