Use consistent name for services server

This commit is contained in:
2024-12-28 17:55:56 +01:00
parent 2680502dfe
commit 93363e4b05
11 changed files with 20 additions and 20 deletions

View File

@ -8,7 +8,7 @@ from irctest.basecontrollers import BaseServicesController, DirectoryBasedContro
TEMPLATE_CONFIG = """ TEMPLATE_CONFIG = """
serverinfo {{ serverinfo {{
name = "services.example.org" name = "My.Little.Services"
description = "Anope IRC Services" description = "Anope IRC Services"
numeric = "00A" numeric = "00A"
pid = "services.pid" pid = "services.pid"

View File

@ -24,7 +24,7 @@ loadmodule "modules/saslserv/plain";
#loadmodule "modules/saslserv/scram"; #loadmodule "modules/saslserv/scram";
serverinfo {{ serverinfo {{
name = "services.example.org"; name = "My.Little.Services";
desc = "Atheme IRC Services"; desc = "Atheme IRC Services";
numeric = "00A"; numeric = "00A";
netname = "testnet"; netname = "testnet";

View File

@ -14,7 +14,7 @@ options {{
network_name unconfigured; network_name unconfigured;
allow_split_ops; # Give ops in empty channels 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 // if you need to link more than 1 server, uncomment the following line
servtype hub; servtype hub;
@ -44,7 +44,7 @@ class {{
/* for services */ /* for services */
super {{ super {{
"services.example.org"; "My.Little.Services";
}}; }};
@ -57,7 +57,7 @@ class {{
/* our services */ /* our services */
connect {{ connect {{
name services.example.org; name My.Little.Services;
host *@127.0.0.1; # unfortunately, masks aren't allowed here host *@127.0.0.1; # unfortunately, masks aren't allowed here
apasswd password; apasswd password;
cpasswd password; cpasswd password;
@ -91,7 +91,7 @@ class BahamutController(BaseServerController, DirectoryBasedController):
software_name = "Bahamut" software_name = "Bahamut"
supported_sasl_mechanisms: Set[str] = set() supported_sasl_mechanisms: Set[str] = set()
supports_sts = False supports_sts = False
nickserv = "NickServ@services.example.org" nickserv = "NickServ@My.Little.Services"
def create_config(self) -> None: def create_config(self) -> None:
super().create_config() super().create_config()

View File

@ -44,7 +44,7 @@ channel {{
displayed_usercount = 0; displayed_usercount = 0;
}}; }};
connect "services.example.org" {{ connect "My.Little.Services" {{
host = "localhost"; # Used to validate incoming connection host = "localhost"; # Used to validate incoming connection
port = 0; # We don't need servers to connect to services port = 0; # We don't need servers to connect to services
send_password = "password"; send_password = "password";
@ -53,7 +53,7 @@ connect "services.example.org" {{
flags = topicburst; flags = topicburst;
}}; }};
service {{ service {{
name = "services.example.org"; name = "My.Little.Services";
}}; }};
privset "omnioper" {{ privset "omnioper" {{

View File

@ -13,7 +13,7 @@ TEMPLATE_DLK_CONFIG = """\
info {{ info {{
SID "00A"; SID "00A";
network-name "testnetwork"; network-name "testnetwork";
services-name "services.example.org"; services-name "My.Little.Services";
admin-email "admin@example.org"; admin-email "admin@example.org";
}} }}

View File

@ -42,7 +42,7 @@ class {{
connectfreq = 5 minutes; connectfreq = 5 minutes;
}}; }};
connect {{ connect {{
name = "services.example.org"; name = "My.Little.Services";
host = "127.0.0.1"; # Used to validate incoming connection host = "127.0.0.1"; # Used to validate incoming connection
port = 0; # We don't need servers to connect to services port = 0; # We don't need servers to connect to services
send_password = "password"; send_password = "password";
@ -50,7 +50,7 @@ connect {{
class = "server"; class = "server";
}}; }};
service {{ service {{
name = "services.example.org"; name = "My.Little.Services";
}}; }};
auth {{ auth {{

View File

@ -41,7 +41,7 @@ TEMPLATE_CONFIG = """
# Services: # Services:
<bind address="{services_hostname}" port="{services_port}" type="servers"> <bind address="{services_hostname}" port="{services_port}" type="servers">
<link name="services.example.org" <link name="My.Little.Services"
ipaddr="{services_hostname}" ipaddr="{services_hostname}"
port="{services_port}" port="{services_port}"
allowmask="*" allowmask="*"
@ -51,7 +51,7 @@ TEMPLATE_CONFIG = """
<module name="spanningtree"> <module name="spanningtree">
<module name="hidechans"> # Anope errors when missing <module name="hidechans"> # Anope errors when missing
<sasl requiressl="no" <sasl requiressl="no"
target="services.example.org"> target="My.Little.Services">
# Protocol: # Protocol:
<module name="banexception"> <module name="banexception">

View File

@ -14,7 +14,7 @@ TEMPLATE_CONFIG = """
{password_field} {password_field}
[Server] [Server]
Name = services.example.org Name = My.Little.Services
MyPassword = password MyPassword = password
PeerPassword = password PeerPassword = password
Passive = yes # don't connect to it Passive = yes # don't connect to it

View File

@ -44,7 +44,7 @@ class {{
connectfreq = 5 minutes; connectfreq = 5 minutes;
}}; }};
connect {{ connect {{
name = "services.example.org"; name = "My.Little.Services";
host = "127.0.0.1"; # Used to validate incoming connection host = "127.0.0.1"; # Used to validate incoming connection
port = 0; # We don't need servers to connect to services port = 0; # We don't need servers to connect to services
send_password = "password"; send_password = "password";
@ -52,7 +52,7 @@ connect {{
class = "server"; class = "server";
}}; }};
service {{ service {{
name = "services.example.org"; name = "My.Little.Services";
}}; }};
auth {{ auth {{

View File

@ -64,7 +64,7 @@ listen {{
options {{ serversonly; }} options {{ serversonly; }}
}} }}
link services.example.org {{ link My.Little.Services {{
incoming {{ incoming {{
mask *; mask *;
}} }}
@ -72,11 +72,11 @@ link services.example.org {{
class servers; class servers;
}} }}
ulines {{ ulines {{
services.example.org; My.Little.Services;
}} }}
set {{ set {{
sasl-server services.example.org; sasl-server My.Little.Services;
kline-address "example@example.org"; kline-address "example@example.org";
network-name "ExampleNET"; network-name "ExampleNET";
default-server "irc.example.org"; default-server "irc.example.org";

View File

@ -127,7 +127,7 @@ class ServicesLinksTestCase(cases.BaseServerTestCase):
command=RPL_LINKS, command=RPL_LINKS,
params=[ params=[
"nick", "nick",
"services.example.org", "My.Little.Services",
"My.Little.Server", "My.Little.Server",
StrRe("1 .+"), # SID instead of description for Anope... StrRe("1 .+"), # SID instead of description for Anope...
], ],