fix: move 0:/etc/ => 0:/os/certs/
This commit is contained in:
@@ -76,7 +76,7 @@ WWWSRC := $(wildcard $(WWWDIR)/*.*)
|
||||
WWWDST := $(patsubst $(WWWDIR)/%,$(BINDIR)/www/%,$(WWWSRC))
|
||||
|
||||
# CA certificate bundle.
|
||||
CA_CERTS := $(BINDIR)/etc/ca-certificates.crt
|
||||
CA_CERTS := $(BINDIR)/os/certs/ca-certificates.crt
|
||||
|
||||
# System config TOML files bundled into bin/config/.
|
||||
CONFIGDIR := data/config
|
||||
@@ -326,9 +326,9 @@ $(BINDIR)/www/%: $(WWWDIR)/%
|
||||
mkdir -p $(BINDIR)/www
|
||||
cp $< $@
|
||||
|
||||
# Copy CA certificate bundle into bin/etc/.
|
||||
# Copy CA certificate bundle into bin/os/certs/.
|
||||
$(CA_CERTS): data/ca-certificates.crt
|
||||
mkdir -p $(BINDIR)/etc
|
||||
mkdir -p $(BINDIR)/os/certs
|
||||
cp $< $@
|
||||
|
||||
# Copy system config files into bin/config/.
|
||||
|
||||
@@ -109,7 +109,7 @@ namespace tls {
|
||||
|
||||
TrustAnchors load_trust_anchors() {
|
||||
TrustAnchors tas = {nullptr, 0, 0};
|
||||
int fh = montauk::open("0:/etc/ca-certificates.crt");
|
||||
int fh = montauk::open("0:/os/certs/ca-certificates.crt");
|
||||
if (fh < 0) return tas;
|
||||
uint64_t fsize = montauk::getsize(fh);
|
||||
if (fsize == 0 || fsize > 512 * 1024) { montauk::close(fh); return tas; }
|
||||
|
||||
Reference in New Issue
Block a user