gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: make option examples constant

Browse Source 
escape interpolations in examples, or replace them where they are not
useful.
This commit is contained in:
pennae
2021-12-05 22:01:03 +01:00
parent e72435e612
commit b9950385e5
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/mail/rspamd.nix
View File

@@ -5,6 +5,7 @@ with lib;
let let
cfg = config.services.rspamd; cfg = config.services.rspamd;
opt = options.services.rspamd;
postfixCfg = config.services.postfix; postfixCfg = config.services.postfix;
bindSocketOpts = {options, config, ... }: { bindSocketOpts = {options, config, ... }: {
@@ -285,8 +286,8 @@ in
bindSockets = [{ bindSockets = [{
socket = "/run/rspamd/rspamd.sock"; socket = "/run/rspamd/rspamd.sock";
mode = "0660"; mode = "0660";
owner = "${cfg.user}"; owner = "''${config.${opt.user}}";
group = "${cfg.group}"; group = "''${config.${opt.group}}";
}]; }];
}; };
controller = { controller = {

9
nixos/modules/services/misc/matrix-synapse.nix
View File

@@ -1,9 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, options, pkgs, ... }:
with lib; with lib;
let let
cfg = config.services.matrix-synapse; cfg = config.services.matrix-synapse;
opt = options.services.matrix-synapse;
pg = config.services.postgresql; pg = config.services.postgresql;
usePostgresql = cfg.database_type == "psycopg2"; usePostgresql = cfg.database_type == "psycopg2";
logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig;
@@ -197,7 +198,7 @@ in {
tls_certificate_path = mkOption { tls_certificate_path = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
example = "${cfg.dataDir}/homeserver.tls.crt"; example = "/var/lib/matrix-synapse/homeserver.tls.crt";
description = '' description = ''
PEM encoded X509 certificate for TLS. PEM encoded X509 certificate for TLS.
You can replace the self-signed certificate that synapse You can replace the self-signed certificate that synapse
@@ -209,7 +210,7 @@ in {
tls_private_key_path = mkOption { tls_private_key_path = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
example = "${cfg.dataDir}/homeserver.tls.key"; example = "/var/lib/matrix-synapse/homeserver.tls.key";
description = '' description = ''
PEM encoded private key for TLS. Specify null if synapse is not PEM encoded private key for TLS. Specify null if synapse is not
speaking TLS directly. speaking TLS directly.
@@ -218,7 +219,7 @@ in {
tls_dh_params_path = mkOption { tls_dh_params_path = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
example = "${cfg.dataDir}/homeserver.tls.dh"; example = "/var/lib/matrix-synapse/homeserver.tls.dh";
description = '' description = ''
PEM dh parameters for ephemeral keys PEM dh parameters for ephemeral keys
''; '';

2
nixos/modules/services/misc/sourcehut/builds.nix
View File

@@ -63,7 +63,7 @@ in
rev = "ff96a0fa5635770390b184ae74debea75c3fd534"; rev = "ff96a0fa5635770390b184ae74debea75c3fd534";
ref = "nixos-unstable"; ref = "nixos-unstable";
}; };
image_from_nixpkgs = pkgs_unstable: (import ("${pkgs.sourcehut.buildsrht}/lib/images/nixos/image.nix") { image_from_nixpkgs = pkgs_unstable: (import ("''${pkgs.sourcehut.buildsrht}/lib/images/nixos/image.nix") {
pkgs = (import pkgs_unstable {}); pkgs = (import pkgs_unstable {});
}); });
in in

2
nixos/modules/services/networking/jibri/default.nix
View File

@@ -132,7 +132,7 @@ in
pkgs.writeScript "finalize_recording.sh" '''''' pkgs.writeScript "finalize_recording.sh" ''''''
#!/bin/sh #!/bin/sh
RECORDINGS_DIR=$1 RECORDINGS_DIR=$1
${pkgs.rclone}/bin/rclone copy $RECORDINGS_DIR RCLONE_REMOTE:jibri-recordings/ -v --log-file=/var/log/jitsi/jibri/recording-upload.txt ''${pkgs.rclone}/bin/rclone copy $RECORDINGS_DIR RCLONE_REMOTE:jibri-recordings/ -v --log-file=/var/log/jitsi/jibri/recording-upload.txt
exit 0 exit 0
''''''; '''''';
''; '';