pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-06-12 17:14:46 +02:00
Code Activity

Let's call it "./unrealircd mkcert" instead (like mkpasswd). Fix test suite.

Browse Source
This commit is contained in:
Bram Matthys
2026-06-05 16:41:33 +02:00
parent 982325fc82
commit be08bc2e33
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Config
+1 -1
View File
@@ -188,7 +188,7 @@ if [ "$QUICK" != "1" ] ; then
echo "*******************************************************************************" echo "*******************************************************************************"
echo "Press ENTER to continue" echo "Press ENTER to continue"
read cc read cc
./unrealircd makecert ./unrealircd mkcert
echo "Certificate created successfully." echo "Certificate created successfully."
sleep 1 sleep 1
else else
Makefile.in
+1 -1
View File
@@ -266,7 +266,7 @@ install: all
pem: pem:
@echo "The command 'make pem' is no longer used to generate the TLS certificate." @echo "The command 'make pem' is no longer used to generate the TLS certificate."
@echo "Please run './unrealircd makecert' instead." @echo "Please run './unrealircd mkcert' instead."
Makefile: config.status Makefile.in Makefile: config.status Makefile.in
./config.status ./config.status
extras/build-tests/nix/build
+1 -1
View File
@@ -41,7 +41,7 @@ if [ "$SSLDIR" != "" ]; then
fi fi
./Config -quick || (tail -n 5000 config.log; exit 1) ./Config -quick || (tail -n 5000 config.log; exit 1)
$MAKE $MAKE
yes ''|$MAKE pem (echo 'Y'; yes '')|./unrealircd mkcert
$MAKE || exit 1 $MAKE || exit 1
$MAKE install || exit 1 $MAKE install || exit 1
./unrealircd module install third/dumpcmds || exit 1 ./unrealircd module install third/dumpcmds || exit 1
src/tls.c
+2 -2
View File
@@ -358,7 +358,7 @@ SSL_CTX *init_ctx(TLSOptions *tlsoptions, int server)
{ {
unreal_log(ULOG_ERROR, "config", "TLS_LOAD_FAILED_DEFAULT_CERT", NULL, unreal_log(ULOG_ERROR, "config", "TLS_LOAD_FAILED_DEFAULT_CERT", NULL,
"It seems the default certificate is missing. " "It seems the default certificate is missing. "
"Run './unrealircd makecert' " "Run './unrealircd mkcert' "
"to generate a self-signed cert."); "to generate a self-signed cert.");
} }
goto fail; goto fail;
@@ -457,7 +457,7 @@ SSL_CTX *init_ctx(TLSOptions *tlsoptions, int server)
{ {
unreal_log(ULOG_ERROR, "config", "TLS_CERTIFICATE_CHECK_FAILED", NULL, unreal_log(ULOG_ERROR, "config", "TLS_CERTIFICATE_CHECK_FAILED", NULL,
"There is a problem with your TLS certificate: $quality_check_error\n" "There is a problem with your TLS certificate: $quality_check_error\n"
"If you use the standard UnrealIRCd certificates then you can simply run './unrealircd makecert' " "If you use the standard UnrealIRCd certificates then you can simply run './unrealircd mkcert' "
"to create and install new certificates", "to create and install new certificates",
log_data_string("quality_check_error", errstr)); log_data_string("quality_check_error", errstr));
goto fail; goto fail;
unrealircd.in
+3 -3
View File
@@ -17,7 +17,7 @@ OPENSSLPATH="@OPENSSLPATH@"
# older gcc/clang might dump a 16TB core file. We explicitly enable it here. # older gcc/clang might dump a 16TB core file. We explicitly enable it here.
export ASAN_OPTIONS="abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1:log_path=$TMPDIR/unrealircd_asan:detect_leaks=0" export ASAN_OPTIONS="abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1:log_path=$TMPDIR/unrealircd_asan:detect_leaks=0"
if [ "$1" != "makecert" ] && [ ! -f $IRCD ]; then if [ "$1" != "mkcert" ] && [ ! -f $IRCD ]; then
echo "ERROR: Could not find the IRCd binary ($IRCD)" echo "ERROR: Could not find the IRCd binary ($IRCD)"
echo "This could mean two things:" echo "This could mean two things:"
echo "1) You forgot to run 'make install' after running 'make'" echo "1) You forgot to run 'make install' after running 'make'"
@@ -269,7 +269,7 @@ __EOF__
echo "Thanks!" echo "Thanks!"
elif [ "$1" = "spki" -o "$1" = "spkifp" ] ; then elif [ "$1" = "spki" -o "$1" = "spkifp" ] ; then
$UNREALIRCDCTL $* $UNREALIRCDCTL $*
elif [ "$1" = "makecert" ] ; then elif [ "$1" = "mkcert" ] ; then
TLSDIR="$CONFDIR/tls" TLSDIR="$CONFDIR/tls"
KEY="$TLSDIR/server.key.pem" KEY="$TLSDIR/server.key.pem"
CERT="$TLSDIR/server.cert.pem" CERT="$TLSDIR/server.cert.pem"
@@ -507,13 +507,13 @@ else
echo "unrealircd stop Stop (kill) the IRC Server" echo "unrealircd stop Stop (kill) the IRC Server"
echo "unrealircd rehash Reload the configuration file" echo "unrealircd rehash Reload the configuration file"
echo "unrealircd reloadtls Reload the SSL/TLS certificates" echo "unrealircd reloadtls Reload the SSL/TLS certificates"
echo "unrealircd makecert Create or replace the self-signed TLS certificate"
echo "unrealircd restart Restart the IRC Server (stop+start)" echo "unrealircd restart Restart the IRC Server (stop+start)"
echo "unrealircd status Show current status of the IRC Server" echo "unrealircd status Show current status of the IRC Server"
echo "unrealircd module-status Show all currently loaded modules" echo "unrealircd module-status Show all currently loaded modules"
echo "unrealircd upgrade Upgrade UnrealIRCd to the latest version (or the next available" echo "unrealircd upgrade Upgrade UnrealIRCd to the latest version (or the next available"
echo " release candidate if the --rc argument is used)" echo " release candidate if the --rc argument is used)"
echo "unrealircd mkpasswd Hash a password" echo "unrealircd mkpasswd Hash a password"
echo "unrealircd mkcert Create or replace the self-signed TLS certificate"
echo "unrealircd version Display the UnrealIRCd version" echo "unrealircd version Display the UnrealIRCd version"
echo "unrealircd module Install and uninstall 3rd party modules" echo "unrealircd module Install and uninstall 3rd party modules"
echo "unrealircd croncheck For use in crontab: this checks if the server" echo "unrealircd croncheck For use in crontab: this checks if the server"