Fix letsencrypt ca

This commit is contained in:
2021-11-01 10:36:47 -07:00
parent 160807215c
commit 806808d0d2
5 changed files with 35 additions and 20 deletions

View File

@@ -2,6 +2,8 @@
with pkgs.lib;
let
version = "20211031";
launcher = pkgs.writeText "launch-backplane-dns.lisp" ''
(require :asdf)
(asdf:load-system :backplane-dns)
@@ -13,13 +15,19 @@ let
${pkgs.lispPackages.clwrapper}/bin/common-lisp.sh --load ${launcher}
'';
sbcl-with-ssl = pkgs.sbcl.overrideAttrs (oldAttrs: rec {
buildInputs = oldAttrs.buildInputs ++ [
pkgs.openssl_1_1.dev
];
});
in pkgs.stdenv.mkDerivation {
pname = "backplane-dns-server";
version = "0.1.0";
version = version;
propagatedBuildInputs = with pkgs; [
asdf
sbcl
sbcl-with-ssl
lispPackages.clwrapper
localLispPackages.backplane-dns
];

View File

@@ -2,8 +2,7 @@
with pkgs.lib;
let
url = "https://git.informis.land/informis/cl-gemini.git";
version = "0.1";
version = "20211031";
server-launcher = pkgs.writeText "launch-cl-gemini.lisp" ''
(defun getenv-or-fail (env-var &optional default)

View File

@@ -6,7 +6,7 @@ let
in stdenv.mkDerivation {
name = "letsencrypt-ca";
name = "letsencrypt-ca-pem";
src = fetchurl {
name = "isrgrootx1.pem.txt";
@@ -17,12 +17,12 @@ in stdenv.mkDerivation {
phases = [ "installPhase" ];
installPhase = ''
mkdir -pv $out/etc/ssl/letsencrypt
cp -v $src $out/etc/ssl/letsencrypt/ca.pem
mkdir -pv $out
cp -v $src $out/ca.pem
'';
meta = {
homepage = https://letsencrypt.com;
homepage = https://letsencrypt.com/certificates;
description = "Certificate Authority (CA) certificate for LetsEncrypt";
};
}

View File

@@ -1,4 +1,4 @@
{ pkgs, backplane-server, arrows, ip-utils, ... }:
{ pkgs, localLispPackages, ... }:
pkgs.lispPackages.buildLispPackage {
baseName = "backplane-dns";
@@ -7,7 +7,14 @@ pkgs.lispPackages.buildLispPackage {
buildSystems = [ "backplane-dns" ];
deps = with pkgs.lispPackages; [
src = pkgs.fetchgit {
url = "https://git.fudo.org/fudo-public/backplane-dns.git";
rev = "3075453a8ccc8bf285bfc83d84317044590ae060";
sha256 = "1sdgr9zxqam4c8f7nlkgm77si45j0qvvgj6rav9kd6jz6vqgcbi5";
fetchSubmodules = false;
};
deps = with localLispPackages; [
arrows
alexandria
backplane-server
@@ -18,12 +25,5 @@ pkgs.lispPackages.buildLispPackage {
trivia
];
src = pkgs.fetchgit {
url = "https://git.fudo.org/fudo-public/backplane-dns.git";
rev = "3075453a8ccc8bf285bfc83d84317044590ae060";
sha256 = "1sdgr9zxqam4c8f7nlkgm77si45j0qvvgj6rav9kd6jz6vqgcbi5";
fetchSubmodules = false;
};
asdFilesToKeep = [ "backplane-dns.asd" ];
}

View File

@@ -1,4 +1,4 @@
{ pkgs, lib, arrows, cl-xmpp, ... }:
{ pkgs, lib, localLispPackages, ... }:
pkgs.lispPackages.buildLispPackage {
baseName = "backplane-server";
@@ -7,8 +7,6 @@ pkgs.lispPackages.buildLispPackage {
buildSystems = [ "backplane-server" ];
deps = with pkgs.lispPackages; [ alexandria arrows cl-json cl-xmpp prove ];
src = pkgs.fetchgit {
url = "https://git.fudo.org/fudo-public/backplane-server.git";
rev = "5b50dd8badf5b5460e9cc7e76e191d274712a3bd";
@@ -16,5 +14,15 @@ pkgs.lispPackages.buildLispPackage {
fetchSubmodules = false;
};
deps = with localLispPackages; [
alexandria
arrows
asdf-package-system
asdf-system-connections
cl-json
cl-xmpp
prove
];
asdFilesToKeep = [ "backplane-server.asd" ];
}