Apologies if my wording is a bit confusing. Programming isn't my day job.

I'm working on a Dockerfile for Prosody, using Alpine Linux as the base. I
noticed an abnormality when compiling from the source, where some unneeded
files are being copied into the /etc/prosody/config/certs directory during
a make install. These files are:

/etc/prosody/certs/GNUmakefile
/etc/prosody/certs/localhost.cnf
/etc/prosody/certs/makefile
/etc/prosody/certs/openssl.cnf

I took a look at the GNUmakefile, and I saw that it's copying over
everything from the source's certs directory into the final install
location, instead of just the generated certs and keys.

The patch I am submitting brings 'GNUmakefile' more in line with how the
make install is handled in 'makefile'. The generated example and localhost
certificate & key will be the only files installed into the certs directory
now. If the --no-example-certs option is specified when running
'configure', nothing will be installed into the certs directory.

Thank You

-- 
You received this message because you are subscribed to the Google Groups 
"prosody-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prosody-dev/CABSPFiRR%2BHvcv-M%2BngYWPqq%2BXCpA%2BakUHR%3DP_CzhgfmZcpTqjg%40mail.gmail.com.
--- GNUmakefile.orig	2021-06-09 00:15:48.436278955 -0400
+++ GNUmakefile.new	2021-06-08 23:42:31.263414159 -0400
@@ -59,7 +59,10 @@
 	$(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
 	$(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
 	$(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
-	$(INSTALL_DATA) certs/* $(CONFIG)/certs
+ifeq ($(EXCERTS),yes)
+	$(INSTALL_DATA) certs/localhost.crt certs/localhost.key $(CONFIG)/certs
+	$(INSTALL_DATA) certs/example.com.crt certs/example.com.key $(CONFIG)/certs
+endif
 	$(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
 	test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
 	-test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version

Reply via email to