fixed hopm, started moving services to redis
This commit is contained in:
parent
47acaa8c2d
commit
9bdc509069
@ -1,21 +1,18 @@
|
|||||||
module {
|
module {
|
||||||
name = "help";
|
name = "help"
|
||||||
}
|
}
|
||||||
|
|
||||||
module
|
module
|
||||||
{
|
{
|
||||||
name = "m_mysql"
|
name = "m_redis"
|
||||||
mysql
|
redis
|
||||||
{
|
{
|
||||||
name = "mysql/main"
|
name = "redis/main"
|
||||||
database = "anope"
|
ip = "100.64.64.130"
|
||||||
server = "100.64.64.130"
|
port = 6379
|
||||||
username = "root"
|
|
||||||
password = ""
|
|
||||||
port = 3306
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
module {
|
module {
|
||||||
name = "m_sasl"
|
name = "m_sasl"
|
||||||
}
|
}
|
||||||
|
@ -21,7 +21,7 @@ module
|
|||||||
modeonid = yes
|
modeonid = yes
|
||||||
modesonid = "+R"
|
modesonid = "+R"
|
||||||
hidenetsplitquit = no
|
hidenetsplitquit = no
|
||||||
killquick = 20s
|
killquick = 20s
|
||||||
kill = 60s
|
kill = 60s
|
||||||
restrictopernicks = no
|
restrictopernicks = no
|
||||||
enforceruser = "3nf0rc3r"
|
enforceruser = "3nf0rc3r"
|
||||||
@ -464,4 +464,4 @@ command {
|
|||||||
service = "NickServ";
|
service = "NickServ";
|
||||||
name = "UPDATE";
|
name = "UPDATE";
|
||||||
command = "nickserv/update";
|
command = "nickserv/update";
|
||||||
}
|
}
|
||||||
|
@ -98,7 +98,7 @@ options
|
|||||||
badpasslimit = 5;
|
badpasslimit = 5;
|
||||||
badpasstimeout = 1h;
|
badpasstimeout = 1h;
|
||||||
updatetimeout = 5m;
|
updatetimeout = 5m;
|
||||||
hidestatso = yes;
|
hidestatso = yes;
|
||||||
expiretimeout = 30m;
|
expiretimeout = 30m;
|
||||||
readtimeout = 5s;
|
readtimeout = 5s;
|
||||||
warningtimeout = 4h;
|
warningtimeout = 4h;
|
||||||
@ -106,7 +106,7 @@ options
|
|||||||
retrywait = 60s;
|
retrywait = 60s;
|
||||||
hideprivilegedcommands = yes;
|
hideprivilegedcommands = yes;
|
||||||
hideregisteredcommands = yes;
|
hideregisteredcommands = yes;
|
||||||
languages = "de_DE.UTF-8 el_GR.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 hu_HU.UTF-8 it_IT.UTF-8 nl_NL.UTF-8 pt_PT.UTF-8";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
include
|
include
|
||||||
@ -160,11 +160,11 @@ log
|
|||||||
override = "chanserv/* nickserv/* memoserv/set ~botserv/set botserv/*";
|
override = "chanserv/* nickserv/* memoserv/set ~botserv/set botserv/*";
|
||||||
commands = "~operserv/* *";
|
commands = "~operserv/* *";
|
||||||
servers = "*"
|
servers = "*"
|
||||||
channels = "~mode *";
|
channels = "~mode *";
|
||||||
users = "oper";
|
users = "oper";
|
||||||
other = "*";
|
other = "*";
|
||||||
rawio = no;
|
rawio = yes;
|
||||||
debug = no;
|
debug = yes;
|
||||||
}
|
}
|
||||||
|
|
||||||
log
|
log
|
||||||
@ -215,7 +215,7 @@ oper
|
|||||||
|
|
||||||
mail
|
mail
|
||||||
{
|
{
|
||||||
usemail = yes;
|
usemail = yes;
|
||||||
sendmailpath = "/usr/sbin/sendmail -t";
|
sendmailpath = "/usr/sbin/sendmail -t";
|
||||||
sendfrom = "services@localhost.net";
|
sendfrom = "services@localhost.net";
|
||||||
delay = 5m;
|
delay = 5m;
|
||||||
@ -252,8 +252,8 @@ mail
|
|||||||
%N administrators."
|
%N administrators."
|
||||||
|
|
||||||
|
|
||||||
memo_subject = "New memo";
|
memo_subject = "New memo";
|
||||||
memo_message = "Hi %n,
|
memo_message = "Hi %n,
|
||||||
|
|
||||||
You've just received a new memo from %s. This is memo number %d.
|
You've just received a new memo from %s. This is memo number %d.
|
||||||
|
|
||||||
@ -262,16 +262,15 @@ mail
|
|||||||
%t";
|
%t";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
module
|
module
|
||||||
{
|
{
|
||||||
name = "db_sql_live";
|
name = "db_redis";
|
||||||
engine = "mysql/main";
|
engine = "redis/main";
|
||||||
prefix = "anope_db_";
|
|
||||||
import = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module {
|
module {
|
||||||
name = "enc_sha256";
|
name = "enc_sha256";
|
||||||
}
|
}
|
||||||
|
|
||||||
include
|
include
|
||||||
|
@ -3,38 +3,31 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
options {
|
options {
|
||||||
pidfile = "var/run/hopm.pid";
|
pidfile = "/dev/shm/hopm.pid";
|
||||||
command_queue_size = 64;
|
command_queue_size = 64;
|
||||||
command_interval = 10 seconds;
|
command_interval = 10 seconds;
|
||||||
command_timeout = 180 seconds;
|
command_timeout = 180 seconds;
|
||||||
# negcache = 1 hour;
|
|
||||||
negcache_rebuild = 12 hours;
|
negcache_rebuild = 12 hours;
|
||||||
dns_fdlimit = 102400;
|
dns_fdlimit = 102400;
|
||||||
dns_timeout = 5 seconds;
|
dns_timeout = 5 seconds;
|
||||||
# scanlog = "var/log/scan.log";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
irc {
|
irc {
|
||||||
# vhost = "0.0.0.0";
|
|
||||||
nick = "SCANNER";
|
nick = "SCANNER";
|
||||||
realname = "n3tw3rk 1ns3cur1ty c0rp pr0xy sc4nn3r";
|
realname = "n3tw3rk 1ns3cur1ty c0rp pr0xy sc4nn3r";
|
||||||
username = "sc4nn3r";
|
username = "sc4nn3r";
|
||||||
server = "irc.example.org";
|
server = "100.64.64.66";
|
||||||
password = "password";
|
|
||||||
port = 6667;
|
port = 6667;
|
||||||
tls = no;
|
tls = no;
|
||||||
# rsa_private_key_file = "etc/rsa.key";
|
|
||||||
# tls_certificate_file = "etc/cert.pem";
|
|
||||||
tls_hostname_verification = yes;
|
tls_hostname_verification = yes;
|
||||||
readtimeout = 15 minutes;
|
readtimeout = 15 minutes;
|
||||||
reconnectinterval = 30 seconds;
|
reconnectinterval = 30 seconds;
|
||||||
# nickserv = "NS IDENTIFY password";
|
nickserv = "NS IDENTIFY password";
|
||||||
oper = "hopm operpass";
|
oper = "hopm password";
|
||||||
mode = "+c";
|
mode = "+c";
|
||||||
away = "go privmsg someone else";
|
away = "go privmsg someone else";
|
||||||
channel {
|
channel {
|
||||||
name = "#hopm";
|
name = "#hopm";
|
||||||
# key = "somekey";
|
|
||||||
invite = "CS INVITE #hopm";
|
invite = "CS INVITE #hopm";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -98,10 +91,6 @@ opm {
|
|||||||
|
|
||||||
kline = "KLINE 180 *@%i :TOR exit node found";
|
kline = "KLINE 180 *@%i :TOR exit node found";
|
||||||
};
|
};
|
||||||
# dnsbl_from = "mybopm@myserver.org";
|
|
||||||
# dnsbl_to = "bopm-report@dronebl.org";
|
|
||||||
# sendmail = "/usr/sbin/sendmail";
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
scanner {
|
scanner {
|
||||||
@ -111,17 +100,12 @@ scanner {
|
|||||||
protocol = HTTP:8080;
|
protocol = HTTP:8080;
|
||||||
protocol = HTTP:3128;
|
protocol = HTTP:3128;
|
||||||
protocol = HTTP:6588;
|
protocol = HTTP:6588;
|
||||||
# protocol = HTTPS:443;
|
|
||||||
# protocol = HTTPS:8443;
|
|
||||||
protocol = SOCKS4:1080;
|
protocol = SOCKS4:1080;
|
||||||
protocol = SOCKS5:1080;
|
protocol = SOCKS5:1080;
|
||||||
protocol = ROUTER:23;
|
protocol = ROUTER:23;
|
||||||
protocol = WINGATE:23;
|
protocol = WINGATE:23;
|
||||||
protocol = DREAMBOX:23;
|
protocol = DREAMBOX:23;
|
||||||
protocol = HTTPPOST:80;
|
protocol = HTTPPOST:80;
|
||||||
# protocol = HTTPSPOST:443;
|
|
||||||
# protocol = HTTPSPOST:8443;
|
|
||||||
# vhost = "127.0.0.1";
|
|
||||||
fd = 102400;
|
fd = 102400;
|
||||||
max_read = 4 kbytes;
|
max_read = 4 kbytes;
|
||||||
timeout = 30 seconds;
|
timeout = 30 seconds;
|
||||||
@ -195,12 +179,11 @@ scanner {
|
|||||||
};
|
};
|
||||||
|
|
||||||
user {
|
user {
|
||||||
mask = "*!*@*";
|
mask = "*!*@";
|
||||||
scanner = "default";
|
scanner = "default";
|
||||||
};
|
};
|
||||||
|
|
||||||
user {
|
user {
|
||||||
# mask = "*!~*@*";
|
|
||||||
mask = "*!squid@*";
|
mask = "*!squid@*";
|
||||||
mask = "*!nobody@*";
|
mask = "*!nobody@*";
|
||||||
mask = "*!www-data@*";
|
mask = "*!www-data@*";
|
||||||
@ -215,4 +198,6 @@ user {
|
|||||||
|
|
||||||
exempt {
|
exempt {
|
||||||
mask = "*!*@127.0.0.1";
|
mask = "*!*@127.0.0.1";
|
||||||
|
mask = "*!*@*.n3tw3rk.1ns3cur1ty.c0rp";
|
||||||
|
mask = "*!*@100.64.0.0/17";
|
||||||
};
|
};
|
||||||
|
@ -44,18 +44,18 @@ connect {
|
|||||||
accept_password = "password";
|
accept_password = "password";
|
||||||
encrypted = no;
|
encrypted = no;
|
||||||
class = "hub";
|
class = "hub";
|
||||||
hub_mask = "*";
|
hub_mask = "*";
|
||||||
flags = autoconn;
|
flags = autoconn;
|
||||||
};
|
};
|
||||||
|
|
||||||
listen {
|
listen {
|
||||||
host = "100.64.65.162"; # Console
|
host = "100.64.65.162"; # Console
|
||||||
port = 6665;
|
port = 6665;
|
||||||
host = "100.64.64.3"; # Hub
|
host = "100.64.64.3"; # Hub
|
||||||
port = 7000;
|
port = 7000;
|
||||||
host = "100.64.48.10"; # Public
|
host = "100.64.48.10"; # Public
|
||||||
port = 6667;
|
port = 6667;
|
||||||
host = "2001:470:dc7b:11::2"; # Public IPv6
|
host = "2001:470:dc7b:11::2"; # Public IPv6
|
||||||
port = 6667;
|
port = 6667;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -12,6 +12,14 @@ auth {
|
|||||||
xline_exempt, resv_exempt, can_flood, no_tilde;
|
xline_exempt, resv_exempt, can_flood, no_tilde;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
auth {
|
||||||
|
spoof = "h0pm.n3tw3rk.1ns3cur1ty.c0rp";
|
||||||
|
user = "*@100.64.64.67";
|
||||||
|
class = "hopm_scanner";
|
||||||
|
flags = need_password, exceed_limit, kline_exempt,
|
||||||
|
xline_exempt, resv_exempt, can_flood, no_tilde;
|
||||||
|
};
|
||||||
|
|
||||||
auth {
|
auth {
|
||||||
spoof = "c0ns0l3.n3tw3rk.1ns3cur1ty.c0rp";
|
spoof = "c0ns0l3.n3tw3rk.1ns3cur1ty.c0rp";
|
||||||
user = "*@*";
|
user = "*@*";
|
||||||
|
@ -24,6 +24,17 @@ class {
|
|||||||
max_idle = 1000 years;
|
max_idle = 1000 years;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class {
|
||||||
|
name = "hopm_scanner";
|
||||||
|
ping_time = 2 seconds;
|
||||||
|
number_per_ip_local = 1;
|
||||||
|
max_number = 10240;
|
||||||
|
sendq = 1 megabyte;
|
||||||
|
max_channels = 60;
|
||||||
|
max_idle = 1000 years;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
class {
|
class {
|
||||||
name = "tor_edge_hub";
|
name = "tor_edge_hub";
|
||||||
ping_time = 2 seconds;
|
ping_time = 2 seconds;
|
||||||
|
@ -107,6 +107,8 @@ connect {
|
|||||||
};
|
};
|
||||||
|
|
||||||
listen {
|
listen {
|
||||||
|
host = "100.64.64.66"; # HOPM
|
||||||
|
port = 6667;
|
||||||
host = "100.64.64.42"; # Oper bouncer
|
host = "100.64.64.42"; # Oper bouncer
|
||||||
port = 6666;
|
port = 6666;
|
||||||
host = "100.64.64.50"; # Console
|
host = "100.64.64.50"; # Console
|
||||||
|
@ -13,4 +13,5 @@ exempt {
|
|||||||
ip = "100.64.64.40/29";
|
ip = "100.64.64.40/29";
|
||||||
ip = "100.64.64.48/29";
|
ip = "100.64.64.48/29";
|
||||||
ip = "100.64.64.56/29";
|
ip = "100.64.64.56/29";
|
||||||
|
ip = "100.64.64.64/29";
|
||||||
};
|
};
|
@ -16,6 +16,19 @@ operator {
|
|||||||
kline, module, rehash, restart, set, unkline, unxline, xline;
|
kline, module, rehash, restart, set, unkline, unxline, xline;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
operator {
|
||||||
|
name = "hopm";
|
||||||
|
user = "*@h0pm.n3tw3rk.1ns3cur1ty.c0rp";
|
||||||
|
password = "password";
|
||||||
|
whois = "I'm too lame to read BitchX.doc";
|
||||||
|
class = "hopm_scanner";
|
||||||
|
encrypted = no;
|
||||||
|
umodes = locops, servnotice, wallop, softcallerid, hidden,
|
||||||
|
invisible, external, debug, rej, skill, hideidle,
|
||||||
|
wallop, expiration;
|
||||||
|
flags = admin, connect, connect:remote, die, globops, kill, kill:remote,
|
||||||
|
kline, module, rehash, restart, set, unkline, unxline, xline;
|
||||||
|
};
|
||||||
|
|
||||||
operator {
|
operator {
|
||||||
name = "external_hub_operator";
|
name = "external_hub_operator";
|
||||||
|
@ -8,6 +8,9 @@ networks:
|
|||||||
driver: default
|
driver: default
|
||||||
config:
|
config:
|
||||||
- subnet: 100.64.48.24/30
|
- subnet: 100.64.48.24/30
|
||||||
|
hub:
|
||||||
|
external:
|
||||||
|
name: hb_hub_hopm
|
||||||
|
|
||||||
services:
|
services:
|
||||||
hopm:
|
hopm:
|
||||||
@ -17,7 +20,7 @@ services:
|
|||||||
context: ../hopm
|
context: ../hopm
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
image: hopm:latest
|
image: hopm:latest
|
||||||
command: "/usr/local/hopm/bin/hopm"
|
command: "/usr/local/hopm/bin/hopm -c hopm -d"
|
||||||
environment:
|
environment:
|
||||||
LANG: en_US.utf8
|
LANG: en_US.utf8
|
||||||
TZ: UTC
|
TZ: UTC
|
||||||
@ -29,6 +32,8 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
default:
|
default:
|
||||||
ipv4_address: 100.64.48.26
|
ipv4_address: 100.64.48.26
|
||||||
|
hub:
|
||||||
|
ipv4_address: 100.64.64.67
|
||||||
volumes:
|
volumes:
|
||||||
- type: volume
|
- type: volume
|
||||||
source: ephemeral
|
source: ephemeral
|
||||||
|
@ -58,6 +58,12 @@ networks:
|
|||||||
config:
|
config:
|
||||||
- subnet: 100.64.64.56/29
|
- subnet: 100.64.64.56/29
|
||||||
internal: true
|
internal: true
|
||||||
|
hopm:
|
||||||
|
ipam:
|
||||||
|
driver: default
|
||||||
|
config:
|
||||||
|
- subnet: 100.64.64.64/29
|
||||||
|
internal: true
|
||||||
|
|
||||||
services:
|
services:
|
||||||
hub:
|
hub:
|
||||||
@ -95,6 +101,8 @@ services:
|
|||||||
ipv4_address: 100.64.64.50
|
ipv4_address: 100.64.64.50
|
||||||
tor_edge_hub:
|
tor_edge_hub:
|
||||||
ipv4_address: 100.64.64.58
|
ipv4_address: 100.64.64.58
|
||||||
|
hopm:
|
||||||
|
ipv4_address: 100.64.64.66
|
||||||
volumes:
|
volumes:
|
||||||
- type: volume
|
- type: volume
|
||||||
source: ephemeral
|
source: ephemeral
|
||||||
|
@ -25,9 +25,7 @@ services:
|
|||||||
mysql:
|
mysql:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
hostname: mysql.n3tw3rk.1ns3cur1ty.c0rp
|
hostname: mysql.n3tw3rk.1ns3cur1ty.c0rp
|
||||||
image: mariadb:latest
|
image: redis
|
||||||
environment:
|
|
||||||
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
|
|
||||||
networks:
|
networks:
|
||||||
default:
|
default:
|
||||||
ipv4_address: 100.64.0.6
|
ipv4_address: 100.64.0.6
|
||||||
@ -38,7 +36,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- type: volume
|
- type: volume
|
||||||
source: ephemeral
|
source: ephemeral
|
||||||
target: /var/lib/mysql
|
target: /data
|
||||||
volume:
|
volume:
|
||||||
nocopy: false
|
nocopy: false
|
||||||
ulimits:
|
ulimits:
|
||||||
|
@ -25,8 +25,8 @@ services:
|
|||||||
services:
|
services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
hostname: s3rv1c3z.n3tw3rk.1ns3cur1ty.c0rp
|
hostname: s3rv1c3z.n3tw3rk.1ns3cur1ty.c0rp
|
||||||
# image: anope/anope:2.0.6
|
image: anope/anope:2.0.8
|
||||||
image: anope/anope:latest
|
# image: anope/anope:latest
|
||||||
environment:
|
environment:
|
||||||
LANG: en_US.utf8
|
LANG: en_US.utf8
|
||||||
TZ: UTC
|
TZ: UTC
|
||||||
|
Loading…
Reference in New Issue
Block a user