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

nixos: use types.lines for extraConfig

Browse Source
This commit is contained in:
Emery Hemingway 2016-10-23 19:33:41 +02:00
parent 795f968b17
commit b675619391
29 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/audio/mpd.nix
View File

@ -49,7 +49,7 @@ in {
};
extraConfig = mkOption {
type = types.str;
type = types.lines;
default = "";
description = ''
Extra directives added to to the end of MPD's configuration file,

1
nixos/modules/services/backup/bacula.nix
View File

@ -340,6 +340,7 @@ in {
extraConfig = mkOption {
default = "";
type = types.lines;
description = ''
Extra configuration for Bacula Director Daemon.
'';

2
nixos/modules/services/hardware/tlp.nix
View File

@ -40,7 +40,7 @@ in
};
extraConfig = mkOption {
type = types.str;
type = types.lines;
default = "";
description = "Additional configuration variables for TLP";
};

2
nixos/modules/services/mail/dovecot.nix
View File

@ -111,7 +111,7 @@ in
};
extraConfig = mkOption {
type = types.str;
type = types.lines;
default = "";
example = "mail_debug = yes";
description = "Additional entries to put verbatim into Dovecot's config file.";

2
nixos/modules/services/misc/bepasty.nix
View File

@ -53,7 +53,7 @@ in
};
extraConfig = mkOption {
type = types.str;
type = types.lines;
description = ''
Extra configuration for bepasty server to be appended on the
configuration.

2
nixos/modules/services/misc/octoprint.nix
View File

@ -73,7 +73,7 @@ in
};
extraConfig = mkOption {
type = types.attrs;
type = types.lines;
default = {};
description = "Extra options which are added to OctoPrint's YAML configuration file.";
};

2
nixos/modules/services/misc/redmine.nix
View File

@ -71,7 +71,7 @@ in {
};
extraConfig = mkOption {
type = types.str;
type = types.lines;
default = "";
description = "Extra configuration in configuration.yml";
};

2
nixos/modules/services/monitoring/bosun.nix
View File

@ -107,7 +107,7 @@ in {
};
extraConfig = mkOption {
type = types.string;
type = types.lines;
default = "";
description = ''
Extra configuration options for Bosun. You should describe your

2
nixos/modules/services/monitoring/graphite.nix
View File

@ -167,7 +167,7 @@ in {
CACHE_TYPE: 'filesystem'
CACHE_DIR: '/tmp/graphite-api-cache'
'';
type = types.str;
type = types.lines;
};
};

1
nixos/modules/services/monitoring/munin.nix
View File

@ -100,6 +100,7 @@ in
extraConfig = mkOption {
default = "";
type = types.lines;
description = ''
<filename>munin-node.conf</filename> extra configuration. See
<link xlink:href='http://munin-monitoring.org/wiki/munin-node.conf' />

1
nixos/modules/services/monitoring/zabbix-agent.nix
View File

@ -53,6 +53,7 @@ in
extraConfig = mkOption {
default = "";
type = types.lines;
description = ''
Configuration that is injected verbatim into the configuration file.
'';

5
nixos/modules/services/network-filesystems/xtreemfs.nix
View File

@ -153,6 +153,7 @@ in
'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
example = ''
# specify whether SSL is required
@ -173,6 +174,7 @@ in
replication = {
enable = mkEnableOption "XtreemFS DIR replication plugin";
extraConfig = mkOption {
type = types.lines;
example = ''
# participants of the replication including this replica
babudb.repl.participant.0 = 192.168.0.10
@ -269,6 +271,7 @@ in
'';
};
extraConfig = mkOption {
type = types.lines;
example = ''
osd_check_interval = 300
no_atime = true
@ -307,6 +310,7 @@ in
replication = {
enable = mkEnableOption "XtreemFS MRC replication plugin";
extraConfig = mkOption {
type = types.lines;
example = ''
# participants of the replication including this replica
babudb.repl.participant.0 = 192.168.0.10
@ -385,6 +389,7 @@ in
'';
};
extraConfig = mkOption {
type = types.lines;
example = ''
local_clock_renewal = 0
remote_time_sync = 30000

1
nixos/modules/services/networking/bind.nix
View File

@ -113,6 +113,7 @@ in
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = "
Extra lines to be added verbatim to the generated named configuration file.

1
nixos/modules/services/networking/chrony.nix
View File

@ -51,6 +51,7 @@ in
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
Extra configuration directives that should be added to

1
nixos/modules/services/networking/cntlm.nix
View File

@ -61,6 +61,7 @@ in
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = "Verbatim contents of <filename>cntlm.conf</filename>.";
};

2
nixos/modules/services/networking/ddclient.nix
View File

@ -89,7 +89,7 @@ in
extraConfig = mkOption {
default = "";
type = str;
type = lines;
description = ''
Extra configuration. Contents will be added verbatim to the configuration file.
'';

1
nixos/modules/services/networking/dhcpd.nix
View File

@ -47,6 +47,7 @@ in
};
extraConfig = mkOption {
type = types.lines;
default = "";
example = ''
option subnet-mask 255.255.255.0;

2
nixos/modules/services/networking/hostapd.nix
View File

@ -140,7 +140,7 @@ in
ieee80211n=1
ht_capab=[HT40-][SHORT-GI-40][DSSS_CCK-40]
'';
type = types.string;
type = types.lines;
description = "Extra configuration options to put in hostapd.conf.";
};
};

2
nixos/modules/services/networking/kippo.nix
View File

@ -46,7 +46,7 @@ rec {
};
extraConfig = mkOption {
default = "";
type = types.string;
type = types.lines;
description = ''Extra verbatim configuration added to the end of kippo.cfg.'';
};
};

2
nixos/modules/services/networking/murmur.nix
View File

@ -230,7 +230,7 @@ in
};
extraConfig = mkOption {
type = types.str;
type = types.lines;
default = "";
description = "Extra configuration to put into mumur.ini.";
};

1
nixos/modules/services/networking/prayer.nix
View File

@ -56,6 +56,7 @@ in
};
extraConfig = mkOption {
type = types.lines;
default = "" ;
description = ''
Extra configuration. Contents will be added verbatim to the configuration file.

1
nixos/modules/services/networking/prosody.nix
View File

@ -195,6 +195,7 @@ in
};
extraConfig = mkOption {
type = types.lines;
default = '''';
description = "Additional prosody configuration";
};

2
nixos/modules/services/networking/smokeping.nix
View File

@ -244,7 +244,7 @@ in
description = "Target configuration";
};
extraConfig = mkOption {
type = types.string;
type = types.lines;
default = "";
description = "Any additional customization not already included.";
};

2
nixos/modules/services/networking/unbound.nix
View File

@ -79,7 +79,7 @@ in
extraConfig = mkOption {
default = "";
type = types.str;
type = types.lines;
description = ''
Extra unbound config. See
<citerefentry><refentrytitle>unbound.conf</refentrytitle><manvolnum>8

2
nixos/modules/services/networking/xinetd.nix
View File

@ -124,7 +124,7 @@ in
};
extraConfig = mkOption {
type = types.string;
type = types.lines;
default = "";
description = "Extra configuration-lines added to the section of the service.";
};

1
nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
View File

@ -288,6 +288,7 @@ in
};
extraConfig = mkOption {
type = types.lines;
default = "";
example =
''

1
nixos/modules/services/web-servers/apache-httpd/moodle.nix
View File

@ -164,6 +164,7 @@ in
extraConfig = mkOption {
type = types.lines;
default = "";
example =
''

1
nixos/modules/services/web-servers/apache-httpd/wordpress.nix
View File

@ -212,6 +212,7 @@ in
example = "[ \"en_GB\" \"de_DE\" ];";
};
extraConfig = mkOption {
type = types.lines;
default = "";
example =
''

2
nixos/modules/services/x11/display-managers/sddm.nix
View File

@ -86,7 +86,7 @@ in
};
extraConfig = mkOption {
type = types.str;
type = types.lines;
default = "";
example = ''
[Autologin]