Make the Let's Encrypt email configurable
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
This commit is contained in:
parent
375df9954e
commit
669c708331
|
@ -34,7 +34,9 @@ guix-commit.txt: Makefile
|
||||||
sed 's#DOMAIN#$(DOMAIN)#g' $< > $@
|
sed 's#DOMAIN#$(DOMAIN)#g' $< > $@
|
||||||
|
|
||||||
%.scm: %.scm.tmpl guix-commit.txt Makefile
|
%.scm: %.scm.tmpl guix-commit.txt Makefile
|
||||||
sed 's#DOMAIN#$(DOMAIN)#g' $< > $@
|
sed \
|
||||||
|
"s#DOMAIN#$(DOMAIN)#g ; \
|
||||||
|
s#LETSENCRYPT_EMAIL#$(LETSENCRYPT_EMAIL)#g" $< > $@
|
||||||
|
|
||||||
IMAGE_SOURCE = \
|
IMAGE_SOURCE = \
|
||||||
guix-commit.txt \
|
guix-commit.txt \
|
||||||
|
|
11
configure.ac
11
configure.ac
|
@ -24,6 +24,7 @@ AC_CHECK_PROG([GUIX], [guix], [guix])
|
||||||
AC_CHECK_PROG([SED], [sed], [sed])
|
AC_CHECK_PROG([SED], [sed], [sed])
|
||||||
|
|
||||||
AC_SUBST([DOMAIN], [])
|
AC_SUBST([DOMAIN], [])
|
||||||
|
AC_SUBST([LETSENCRYPT_EMAIL], [])
|
||||||
|
|
||||||
AC_ARG_WITH([domain],
|
AC_ARG_WITH([domain],
|
||||||
[AS_HELP_STRING([--with-domain=DOMAIN],
|
[AS_HELP_STRING([--with-domain=DOMAIN],
|
||||||
|
@ -31,10 +32,18 @@ AC_ARG_WITH([domain],
|
||||||
[DOMAIN=$withval],
|
[DOMAIN=$withval],
|
||||||
[DOMAIN=audio.experimental.a-lec.org])
|
[DOMAIN=audio.experimental.a-lec.org])
|
||||||
|
|
||||||
|
AC_ARG_WITH([letsencrypt-email],
|
||||||
|
[AS_HELP_STRING([--with-letsencrypt-email=LETSENCRYPT_EMAIL], [Use
|
||||||
|
custom email address for Let's Encrypt registration and recovery
|
||||||
|
contact. (default=cominfra@a-lec.org)])],
|
||||||
|
[LETSENCRYPT_EMAIL=$withval],
|
||||||
|
[LETSENCRYPT_EMAIL=cominfra@a-lec.org])
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile])
|
AC_CONFIG_FILES([Makefile])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "Configuration options:"
|
echo "Configuration options:"
|
||||||
echo "======================"
|
echo "======================"
|
||||||
echo "- domain: $DOMAIN"
|
echo "- Domain: $DOMAIN"
|
||||||
|
echo "- Let's Encrypt email: $LETSENCRYPT_EMAIL"
|
||||||
|
|
|
@ -86,7 +86,7 @@ replicate or contribute to it.")
|
||||||
(service
|
(service
|
||||||
certbot-service-type
|
certbot-service-type
|
||||||
(certbot-configuration
|
(certbot-configuration
|
||||||
(email "cominfra@a-lec.org")
|
(email "LETSENCRYPT_EMAIL")
|
||||||
(certificates
|
(certificates
|
||||||
(list
|
(list
|
||||||
(certificate-configuration
|
(certificate-configuration
|
||||||
|
|
Loading…
Reference in New Issue