diff --git a/irctest/controllers/anope_services.py b/irctest/controllers/anope_services.py index a838a9a..940fcaf 100644 --- a/irctest/controllers/anope_services.py +++ b/irctest/controllers/anope_services.py @@ -8,7 +8,7 @@ from irctest.basecontrollers import BaseServicesController, DirectoryBasedContro TEMPLATE_CONFIG = """ serverinfo {{ - name = "services.example.org" + name = "My.Little.Services" description = "Anope IRC Services" numeric = "00A" pid = "services.pid" diff --git a/irctest/controllers/atheme_services.py b/irctest/controllers/atheme_services.py index c52b7c8..ce9be7c 100644 --- a/irctest/controllers/atheme_services.py +++ b/irctest/controllers/atheme_services.py @@ -24,7 +24,7 @@ loadmodule "modules/saslserv/plain"; #loadmodule "modules/saslserv/scram"; serverinfo {{ - name = "services.example.org"; + name = "My.Little.Services"; desc = "Atheme IRC Services"; numeric = "00A"; netname = "testnet"; diff --git a/irctest/controllers/bahamut.py b/irctest/controllers/bahamut.py index 89c2d90..16daad1 100644 --- a/irctest/controllers/bahamut.py +++ b/irctest/controllers/bahamut.py @@ -14,7 +14,7 @@ options {{ network_name unconfigured; allow_split_ops; # Give ops in empty channels - services_name services.example.org; + services_name My.Little.Services; // if you need to link more than 1 server, uncomment the following line servtype hub; @@ -44,7 +44,7 @@ class {{ /* for services */ super {{ - "services.example.org"; + "My.Little.Services"; }}; @@ -57,7 +57,7 @@ class {{ /* our services */ connect {{ - name services.example.org; + name My.Little.Services; host *@127.0.0.1; # unfortunately, masks aren't allowed here apasswd password; cpasswd password; @@ -91,7 +91,7 @@ class BahamutController(BaseServerController, DirectoryBasedController): software_name = "Bahamut" supported_sasl_mechanisms: Set[str] = set() supports_sts = False - nickserv = "NickServ@services.example.org" + nickserv = "NickServ@My.Little.Services" def create_config(self) -> None: super().create_config() diff --git a/irctest/controllers/charybdis.py b/irctest/controllers/charybdis.py index e07685e..9e14a81 100644 --- a/irctest/controllers/charybdis.py +++ b/irctest/controllers/charybdis.py @@ -44,7 +44,7 @@ channel {{ displayed_usercount = 0; }}; -connect "services.example.org" {{ +connect "My.Little.Services" {{ host = "localhost"; # Used to validate incoming connection port = 0; # We don't need servers to connect to services send_password = "password"; @@ -53,7 +53,7 @@ connect "services.example.org" {{ flags = topicburst; }}; service {{ - name = "services.example.org"; + name = "My.Little.Services"; }}; privset "omnioper" {{ diff --git a/irctest/controllers/dlk_services.py b/irctest/controllers/dlk_services.py index 71961a7..2ddf596 100644 --- a/irctest/controllers/dlk_services.py +++ b/irctest/controllers/dlk_services.py @@ -13,7 +13,7 @@ TEMPLATE_DLK_CONFIG = """\ info {{ SID "00A"; network-name "testnetwork"; - services-name "services.example.org"; + services-name "My.Little.Services"; admin-email "admin@example.org"; }} diff --git a/irctest/controllers/hybrid.py b/irctest/controllers/hybrid.py index 9582a14..76968b8 100644 --- a/irctest/controllers/hybrid.py +++ b/irctest/controllers/hybrid.py @@ -42,7 +42,7 @@ class {{ connectfreq = 5 minutes; }}; connect {{ - name = "services.example.org"; + name = "My.Little.Services"; host = "127.0.0.1"; # Used to validate incoming connection port = 0; # We don't need servers to connect to services send_password = "password"; @@ -50,7 +50,7 @@ connect {{ class = "server"; }}; service {{ - name = "services.example.org"; + name = "My.Little.Services"; }}; auth {{ diff --git a/irctest/controllers/inspircd.py b/irctest/controllers/inspircd.py index b2504dd..6707422 100644 --- a/irctest/controllers/inspircd.py +++ b/irctest/controllers/inspircd.py @@ -41,7 +41,7 @@ TEMPLATE_CONFIG = """ # Services: - # Anope errors when missing + target="My.Little.Services"> # Protocol: diff --git a/irctest/controllers/ngircd.py b/irctest/controllers/ngircd.py index d3753fc..fd66334 100644 --- a/irctest/controllers/ngircd.py +++ b/irctest/controllers/ngircd.py @@ -14,7 +14,7 @@ TEMPLATE_CONFIG = """ {password_field} [Server] - Name = services.example.org + Name = My.Little.Services MyPassword = password PeerPassword = password Passive = yes # don't connect to it diff --git a/irctest/controllers/plexus4.py b/irctest/controllers/plexus4.py index a968e56..89f150b 100644 --- a/irctest/controllers/plexus4.py +++ b/irctest/controllers/plexus4.py @@ -44,7 +44,7 @@ class {{ connectfreq = 5 minutes; }}; connect {{ - name = "services.example.org"; + name = "My.Little.Services"; host = "127.0.0.1"; # Used to validate incoming connection port = 0; # We don't need servers to connect to services send_password = "password"; @@ -52,7 +52,7 @@ connect {{ class = "server"; }}; service {{ - name = "services.example.org"; + name = "My.Little.Services"; }}; auth {{ diff --git a/irctest/controllers/unrealircd.py b/irctest/controllers/unrealircd.py index 653b0df..a9a55f4 100644 --- a/irctest/controllers/unrealircd.py +++ b/irctest/controllers/unrealircd.py @@ -64,7 +64,7 @@ listen {{ options {{ serversonly; }} }} -link services.example.org {{ +link My.Little.Services {{ incoming {{ mask *; }} @@ -72,11 +72,11 @@ link services.example.org {{ class servers; }} ulines {{ - services.example.org; + My.Little.Services; }} set {{ - sasl-server services.example.org; + sasl-server My.Little.Services; kline-address "example@example.org"; network-name "ExampleNET"; default-server "irc.example.org"; diff --git a/irctest/server_tests/links.py b/irctest/server_tests/links.py index 4a77554..a8b007f 100644 --- a/irctest/server_tests/links.py +++ b/irctest/server_tests/links.py @@ -127,7 +127,7 @@ class ServicesLinksTestCase(cases.BaseServerTestCase): command=RPL_LINKS, params=[ "nick", - "services.example.org", + "My.Little.Services", "My.Little.Server", StrRe("1 .+"), # SID instead of description for Anope... ],