diff --git a/flake.lock b/flake.lock index 6729937..999620d 100644 --- a/flake.lock +++ b/flake.lock @@ -401,6 +401,22 @@ "type": "github" } }, + "refleksjon-net": { + "flake": false, + "locked": { + "lastModified": 1656371921, + "narHash": "sha256-O+lNqD2LuESKM+S+AljF2SzIxzK05xdZqiLhylTQ2ls=", + "ref": "refs/heads/main", + "rev": "c1b91e369bf411e44534334595d4481cb59bd129", + "revCount": 8, + "type": "git", + "url": "ssh://gitea@git.pvv.ntnu.no:2222/pederbs/refleksjon.net.git" + }, + "original": { + "type": "git", + "url": "ssh://gitea@git.pvv.ntnu.no:2222/pederbs/refleksjon.net.git" + } + }, "root": { "inputs": { "home-manager-2305": "home-manager-2305", @@ -425,6 +441,8 @@ "nixpkgs-2411": "nixpkgs-2411", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-test": "nixpkgs-test", + "refleksjon-net": "refleksjon-net", + "roroslyd-no": "roroslyd-no", "sops-nix-2305": "sops-nix-2305", "sops-nix-2311": "sops-nix-2311", "sops-nix-2405": "sops-nix-2405", @@ -432,6 +450,22 @@ "sops-nix-edge": "sops-nix-edge" } }, + "roroslyd-no": { + "flake": false, + "locked": { + "lastModified": 1656261486, + "narHash": "sha256-Rud5bBUuPgIC5UAGtyuYhUtXhN174UCWDoLUWWc/n6U=", + "ref": "refs/heads/main", + "rev": "fb7b0a7e70754cf368de7d7c469dabe71b2f1c78", + "revCount": 4, + "type": "git", + "url": "ssh://gitea@git.pvv.ntnu.no:2222/pederbs/roroslyd.no.git" + }, + "original": { + "type": "git", + "url": "ssh://gitea@git.pvv.ntnu.no:2222/pederbs/roroslyd.no.git" + } + }, "sops-nix-2305": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index a7ec4f8..19afe1e 100644 --- a/flake.nix +++ b/flake.nix @@ -82,6 +82,11 @@ /**/ #pbsds-papers.url = "git+ssh://git@github.com/pbsds/papers.git"; + roroslyd-no.url = "git+ssh://gitea@git.pvv.ntnu.no:2222/pederbs/roroslyd.no.git"; + roroslyd-no.flake = false; + refleksjon-net.url = "git+ssh://gitea@git.pvv.ntnu.no:2222/pederbs/refleksjon.net.git"; + refleksjon-net.flake = false; + }; nixConfig.extra-substituters = [ diff --git a/profiles/http/sites/refleksjon-no.nix b/profiles/http/sites/refleksjon-no.nix index 115bf37..68b6e3c 100644 --- a/profiles/http/sites/refleksjon-no.nix +++ b/profiles/http/sites/refleksjon-no.nix @@ -1,20 +1,11 @@ -{ config, pkgs, lib, mkDomain, ... }: +{ config, pkgs, lib, inputs, mkDomain, ... }: { # refleksjon.no - services.nginx.virtualHosts.${mkDomain "refleksjon"} = let - refleksjon-net = pkgs.fetchFromGitea rec { - name = repo; - domain = "gitea.noximilien.pbsds.net"; - owner = "pbsds"; - repo = "refleksjon.net"; - rev = "c1b91e369bf411e44534334595d4481cb59bd129"; - sha256 = "O+lNqD2LuESKM+S+AljF2SzIxzK05xdZqiLhylTQ2ls="; - }; - in { + services.nginx.virtualHosts.${mkDomain "refleksjon"} = { forceSSL = true; # addSSL = true; enableACME = true; #useACMEHost = acmeDomain; - root = "${refleksjon-net}/www.refleksjon.net"; + root = "${inputs.refleksjon-net}/www.refleksjon.net"; }; } diff --git a/profiles/http/sites/roroslyd-no.nix b/profiles/http/sites/roroslyd-no.nix index 1232e1a..9beaa1c 100644 --- a/profiles/http/sites/roroslyd-no.nix +++ b/profiles/http/sites/roroslyd-no.nix @@ -1,21 +1,11 @@ -{ config, pkgs, lib, mkDomain, ... }: +{ config, pkgs, lib, inputs, mkDomain, ... }: { # roroslyd.no - services.nginx.virtualHosts.${mkDomain "roroslyd"} = let - roroslyd-no = pkgs.fetchFromGitea rec { - name = repo; - domain = "gitea.noximilien.pbsds.net"; - owner = "pbsds"; - repo = "roroslyd.no"; - #rev = "v${version}"; - rev = "fb7b0a7e70754cf368de7d7c469dabe71b2f1c78"; - sha256 = "Rud5bBUuPgIC5UAGtyuYhUtXhN174UCWDoLUWWc/n6U="; - }; - in { + services.nginx.virtualHosts.${mkDomain "roroslyd"} = { forceSSL = true; # addSSL = true; enableACME = true; #useACMEHost = acmeDomain; - root = "${roroslyd-no}/www.roroslyd.no"; + root = "${inputs.roroslyd-no}/www.roroslyd.no"; }; }