Sovran_Systems/Sovran_SystemsOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Merge pull request #417 from naturallaw777/copilot/fix-nixos-service-startup-regressions-again

Browse Source 
Fix Matrix SIGPIPE crash and RTL v0.15.8 config schema regressions
This commit is contained in:
Sovran Systems
2026-08-10 22:43:24 -05:00
committed by GitHub
parent 7716c950cd 09b34997e4
commit 14b8258420
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/bitcoin/rtl.nix
+7 -7
View File
@@ -101,33 +101,33 @@ let
index = 1; index = 1;
lnNode = "lnd"; lnNode = "lnd";
lnImplementation = "LND"; lnImplementation = "LND";
Authentication = { authentication = {
macaroonPath = "${cfg.dataDir}/macaroons"; macaroonPath = "${cfg.dataDir}/macaroons";
swapMacaroonPath = if cfg.nodes.lnd.loop then "${cfg.dataDir}/loop-macaroons" else ""; swapMacaroonPath = if cfg.nodes.lnd.loop then "${cfg.dataDir}/loop-macaroons" else "";
boltzMacaroonPath = ""; boltzMacaroonPath = "";
}; };
Settings = { settings = {
userPersona = "OPERATOR"; userPersona = "OPERATOR";
themeMode = if cfg.nightTheme then "NIGHT" else "DAY"; themeMode = if cfg.nightTheme then "NIGHT" else "DAY";
themeColor = "PURPLE"; themeColor = "PURPLE";
channelBackupPath = "${cfg.dataDir}/backup"; channelBackupPath = "${cfg.dataDir}/backup";
logLevel = "INFO"; logLevel = "INFO";
lnServerUrl = "https://${lnd.restAddress}:${toString lnd.restPort}";
swapServerUrl = if cfg.nodes.lnd.loop then "https://127.0.0.1:8081" else "";
boltzServerUrl = "";
fiatConversion = cfg.extraCurrency != null; fiatConversion = cfg.extraCurrency != null;
unannouncedChannels = true; unannouncedChannels = true;
} // optionalAttrs (cfg.extraCurrency != null) { } // optionalAttrs (cfg.extraCurrency != null) {
currencyUnit = cfg.extraCurrency; currencyUnit = cfg.extraCurrency;
}; };
} // optionalAttrs cfg.nodes.lnd.loop {
swapServerUrl = "https://localhost:8081";
boltzServerUrl = "";
}) ++ optional cfg.nodes.clightning.enable { }) ++ optional cfg.nodes.clightning.enable {
index = 2; index = 2;
lnNode = "clightning"; lnNode = "clightning";
lnImplementation = "CLN"; lnImplementation = "CLN";
Authentication = { authentication = {
runePath = runePath; runePath = runePath;
}; };
Settings = { settings = {
userPersona = "OPERATOR"; userPersona = "OPERATOR";
themeMode = if cfg.nightTheme then "NIGHT" else "DAY"; themeMode = if cfg.nightTheme then "NIGHT" else "DAY";
themeColor = "PURPLE"; themeColor = "PURPLE";
modules/synapse.nix
+1 -1
View File
@@ -237,7 +237,7 @@ CREDS
# idempotent without exposing this service credential in the Hub UI. # idempotent without exposing this service credential in the Hub UI.
HUB_ADMIN_CREDS="/var/lib/secrets/matrix-hub-admin" HUB_ADMIN_CREDS="/var/lib/secrets/matrix-hub-admin"
if [ ! -s "$HUB_ADMIN_CREDS" ]; then if [ ! -s "$HUB_ADMIN_CREDS" ]; then
HUB_ADMIN_USER="sovran-hub-$(tr -dc 'a-z0-9' < /dev/urandom | head -c 20)" HUB_ADMIN_USER="sovran-hub-$(pwgen -sA0 20 1)"
HUB_ADMIN_PASS=$(pwgen -s 32 1) HUB_ADMIN_PASS=$(pwgen -s 32 1)
if register_new_matrix_user -c /run/matrix-synapse/runtime-config.yaml \ if register_new_matrix_user -c /run/matrix-synapse/runtime-config.yaml \
-u "$HUB_ADMIN_USER" -p "$HUB_ADMIN_PASS" -a http://localhost:8008; then -u "$HUB_ADMIN_USER" -p "$HUB_ADMIN_PASS" -a http://localhost:8008; then