summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lass/1systems/prism.nix21
-rw-r--r--lass/5pkgs/q/default.nix2
2 files changed, 18 insertions, 5 deletions
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 5477a8b86..1eb81cd0a 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -1,5 +1,7 @@
{ config, lib, pkgs, ... }:
+with config.krebs.lib;
+
let
ip = config.krebs.build.host.nets.internet.ip4.addr;
@@ -24,11 +26,22 @@ in {
{
imports = [
../2configs/git.nix
- ( manageCerts [ "cgit.lassul.us" ])
- ];
- krebs.nginx.servers.cgit.server-names = [
- "cgit.lassul.us"
];
+ krebs.nginx.servers.cgit = {
+ server-names = [
+ "cgit.lassul.us"
+ ];
+ locations = [
+ (nameValuePair "/.well-known/acme-challenge" ''
+ root /var/lib/acme/challenges/cgit.lassul.us/;
+ '')
+ ];
+ ssl = {
+ enable = true;
+ certificate = "/var/lib/acme/cgit.lassul.us/fullchain.pem";
+ certificate_key = "/var/lib/acme/cgit.lassul.us/key.pem";
+ };
+ };
}
{
users.extraGroups = {
diff --git a/lass/5pkgs/q/default.nix b/lass/5pkgs/q/default.nix
index 644be0d17..571932b1d 100644
--- a/lass/5pkgs/q/default.nix
+++ b/lass/5pkgs/q/default.nix
@@ -123,7 +123,7 @@ let
'';
q-online = ''
- if ${pkgs.curl.bin}/bin/curl -s google.com >/dev/null; then
+ if ${pkgs.curl}/bin/curl -s google.com >/dev/null; then
echo 'online'
else
echo offline