summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-07-31 13:04:33 -0400
committerJune McEnroe <june@causal.agency>2020-07-31 13:04:33 -0400
commit27866c56570e4ba314d8cfa90aa815d1c5c09acd (patch)
treef85acb7bf72b040042e9877d1ad63f49e8bcc48e
parentFix chroot-man path (diff)
downloadcatgirl-27866c56570e4ba314d8cfa90aa815d1c5c09acd.tar.gz
catgirl-27866c56570e4ba314d8cfa90aa815d1c5c09acd.zip
Fix path of cert.pem in chroot
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e4813cd..4c75e4b 100644
--- a/Makefile
+++ b/Makefile
@@ -61,11 +61,12 @@ chroot.tar: catgirl catgirl.1 scripts/chroot-prompt.sh scripts/chroot-man.sh
 	install -d -o root -g wheel \
 		root \
 		root/bin \
-		root/etc/ssl \
+		root/etc \
 		root/home \
 		root/lib \
 		root/libexec \
 		root/usr/bin \
+		root/usr/local/etc/ssl \
 		root/usr/share/man \
 		root/usr/share/misc
 	install -d -o ${CHROOT_USER} -g ${CHROOT_GROUP} \
@@ -83,7 +84,7 @@ chroot.tar: catgirl catgirl.1 scripts/chroot-prompt.sh scripts/chroot-man.sh
 		root/lib
 	chflags noschg root/libexec/* root/lib/*
 	cp -fp /etc/hosts /etc/resolv.conf root/etc
-	cp -fp /etc/ssl/cert.pem root/etc/ssl
+	cp -fp /usr/local/etc/ssl/cert.pem root/usr/local/etc/ssl
 	cp -af /usr/share/locale root/usr/share
 	cp -fp /usr/share/misc/termcap.db root/usr/share/misc
 	cp -fp /rescue/sh /usr/bin/mandoc /usr/bin/less root/bin
itle='2020-05-21 18:11:34 -0400'>2020-05-21Clean up unscoop manual pageJune McEnroe 2020-05-21Fix search expression appendJune McEnroe 2020-05-21Fix dbPrepare errx callJune McEnroe 2020-05-21Add only the necessary expressions to scoop's queryJune McEnroe 2020-05-21Explicitly set stdout line buffered when pagingJune McEnroe 2020-05-21Do not sort results in scoop by defaultJune McEnroe 2020-05-21Expand and clarify documentationJune McEnroe 2020-05-21Execute PAGER with the SHELLJune McEnroe 2020-05-21Automatically perform database migrations in litterboxJune McEnroe 2020-05-20Don't install rc scripts on other platformsJune McEnroe 2020-05-20Rewrite build and install like pounce 1.3June McEnroe 2020-05-20Update email addressesJune McEnroe 2020-04-23Call updateConsumer from handleError 1.2p1June McEnroe 2020-04-20Use . as ${LDLIBS.$@} separatorJune McEnroe 2020-04-05Error on invalid ISUPPORT values 1.2June McEnroe 2020-04-05Only set RCS on FreeBSDJune McEnroe 2020-04-05Log bans and unbansJune McEnroe 2020-04-05Parse mode types from ISUPPORTJune McEnroe 2020-04-05Add unscoop matchers for ban/unban eventsJune McEnroe 2020-04-05Check unscoop regexps with make testJune McEnroe 2020-04-05Add unscoop -n flag for checking regexpsJune McEnroe 2020-04-05Add Ban and Unban event typesJune McEnroe 2020-04-02Update styleJune McEnroe 2020-03-31Update unscoop catgirl matchersJune McEnroe 2020-03-31Fix writing verbose to stderrJune McEnroe 2020-03-02Include <>/-/* around nicks in scoop coloring 1.1June McEnroe 2020-03-02Replace .mk files with configure scriptJune McEnroe 2020-02-28Implement the causal.agency/consumer capabilityJune McEnroe 2020-02-22Include <>/-/* around nicks in coloringJune McEnroe 2020-02-22Use (almost) the full range of IRC colors for nicksJune McEnroe