Fix some issues which were missed when upgrading to v4.

Author: SadieCat

Dockerfile

@@ -19,6 +19,10 @@ RUN adduser -u 10000 -h /inspircd/ -D -S -G inspircd inspircd
 
 RUN git clone --branch $VERSION https://github.com/inspircd/inspircd.git inspircd-src
 
+# TODO: remove this after updating to the next release
+RUN wget --output-document - --output-file /dev/null https://github.com/inspircd/inspircd/commit/030d71057597553dad26df8d9491c00f95bff669.patch | git -C inspircd-src apply
+RUN wget --output-document - --output-file /dev/null https://github.com/inspircd/inspircd/commit/42afdfd072c16bb762c5f7db9f0eed19b1acedf6.patch | git -C inspircd-src apply
+
 WORKDIR /inspircd-src
 RUN git checkout $(git describe --abbrev=0 --tags $VERSION)
 

README.md

@@ -143,7 +143,7 @@ Provide the SHA256 fingerprint of the certificate as `INSP_OPER_FINGERPRINT` to
 |-------------------------|--------------------------------|----------------------------------------------|
 |`INSP_OPER_NAME`         |`oper`                          |Oper name for usage with `/oper`              |
 |`INSP_OPER_FINGERPRINT`  |no default                      |Oper TLS fingerprint (SHA256)                 |
-|`INSP_OPER_AUTOLOGIN`    |`yes`                           |Automatic login of with TLS fingerprint       |
+|`INSP_OPER_AUTOLOGIN`    |`no`                            |Automatic login of with TLS fingerprint       |
 
 
 ## Linking servers and services

conf/inspircd.conf

@@ -1033,6 +1033,12 @@
 
 <include file="modules.conf">
 
+<include executable="sh conf/opers.sh">
+<include executable="sh conf/links.sh LINK1">
+<include executable="sh conf/links.sh LINK2">
+<include executable="sh conf/links.sh LINK3">
+<include executable="sh conf/services.sh">
+
 #-#-#-#-#-#-#-#-#-#-#- INSANE BAN OPTIONS  -#-#-#-#-#-#-#-#-#-#-#-#-#-#
 #                                                                     #
 # This optional tag allows you to specify how wide a G-line, E-line,  #

conf/links.sh

@@ -78,7 +78,7 @@ if [ "${SENDPASS}" != "" ] && [ "${RECVPASS}" != "" ] && [ "${NAME}" != "" ] &&
 
     # Set TLS support by extending the generation config extension
     if [ "${TLS_ON}" = "yes" ]; then
-        OPTIONS="$OPTIONS ssl=\"gnutls\""
+        OPTIONS="$OPTIONS sslprofile=\"main\""
     fi
 
     if [ "$FINGERPRINT" != "" ]; then

conf/opers.sh

@@ -20,7 +20,7 @@ cat <<EOF
 <define name="operName" value="${INSP_OPER_NAME:-oper}">
 <define name="operPassword" value="${INSP_OPER_PASSWORD_HASH}">
 <define name="operFingerprint" value="${INSP_OPER_FINGERPRINT}">
-<define name="operAutologin" value="${INSP_OPER_AUTOLOGIN:-yes}">
+<define name="operAutologin" value="${INSP_OPER_AUTOLOGIN:-no}">
 <define name="operSSLOnly" value="${INSP_OPER_SSLONLY:-yes}">
 <define name="operHash" value="${INSP_OPER_HASH:-hmac-sha256}">
 <define name="operHost" value="${INSP_OPER_HOST:-*@*}">
@@ -132,6 +132,7 @@ cat <<EOF
       # the private key is well-protected! Requires m_sslinfo.
       autologin="&operAutologin;"
 
+      nopassword="yes"
       sslonly="&operSSLOnly;"
       type="NetAdmin">
 EOF

conf/services.sh

@@ -27,7 +27,7 @@ fi
 
 # Set TLS support by extending the generation config extension
 if [ "${INSP_SERVICES_TLS_ON}" = "yes" ]; then
-    INSP_SERVICES_OPTIONS="$INSP_SERVICES_OPTIONS ssl=\"gnutls\""
+    INSP_SERVICES_OPTIONS="$INSP_SERVICES_OPTIONS sslprofile=\"main\""
 fi
 
 # Set default services name
@@ -44,9 +44,9 @@ cat <<EOF
       recvpass="${INSP_SERVICES_RECVPASS}"
       ${INSP_SERVICES_OPTIONS}>
 
-<uline server="$INSP_SERVICES_NAME" silent="yes">
+<services server="$INSP_SERVICES_NAME" silent="yes">
 
-<module name="m_sasl.so">
+<module name="sasl">
 <sasl target="$INSP_SERVICES_NAME">
 EOF
 fi

tests/customBuild.sh

@@ -18,7 +18,7 @@ mkdir -p "$TESTDIR"
 
 cp -r . "$TESTDIR"
 
-wget -O "$TESTDIR/modules/m_geocmd.cpp"  "https://raw.githubusercontent.com/inspircd/inspircd-contrib/master/3/m_geocmd.cpp"
+wget -O "$TESTDIR/modules/m_geocmd.cpp"  "https://raw.githubusercontent.com/inspircd/inspircd-contrib/master/4/m_geocmd.cpp"
 
 [ ! -e "$TESTDIR/modules/m_geocmd.cpp" ] && sleep 10
 

tests/customConfig.sh

@@ -16,7 +16,7 @@ TESTFILE="/tmp/tests-customConfig/test.conf"
 
 mkdir -p "$(dirname $TESTFILE)"
 
-echo "<module name=\"m_cban.so\">" >"$TESTFILE"
+echo "<module name=\"cban\">" >"$TESTFILE"
 
 # Run container with configs attached
 DOCKERCONTAINER=$(docker run -d -v "$TESTFILE:/inspircd/conf.d/test.conf" -p "127.0.0.1:${CLIENT_PORT}:6667" -p "127.0.0.1:${TLS_CLIENT_PORT}:6697" inspircd:testing)

tests/extras.sh

@@ -12,7 +12,7 @@ set -e
 # shellcheck source=tests/.portconfig.sh
 . "$(dirname "$0")/.portconfig.sh"
 
-TESTMODULE="m_svsoper"
+TESTMODULE="m_geocmd"
 
 # Create directory for testing
 mkdir -p /tmp/test-extras/

tests/linking.sh

@@ -26,10 +26,10 @@ DOCKERCONTAINER2=$(docker run -d --name test2 --network linkingTestNet -e INSP_S
 sleep 10
 
 # Check logs of the deamons
-if ! docker logs "$DOCKERCONTAINER1" | grep "LINK:.*Received.*end.*of.*netburst.*from.*test2.example.com"; then
+if ! docker logs "$DOCKERCONTAINER1" | grep "LINK.*:.*Received.*end.*of.*netburst.*from.*test2.example.com"; then
     sleep 60;
 fi
-docker logs "$DOCKERCONTAINER2" | grep "LINK:.*Received.*end.*of.*netburst.*from.*test1.example.com"
+docker logs "$DOCKERCONTAINER2" | grep "LINK.*:.*Received.*end.*of.*netburst.*from.*test1.example.com"
 
 # Clean up
 docker stop "${DOCKERCONTAINER1}" "${DOCKERCONTAINER2}" && docker rm "${DOCKERCONTAINER1}" "${DOCKERCONTAINER2}" && docker network rm "$DOCKERNETWORK"