Merge branch 'insp3' into master.

.github/workflows/ci-irctest.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           path: irctest
-          ref: 321e254d15fab53fe6c8e3959312f6c0805c770f
+          ref: 59b2cd729b7785c3768e2ed8c4baa89472b45391
           repository: progval/irctest
 
       - name: Run configure
@@ -35,8 +35,10 @@ jobs:
       - name: Precompile inspircd.h
         run: c++ -I vendor/ include/inspircd.h
 
-      - name: Build and Install
-        run: make install --jobs $(($(getconf _NPROCESSORS_ONLN) + 1)) CXXFLAGS=-DINSPIRCD_UNLIMITED_MAINLOOP
+      - name: Build and install
+        env:
+          CXXFLAGS: -DINSPIRCD_UNLIMITED_MAINLOOP
+        run: make install --jobs $(($(getconf _NPROCESSORS_ONLN) + 1))
 
       - name: Make artifact tarball
         run: |-
@@ -71,7 +73,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           path: irctest
-          ref: 3b7f81e22c317eae885f5a942767ba4f6a30414e
+          ref: 59b2cd729b7785c3768e2ed8c4baa89472b45391
           repository: progval/irctest
 
       - name: Install irctest dependencies
@@ -95,7 +97,7 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE/anope/
           cp $GITHUB_WORKSPACE/irctest/data/anope/* .
-          CFLAGS=-O0 ./Config -quick
+          ./Config -quick
           make -C build --jobs $(($(getconf _NPROCESSORS_ONLN) + 1))
           make -C build install
 

.mailmap

@@ -46,6 +46,7 @@ satmd <satmd@satmd.de>                       satmd <satmd@users.noreply.github.c
 Thomas Stagner <aquanight@inspircd.org>      aquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7>
 Uli Schlachter <psychon@inspircd.org>        psychon <psychon@e03df62e-2008-0410-955e-edbf42e46eb7>
 Val Lorentz <progval+git@progval.net>        Valentin Lorentz <progval+git@progval.net>
+Val Lorentz <progval+git@progval.net>        Val Lorentz <progval+github@progval.net>
 
 # The identities of the following people could not be verified. If you have an
 # email address for them please contact Sadie.

make/template/deploy-ssl.sh

@@ -0,0 +1,34 @@
+%mode 0750
+#!/bin/sh
+set -e
+
+# IMPORTANT: This script is an example post-deploy hook for use with CertBot,
+# Dehydrated, or a similar SSL (TLS) renewal tool. You will need to customise
+# it for your setup before you use it
+
+# The location your renewal tool places your certificates.
+CERT_DIR="/etc/letsencrypt/live/irc.example.com"
+
+# The location of the InspIRCd config directory.
+INSPIRCD_CONFIG_DIR="@CONFIG_DIR@"
+
+# The location of the InspIRCd pid file.
+INSPIRCD_PID_FILE="@RUNTIME_DIR@/inspircd.pid"
+
+# The user:group that InspIRCd runs as.
+INSPIRCD_OWNER="@USER@:@GROUP@"
+
+if [ -e ${CERT_DIR} -a -e ${INSPIRCD_CONFIG_DIR} ]
+then
+    cp "${CERT_DIR}/fullchain.pem" "${INSPIRCD_CONFIG_DIR}/cert.pem"
+    cp "${CERT_DIR}/privkey.pem" "${INSPIRCD_CONFIG_DIR}/key.pem"
+    chown ${INSPIRCD_OWNER} "${INSPIRCD_CONFIG_DIR}/cert.pem" "${INSPIRCD_CONFIG_DIR}/key.pem"
+
+    if [ -r ${INSPIRCD_PID_FILE} ]
+    then
+        kill -USR1 $(cat ${INSPIRCD_PID_FILE})
+    elif [ -d /lib/systemd ] && systemctl --quiet is-active inspircd
+    then
+        systemctl kill --signal USR1 inspircd
+    fi
+fi

make/template/main.mk

@@ -267,6 +267,7 @@ install: target
 	@-$(INSTALL) -d $(INSTFLAGS) -m $(INSTMODE_DIR) $(SCRPATH)
 	-$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
 	-$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_BIN) "$(BUILDPATH)/modules/"*.$(DLLEXT) $(MODPATH)
+	-$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/deploy-ssl.sh $(SCRPATH) 2>/dev/null
 	-$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null
 	-$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/apparmor $(SCRPATH) 2>/dev/null
 	-$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/logrotate $(SCRPATH) 2>/dev/null