fix(merge_conflicts): fix alien merge conflicts

Author: amadaluzia

.dockerignore

@@ -14,15 +14,12 @@ Dockerfile*
 .dockerignore
 
 # Development and CI files
-<<<<<<< Updated upstream
 scripts/
 # Keep required scripts for Docker build
 !scripts/start-services.sh
 !scripts/manage-modules.sh
 !scripts/module-config.sh
 !scripts/start-webpanel.sh
-=======
->>>>>>> Stashed changes
 renovate.json
 .github/
 .vscode/

Dockerfile

@@ -18,7 +18,6 @@ ENV DEBIAN_FRONTEND=noninteractive \
 RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y --no-install-recommends \
-<<<<<<< Updated upstream
     build-essential \
     gdb \
     gettext \
@@ -32,7 +31,6 @@ RUN apt-get update && \
     wget \
     ca-certificates \
     git \
-=======
     build-essential=12.9 \
     gdb=13.1-3 \
     gettext=0.21-12 \
@@ -46,24 +44,16 @@ RUN apt-get update && \
     wget=1.21.3-1+deb12u1 \
     ca-certificates=20230311 \
     git=1:2.39.5-0+deb12u2 \
->>>>>>> Stashed changes
     # Additional Atheme dependencies for better functionality
     libidn2-dev \
     nettle-dev \
     libqrencode-dev \
     # Development tools for better builds
-<<<<<<< Updated upstream
-    autoconf \
-    automake \
-    libtool \
-    # Perl development libraries for Atheme Perl support
-    libperl-dev && \
-=======
     autoconf=2.71-3 \
     automake=1:1.16.5-1.3 \
-    libperl-dev=5.36.0-7+deb12u2 \
-    libtool=2.4.7-7~deb12u1 && \
->>>>>>> Stashed changes
+    libtool=2.4.7-7~deb12u1 \
+    # Perl development libraries for Atheme Perl support
+    libperl-dev=5.36.0-7+deb12u2 && \
     apt-get clean && \
     rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/* /tmp/* /var/tmp/*
 

unrealircd/default/examples/example.conf unrealircd/conf/examples/example.confunrealircd/default/examples/example.conf renamed to unrealircd/conf/examples/example.conf

@@ -41,7 +41,6 @@
  * use this. Then, when everything is up and running you can come
  * back later to customize the list (if you wish).
  */
-
 include "modules.default.conf";
 
 /* Now let's include some other files as well:
@@ -52,13 +51,11 @@ include "modules.default.conf";
  * - operclass.default.conf contains some good operclasses which
  *   you can use in your oper blocks.
  */
-
 include "help/help.conf";
 include "badwords.conf";
-include "spamfilter.conf";
+//include "spamfilter.conf";
 include "operclass.default.conf";
 include "snomasks.default.conf";
-include "rpc.modules.default.conf";
 
 /* Load the default cloaking module (2021 onwards): */
 loadmodule "cloak_sha256";
@@ -73,8 +70,8 @@ loadmodule "cloak_sha256";
  * have it's own sid). It is common to use 001 for the first server.
  */
 me {
-	name "irc.atl.chat";
-	info "All Things Linux IRC Server";
+	name "irc.example.org";
+	info "ExampleNET Server";
 	sid "001";
 }
 
@@ -83,9 +80,9 @@ me {
  * It normally contains information on how to contact the administrator.
  */
 admin {
-	"All Things Linux";
-	"admin";
-	"admin@allthingslinux.org";
+	"Bob Smith";
+	"bob";
+	"email@example.org";
 }
 
 /* Clients and servers are put in class { } blocks, we define them here.
@@ -163,7 +160,7 @@ allow {
 /* Here is an example oper block for 'bobsmith'
  * YOU MUST CHANGE THIS!! (the oper name and the password)
  */
-oper admin {
+oper bobsmith {
 	class opers;
 	mask *@*;
 
@@ -223,13 +220,6 @@ listen {
 	options { tls; serversonly; }
 }
 
-/* JSON-RPC API port for webpanel */
-listen {
-	ip *;
-	port 8600;
-	options { rpc; }
-}
-
 /* NOTE: If you are on an IRCd shell with multiple IP's and you use
  *       the above listen { } blocks then you will likely get an
  *       'Address already in use' error and the ircd won't start.
@@ -358,107 +348,6 @@ include "aliases/anope.conf";
 // 	reason "Reserved for Services";
 // }
 
-/* Ban nick names so they cannot be used by regular users */
-ban nick {
-	mask "*ChanServ*";
-	reason "Reserved for Services";
-}
-
-ban nick {
-	mask "*NickServ*";
-	reason "Reserved for Services";
-}
-
-ban nick {
-	mask "*MemoServ*";
-	reason "Reserved for Services";
-}
-
-ban nick {
-	mask "*BotServ*";
-	reason "Reserved for Services";
-}
-
-ban nick {
-	mask "*OperServ*";
-	reason "Reserved for Services";
-}
-
-ban nick {
-	mask "*HostServ*";
-	reason "Reserved for Services";
-}
-
-ban nick {
-	mask "*HelpServ*";
-	reason "Reserved for Services";
-}
-
-ban nick {
-	mask "*StatServ*";
-	reason "Reserved for Services";
-}
-
-ban nick {
-	mask "*Global*";
-	reason "Reserved for Services";
-}
-
-ban nick {
-	mask "*root*";
-	reason "Reserved system name";
-}
-
-ban nick {
-	mask "*admin*";
-	reason "Reserved system name";
-}
-
-ban nick {
-	mask "*administrator*";
-	reason "Reserved system name";
-}
-
-ban nick {
-	mask "*server*";
-	reason "Reserved system name";
-}
-
-ban nick {
-	mask "*services*";
-	reason "Reserved for Services";
-}
-
-ban nick {
-	mask "*IRC*";
-	reason "Reserved for network";
-}
-
-ban nick {
-	mask "*ircop*";
-	reason "Reserved for operators";
-}
-
-ban nick {
-	mask "*operator*";
-	reason "Reserved for operators";
-}
-
-ban nick {
-	mask "*guest*";
-	reason "Generic guest name not allowed";
-}
-
-ban nick {
-	mask "*anonymous*";
-	reason "Anonymous connections not allowed";
-}
-
-ban nick {
-	mask "*unknown*";
-	reason "Unknown user not allowed";
-}
-
 /* Ban ip.
  * Note that you normally use /KLINE, /GLINE and /ZLINE for this.
  */
@@ -508,10 +397,10 @@ ban nick {
 /* This allows IRCCloud connections in without maxperip restrictions
  * and also exempt them from connect-flood throttling.
  */
-// except ban {
-// 	mask *.irccloud.com;
-// 	type { maxperip; connect-flood; }
-// }
+except ban {
+	mask *.irccloud.com;
+	type { maxperip; connect-flood; }
+}
 
 /* With deny dcc blocks you can ban filenames for DCC */
 // deny dcc {
@@ -541,15 +430,6 @@ ban nick {
 // 	password "test";
 // }
 
-vhost {
-	auto-login yes;
-	mask {
-		identified yes;
-	}
-	vhost atl.chat;
-}
-
-
 /* Blacklist blocks will query an external DNS Blacklist service
  * whenever a user connects, to see if the IP address is known
  * to cause drone attacks, is a known hacked machine, etc.
@@ -601,30 +481,15 @@ blacklist efnetrbl {
 /* Network configuration */
 set {
 	// CHANGE THIS, ALL 4 ITEMS:
-	network-name 		"atl.chat";
-	default-server 		"irc.atl.chat";
-	services-server 	"services.atl.chat";
-	// stats-server 		"stats.example.org";
+	network-name 		"ExampleNET";
+	default-server 		"irc.example.org";
+	services-server 	"services.example.org";
+	stats-server 		"stats.example.org";
 
 	/* Normal defaults */
-
-	/* Example of how the cloak prefix appears in practice:
-	 * With cloak-prefix "atl", a user's real hostname like "user.example.com"
-	 * would be cloaked to something like "atl-A1B2C3D4.user.example.com"
-	 * This helps protect user privacy while maintaining network identity.
-	 */
-
-	help-channel 		"#support";
-	cloak-prefix		"atl";
-
-	/* prefix-quit: Text that appears before a user's quit message
-	 * When a user disconnects with /QUIT "reason", other users will see:
-	 * "*** nick has quit IRC (Quit: reason)"
-	 * The "Quit" part is what prefix-quit controls.
-	 * Set to empty string "" to show no prefix, just the reason.
-	 */
-
-	prefix-quit 		"quit";
+	help-channel 		"#Help";
+	cloak-prefix		"Clk";
+	prefix-quit 		"Quit";
 
 	/* Cloak keys should be the same at all servers on the network.
 	 * They are used for generating masked hosts and should be kept secret.
@@ -645,12 +510,12 @@ set {
 /* Server specific configuration */
 set {
 	// FINALLY, YOU MUST CHANGE THIS NEXT ITEM:
-	kline-address '[email protected]'; /* e-mail or URL shown when a user is banned */
+	kline-address 'set.this.to.email.address'; /* e-mail or URL shown when a user is banned */
 
 	modes-on-connect "+ixw"; /* when users connect, they will get these user modes */
 	modes-on-oper "+xws"; /* when someone becomes IRCOp they'll get these modes */
 	modes-on-join "+nt"; /* default channel modes when a new channel is created */
-	oper-auto-join "#mod-chat"; /* IRCOps are auto-joined to this channel */
+	oper-auto-join "#opers"; /* IRCOps are auto-joined to this channel */
 	options {
 		hide-ulines; /* hide U-lines in /MAP and /LINKS */
 		show-connect-info; /* show "looking up your hostname" messages on connect */
@@ -804,13 +669,6 @@ set {
  * For more information see https://www.unrealircd.org/docs/MOTD_and_Rules
  */
 
-/* JSON-RPC API configuration for webpanel */
-rpc-user adminpanel {
-	match { ip 127.*; }
-	rpc-class full;
-	password "webpanel_password_2024";
-}
-
 /*
  * Problems or need more help?
  * 1) https://www.unrealircd.org/docs/