make the challenge handler configurable

perhaps one day we'll even support something other than Kerberos!

1 files changed, 24 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 1e43e45..f9ffa1c 100644
--- a/Makefile
+++ b/Makefile
@@ -9,25 +9,27 @@ MAN5DIR?=	${MANDIR}/man5
 MAN8DIR?=	${MANDIR}/man8
 HOOKDIR?=	${CONFDIR}/hooks
 
-LIBMODE?=	0755
-LIB_FILES=	init.sh \
-		kerberos-challenge.sh
+LIBMODE?=	0644
+LIB=		init.sh
+
+CHALLENGEMODE?=	0755
+CHALLENGE=	kerberos.sh
 
 BINMODE?=	0755
-BIN_FILES=	lfacme-renew.sh \
+BIN=		lfacme-renew.sh \
 		lfacme-setup.sh
 
 CONFMODE?=	0644
-CONF_FILES=	acme.conf.sample \
+CONF=		acme.conf.sample \
 		domains.conf.sample
 
 HOOKMODE?=	0755
-HOOK_FILES=	example-hook.sh
+HOOK=		example-hook.sh
 
 MANMODE?=	0644
-MAN5FILES=	acme.conf.5 \
+MAN5=		acme.conf.5 \
 		domains.conf.5
-MAN8FILES=	lfacme-renew.8 \
+MAN8=		lfacme-renew.8 \
 		lfacme-setup.8
 
 default: all
@@ -37,26 +39,34 @@ all:
 
 install:
 	@echo 'create ${LIBDIR}'; install -d ${LIBDIR}; \
-	for lib in ${LIB_FILES}; do \
+	for lib in ${LIB}; do \
 		echo "install ${LIBDIR}/$$lib"; \
 		install -C -m ${LIBMODE} "$$lib" "${LIBDIR}/$$lib"; \
 	done; \
 	\
+	echo 'create ${LIBDIR}/challenge'; install -d ${LIBDIR}/challenge; \
+	for challenge in ${CHALLENGE}; do \
+		basename=$${challenge%*.sh}; \
+		echo "install ${LIBDIR}/challenge/$$basename"; \
+		install -C -m ${CHALLENGEMODE} "$$challenge" \
+			"${LIBDIR}/challenge/$$basename"; \
+	done; \
+	\
 	echo 'create ${BINDIR}'; install -d ${BINDIR}; \
-	for bin in ${BIN_FILES}; do \
+	for bin in ${BIN}; do \
 		basename=$${bin%*.sh}; \
 		echo "install ${BINDIR}/$$basename"; \
 		install -C -m ${BINMODE} "$$bin" "${BINDIR}/$$basename"; \
 	done; \
 	\
 	echo 'create ${CONFDIR}'; install -d ${CONFDIR}; \
-	for conf in ${CONF_FILES}; do \
+	for conf in ${CONF}; do \
 		echo "install ${CONFDIR}/$$conf"; \
 		install -C -m ${CONFMODE} "$$conf" "${CONFDIR}/$$conf"; \
 	done; \
 	\
 	echo 'create ${HOOKDIR}'; install -d ${HOOKDIR}; \
-	for hook in ${HOOK_FILES}; do \
+	for hook in ${HOOK}; do \
 		basename=$${hook%*.sh}; \
 		echo "install ${HOOKDIR}/$$basename"; \
 		install -C -m ${HOOKMODE} "$$hook" "${HOOKDIR}/$$basename"; \
@@ -65,13 +75,13 @@ install:
 	echo 'create ${MANDIR}'; install -d ${MANDIR}; \
 	\
 	echo 'create ${MAN5DIR}'; install -d ${MAN5DIR}; \
-	for man in ${MAN5FILES}; do \
+	for man in ${MAN5}; do \
 		echo "install ${MAN5DIR}/$$man"; \
 		install -C -m ${MANMODE} "$$man" "${MAN5DIR}/$$man"; \
 	done; \
 	\
 	echo 'create ${MAN8DIR}'; install -d ${MAN8DIR}; \
-	for man in ${MAN8FILES}; do \
+	for man in ${MAN8}; do \
 		echo "install ${MAN8DIR}/$$man"; \
 		install -C -m ${MANMODE} "$$man" "${MAN8DIR}/$$man"; \
 	done; \