mirror of
https://github.com/progval/irctest.git
synced 2025-04-04 14:29:46 +00:00
Use consistent name for services server
This commit is contained in:
@ -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"
|
||||
|
@ -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";
|
||||
|
@ -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()
|
||||
|
@ -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" {{
|
||||
|
@ -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";
|
||||
}}
|
||||
|
||||
|
@ -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 {{
|
||||
|
@ -41,7 +41,7 @@ TEMPLATE_CONFIG = """
|
||||
|
||||
# Services:
|
||||
<bind address="{services_hostname}" port="{services_port}" type="servers">
|
||||
<link name="services.example.org"
|
||||
<link name="My.Little.Services"
|
||||
ipaddr="{services_hostname}"
|
||||
port="{services_port}"
|
||||
allowmask="*"
|
||||
@ -51,7 +51,7 @@ TEMPLATE_CONFIG = """
|
||||
<module name="spanningtree">
|
||||
<module name="hidechans"> # Anope errors when missing
|
||||
<sasl requiressl="no"
|
||||
target="services.example.org">
|
||||
target="My.Little.Services">
|
||||
|
||||
# Protocol:
|
||||
<module name="banexception">
|
||||
|
@ -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
|
||||
|
@ -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 {{
|
||||
|
@ -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";
|
||||
|
@ -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...
|
||||
],
|
||||
|
Reference in New Issue
Block a user