Skip to content

Commit 7018162

Browse files
committed
Fix server.conf path for DigitalOcean builds
1 parent 9e10094 commit 7018162

File tree

2 files changed

+47
-1
lines changed

2 files changed

+47
-1
lines changed

solanum/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ COPY renew-hook.sh /opt/solanum/bin/renew-hook.sh
6969
RUN chmod +x /app/start.sh /app/start-dynamic.sh /opt/solanum/bin/renew-cert.sh /opt/solanum/bin/renew-hook.sh
7070

7171
# Copy server-specific config
72-
COPY ../server.conf /opt/solanum/conf/server.conf.template
72+
COPY server.conf /opt/solanum/conf/server.conf.template
7373

7474
# Container starts as root for Tailscale, drops to ircd user for Solanum
7575
WORKDIR /opt/solanum

solanum/server.conf

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/* ABOUTME: Hub server configuration for magnet-9rl on DigitalOcean
2+
/* ABOUTME: Uses Tailscale networking for stable server-to-server communication
3+
4+
/* Server information */
5+
/* IMPORTANT: The name field must match exactly with connect block names on other servers */
6+
serverinfo {
7+
name = "${SERVER_NAME}.${TAILSCALE_DOMAIN}";
8+
sid = "${SERVER_SID}";
9+
description = "${SERVER_DESCRIPTION}";
10+
network_name = "MagNET";
11+
ssl_cert = "/opt/solanum/etc/ssl.pem";
12+
ssl_private_key = "/opt/solanum/etc/ssl.key";
13+
ssl_dh_params = "/opt/solanum/etc/dh.pem";
14+
};
15+
16+
/* Connection classes needed before connect blocks */
17+
class "server" {
18+
ping_time = 5 minutes;
19+
connectfreq = 5 minutes;
20+
max_autoconn = 2;
21+
max_number = 10;
22+
sendq = 2 megabytes;
23+
};
24+
25+
/* Connection blocks */
26+
/* IMPORTANT: Connect block name must match the other server's serverinfo name exactly */
27+
connect "magnet-1eu.${TAILSCALE_DOMAIN}" {
28+
host = "magnet-1eu.${TAILSCALE_DOMAIN}";
29+
vhost = "${SERVER_NAME}.${TAILSCALE_DOMAIN}";
30+
send_password = "${PASSWORD_1EU}";
31+
accept_password = "${PASSWORD_9RL}";
32+
port = 6667;
33+
class = "server";
34+
flags = topicburst;
35+
};
36+
37+
/* Connect block for services */
38+
connect "magnet-atheme.${TAILSCALE_DOMAIN}" {
39+
host = "magnet-atheme.${TAILSCALE_DOMAIN}";
40+
vhost = "${SERVER_NAME}.${TAILSCALE_DOMAIN}";
41+
send_password = "${SERVICES_PASSWORD}";
42+
accept_password = "${PASSWORD_9RL}";
43+
port = 6667;
44+
class = "server";
45+
flags = topicburst;
46+
};

0 commit comments

Comments
 (0)