Compare commits
2 Commits
2ac0660549
...
5f173b8a2d
Author | SHA1 | Date | |
---|---|---|---|
5f173b8a2d | |||
02246e3b5d |
@ -3,6 +3,7 @@
|
|||||||
fqdn,
|
fqdn,
|
||||||
inputs,
|
inputs,
|
||||||
pkgs,
|
pkgs,
|
||||||
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
@ -137,6 +138,17 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# TODO: Upstream the below to Nixpkgs. If the runner is using the exact same url as the gitea
|
||||||
|
# service and both are on the same host, then the runner should have a systemd dependency on the
|
||||||
|
# gitea service.
|
||||||
|
systemd.services.gitea-actions-default.requires = lib.mkIf (
|
||||||
|
config.services.gitea.enable
|
||||||
|
&& (
|
||||||
|
config.services.gitea-actions-runner.instances.default.url
|
||||||
|
== config.services.gitea.settings.server.ROOT_URL
|
||||||
|
)
|
||||||
|
) [ "gitea.service" ];
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ config.services.gitea.settings.server.SSH_PORT ];
|
networking.firewall.allowedTCPPorts = [ config.services.gitea.settings.server.SSH_PORT ];
|
||||||
|
|
||||||
environment.persistence.save.directories = [
|
environment.persistence.save.directories = [
|
||||||
|
@ -18,7 +18,13 @@
|
|||||||
defaults.email = "price@orion-technologies.io";
|
defaults.email = "price@orion-technologies.io";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx.virtualHosts."blog.${fqdn}" = {
|
services.nginx.virtualHosts = {
|
||||||
|
"blog.${fqdn}" = {
|
||||||
|
forceSSL = true;
|
||||||
|
enableACME = true;
|
||||||
|
globalRedirect = "price-hiller.com";
|
||||||
|
};
|
||||||
|
"price-hiller.com" = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
root = inputs.blog.packages.${pkgs.system}.default;
|
root = inputs.blog.packages.${pkgs.system}.default;
|
||||||
@ -30,4 +36,5 @@
|
|||||||
'';
|
'';
|
||||||
locations."/".index = "home.html";
|
locations."/".index = "home.html";
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user