diff options
| author | Peter Simons <simons@cryp.to> | 2011-09-14 18:20:50 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-09-14 18:20:50 +0000 |
| commit | eb6e1310b8774f3aed4c5675d09708f0df6199d3 (patch) | |
| tree | 3297542b3cda78d38731abb65837f4553cd377a9 /modules/services | |
| parent | f5e8d35f8e76755febf97ca8f62b0700a8b6d20a (diff) | |
| download | nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.gz nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.bz2 nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.lz nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.xz nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.zst nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.zip | |
strip trailing whitespace; no functional change
svn path=/nixos/trunk/; revision=29285
Diffstat (limited to 'modules/services')
111 files changed, 778 insertions, 778 deletions
diff --git a/modules/services/amqp/rabbitmq.nix b/modules/services/amqp/rabbitmq.nix index 3322ab329e7..88d6dc588d6 100644 --- a/modules/services/amqp/rabbitmq.nix +++ b/modules/services/amqp/rabbitmq.nix @@ -14,9 +14,9 @@ in ###### interface - + options = { - + services.rabbitmq = { enable = mkOption { @@ -74,7 +74,7 @@ in environment.HOME = "/var/lib/rabbitmq"; environment.RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress; - exec = + exec = '' ${run "${pkgs.rabbitmq_server}/sbin/rabbitmq-server"} ''; diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix index 9181a86b377..ea0e1ef29c0 100644 --- a/modules/services/audio/alsa.nix +++ b/modules/services/audio/alsa.nix @@ -14,9 +14,9 @@ in { ###### interface - + options = { - + sound = { enable = mkOption { @@ -26,7 +26,7 @@ in ''; merge = mergeEnableOption; }; - + enableOSSEmulation = mkOption { default = true; description = '' @@ -35,14 +35,14 @@ in }; }; - + }; ###### implementation - + config = mkIf config.sound.enable { - + environment.systemPackages = [alsaUtils]; users.extraGroups = singleton @@ -78,7 +78,7 @@ in ${alsaUtils}/sbin/alsactl -f ${soundState} store ''; }; - + }; } diff --git a/modules/services/audio/pulseaudio.nix b/modules/services/audio/pulseaudio.nix index f48cdd49c83..04df2a8e867 100644 --- a/modules/services/audio/pulseaudio.nix +++ b/modules/services/audio/pulseaudio.nix @@ -14,9 +14,9 @@ in ###### interface options = { - + services.pulseaudio = { - + enable = mkOption { default = false; description = '' @@ -38,9 +38,9 @@ in }; }; - + }; - + ###### implementation @@ -83,5 +83,5 @@ in }; }; - + } diff --git a/modules/services/backup/mysql-backup.nix b/modules/services/backup/mysql-backup.nix index 7c091fcfe26..e1591050f7e 100644 --- a/modules/services/backup/mysql-backup.nix +++ b/modules/services/backup/mysql-backup.nix @@ -10,13 +10,13 @@ let location = cfg.location ; mysqlBackupCron = db : '' ${cfg.period} ${cfg.user} ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz - ''; + ''; in { options = { - + services.mysqlBackup = { enable = mkOption { @@ -48,7 +48,7 @@ in List of database names to dump. ''; }; - + location = mkOption { default = "/var/backup/mysql"; description = '' @@ -67,7 +67,7 @@ in }; config = mkIf config.services.mysqlBackup.enable { - + services.cron.systemCronJobs = map mysqlBackupCron config.services.mysqlBackup.databases; system.activationScripts.mysqlBackup = stringAfter [ "stdio" "defaultPath" "systemConfig" "users" ] @@ -75,7 +75,7 @@ in mkdir -m 0700 -p ${config.services.mysqlBackup.location} chown ${config.services.mysqlBackup.user} ${config.services.mysqlBackup.location} ''; - + }; - + } diff --git a/modules/services/backup/postgresql-backup.nix b/modules/services/backup/postgresql-backup.nix index edbbbdac635..f444717d514 100644 --- a/modules/services/backup/postgresql-backup.nix +++ b/modules/services/backup/postgresql-backup.nix @@ -10,14 +10,14 @@ let postgresqlBackupCron = db: '' ${config.services.postgresqlBackup.period} root ${postgresql}/bin/pg_dump ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz - ''; + ''; in { options = { - + services.postgresqlBackup = { enable = mkOption { @@ -39,10 +39,10 @@ in databases = mkOption { default = []; description = '' - List of database names to dump. + List of database names to dump. ''; }; - + location = mkOption { default = "/var/backup/postgresql"; description = '' @@ -62,5 +62,5 @@ in chown root ${config.services.postgresqlBackup.location} ''; }; - + } diff --git a/modules/services/backup/sitecopy-backup.nix b/modules/services/backup/sitecopy-backup.nix index c540e8fcfa0..35ce55ef06c 100644 --- a/modules/services/backup/sitecopy-backup.nix +++ b/modules/services/backup/sitecopy-backup.nix @@ -9,13 +9,13 @@ let sitecopyCron = backup : '' ${if backup ? period then backup.period else config.services.sitecopy.period} root ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${backup.name}.conf --update ${backup.name} - ''; + ''; in { options = { - + services.sitecopy = { enable = mkOption { @@ -36,8 +36,8 @@ in backups = mkOption { example = [ - { name = "test"; - local = "/tmp/backup"; + { name = "test"; + local = "/tmp/backup"; remote = "/staff-groups/ewi/st/strategoxt/backup/test"; server = "webdata.tudelft.nl"; protocol = "webdav"; @@ -47,15 +47,15 @@ in ]; default = []; description = '' - List of attributesets describing the backups. + List of attributesets describing the backups. - Username/password are extracted from <filename>${stateDir}/sitecopy.secrets</filename> at activation + Username/password are extracted from <filename>${stateDir}/sitecopy.secrets</filename> at activation time. The secrets file lines should have the following structure: <screen> server username password </screen> ''; - }; + }; }; @@ -67,7 +67,7 @@ in services.cron.systemCronJobs = map sitecopyCron config.services.sitecopy.backups; system.activationScripts.sitecopyBackup = stringAfter [ "stdio" "users" ] - '' + '' mkdir -m 0700 -p ${stateDir} chown root ${stateDir} touch ${stateDir}/sitecopy.secrets @@ -96,9 +96,9 @@ in else echo " * Sitecopy '${b.name}' already initialized" fi - '' ) config.services.sitecopy.backups + '' ) config.services.sitecopy.backups )} ''; }; - + } diff --git a/modules/services/databases/4store-endpoint.nix b/modules/services/databases/4store-endpoint.nix index ac38a9b7d54..7b03b4d8f1d 100644 --- a/modules/services/databases/4store-endpoint.nix +++ b/modules/services/databases/4store-endpoint.nix @@ -10,9 +10,9 @@ with pkgs.lib; ###### interface options = { - + services.fourStoreEndpoint = { - + enable = mkOption { default = false; description = "Whether to enable 4Store SPARQL endpoint."; @@ -68,5 +68,5 @@ with pkgs.lib; }; }); - + } diff --git a/modules/services/databases/4store.nix b/modules/services/databases/4store.nix index 1bc615681b6..14990e92ea3 100644 --- a/modules/services/databases/4store.nix +++ b/modules/services/databases/4store.nix @@ -11,9 +11,9 @@ with pkgs.lib; ###### interface options = { - + services.fourStore = { - + enable = mkOption { default = false; description = "Whether to enable 4Store RDF database server."; @@ -67,5 +67,5 @@ with pkgs.lib; }; }); - + } diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix index 60410b133b2..65bf77611e0 100644 --- a/modules/services/databases/mysql.nix +++ b/modules/services/databases/mysql.nix @@ -35,9 +35,9 @@ in ###### interface options = { - + services.mysql = { - + enable = mkOption { default = false; description = " @@ -54,7 +54,7 @@ in port = mkOption { default = "3306"; - description = "Port of MySQL"; + description = "Port of MySQL"; }; user = mkOption { @@ -75,8 +75,8 @@ in pidDir = mkOption { default = "/var/run/mysql"; description = "Location of the file which stores the PID of the MySQL server"; - }; - + }; + initialDatabases = mkOption { default = []; description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL"; @@ -85,47 +85,47 @@ in { name = "bardatabase"; schema = ./bardatabase.sql; } ]; }; - + initialScript = mkOption { default = null; description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database"; }; - + rootPassword = mkOption { default = null; - description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty."; + description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty."; }; - + replication = { role = mkOption { default = "none"; description = "Role of the MySQL server instance. Can be either: master, slave or none"; }; - + serverId = mkOption { default = 1; description = "Id of the MySQL server instance. This number must be unique for each instance"; }; - + masterHost = mkOption { description = "Hostname of the MySQL master server"; }; - + masterUser = mkOption { description = "Username of the MySQL replication user"; }; - + masterPassword = mkOption { description = "Password of the MySQL replication user"; }; - + masterPort = mkOption { default = 3306; description = "Port number on which the MySQL master server runs"; }; }; }; - + }; @@ -159,7 +159,7 @@ in ''; exec = "${mysql}/libexec/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; - + postStart = '' # Wait until the MySQL server is available for use @@ -181,7 +181,7 @@ in then # Create initial databases - ${concatMapStrings (database: + ${concatMapStrings (database: '' if ! test -e "${cfg.dataDir}/${database.name}"; then echo "Creating initial database: ${database.name}" @@ -196,17 +196,17 @@ in fi ) | ${mysql}/bin/mysql -u root -N fi - '') cfg.initialDatabases} - + '') cfg.initialDatabases} + # Execute initial script - + ${optionalString (cfg.initialScript != null) '' cat ${cfg.initialScript} | ${mysql}/bin/mysql -u root -N ''} - + # Change root password - + ${optionalString (cfg.rootPassword != null) '' ( echo "use mysql;" @@ -214,11 +214,11 @@ in echo "flush privileges;" ) | ${mysql}/bin/mysql -u root -N ''} - + rm /tmp/mysql_init fi ''; - + # !!! Need a postStart script to wait until mysqld is ready to # accept connections. diff --git a/modules/services/databases/openldap.nix b/modules/services/databases/openldap.nix index 4186fdc72ac..33a4a25e213 100644 --- a/modules/services/databases/openldap.nix +++ b/modules/services/databases/openldap.nix @@ -16,9 +16,9 @@ in ###### interface options = { - + services.openldap = { - + enable = mkOption { default = false; description = " @@ -33,7 +33,7 @@ in "; }; }; - + }; diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix index 8a18020309b..2f2188043aa 100644 --- a/modules/services/databases/postgresql.nix +++ b/modules/services/databases/postgresql.nix @@ -33,46 +33,46 @@ let ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}' log_destination = 'syslog' ${cfg.extraConfig} - ''; + ''; in { ###### interface - + options = { - + services.postgresql = { - + enable = mkOption { default = false; description = '' Whether to run PostgreSQL. ''; }; - + port = mkOption { default = "5432"; description = '' Port for PostgreSQL. ''; }; - + logDir = mkOption { default = "/var/log/postgresql"; description = '' Log directory for PostgreSQL. ''; }; - + dataDir = mkOption { default = "/var/db/postgresql"; description = '' Data directory for PostgreSQL. ''; }; - + authentication = mkOption { default = '' # Generated file; do not edit! @@ -85,22 +85,22 @@ in Defines how users authenticate themselves to the server. ''; }; - + identMap = mkOption { default = ""; description = '' Defines the mapping from system users to database users. ''; }; - + authMethod = mkOption { default = " ident sameuser "; description = '' - How to authorize users. + How to authorize users. Note: ident needs absolute trust to all allowed client hosts. ''; }; - + enableTCPIP = mkOption { default = false; description = '' @@ -122,7 +122,7 @@ in # So a nicer solution was patching postgresql to allow setting the # libdir explicitely. }; - + extraConfig = mkOption { default = ""; description = "Additional text to be appended to <filename>postgresql.conf</filename>."; @@ -133,7 +133,7 @@ in ###### implementation - + config = mkIf config.services.postgresql.enable { users.extraUsers = singleton @@ -196,5 +196,5 @@ in }; }; - + } diff --git a/modules/services/databases/virtuoso.nix b/modules/services/databases/virtuoso.nix index b41bc0f7ad1..6a29fc13211 100644 --- a/modules/services/databases/virtuoso.nix +++ b/modules/services/databases/virtuoso.nix @@ -10,9 +10,9 @@ with pkgs.lib; ###### interface options = { - + services.virtuoso = { - + enable = mkOption { default = false; description = "Whether to enable Virtuoso Opensource database server."; @@ -94,5 +94,5 @@ with pkgs.lib; ''; }; - + } diff --git a/modules/services/games/ghost-one.nix b/modules/services/games/ghost-one.nix index 2d1195a043d..815118be1c6 100644 --- a/modules/services/games/ghost-one.nix +++ b/modules/services/games/ghost-one.nix @@ -10,7 +10,7 @@ in { ###### interface - + options = { services.ghostOne = { @@ -24,7 +24,7 @@ in check = lang: elem lang [ "English" "Spanish" "Russian" "Serbian" "Turkish" ]; description = "The language of bot messages: English, Spanish, Russian, Serbian or Turkish."; }; - + war3path = mkOption { default = ""; description = '' @@ -102,4 +102,4 @@ in }; -} \ No newline at end of file +} diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix index 4be882c1f1e..84680bd3532 100644 --- a/modules/services/hardware/acpid.nix +++ b/modules/services/hardware/acpid.nix @@ -19,22 +19,22 @@ let in pkgs.lib.concatMapStrings f events } ''; - + events = [powerEvent lidEvent acEvent]; - + # Called when the power button is pressed. powerEvent = { name = "power-button"; event = "button/power.*"; - action = + action = '' #! ${pkgs.bash}/bin/sh ${config.services.acpid.powerEventCommands} ''; }; - + # Called when the laptop lid is opened/closed. - lidEvent = + lidEvent = { name = "lid"; event = "button/lid.*"; action = @@ -43,12 +43,12 @@ let ${config.services.acpid.lidEventCommands} ''; }; - + # Called when the AC power is connected or disconnected. acEvent = { name = "ac-power"; event = "ac_adapter.*"; - action = + action = '' #! ${pkgs.bash}/bin/sh ${config.services.acpid.acEventCommands} @@ -62,7 +62,7 @@ in ###### interface options = { - + services.acpid = { enable = mkOption { @@ -86,9 +86,9 @@ in }; }; - + }; - + ###### implementation @@ -101,7 +101,7 @@ in exec = "${pkgs.acpid}/sbin/acpid --foreground --confdir ${acpiConfDir}"; }; - + }; - + } diff --git a/modules/services/hardware/bluetooth.nix b/modules/services/hardware/bluetooth.nix index f32e033081c..06ed9ef70a4 100644 --- a/modules/services/hardware/bluetooth.nix +++ b/modules/services/hardware/bluetooth.nix @@ -12,12 +12,12 @@ with pkgs.lib; default = false; description = "Whether to enable support for Bluetooth."; }; - + }; ###### implementation - + config = mkIf config.hardware.bluetooth.enable { environment.systemPackages = [ pkgs.bluez pkgs.openobex pkgs.obexftp ]; @@ -25,7 +25,7 @@ with pkgs.lib; services.udev.packages = [ pkgs.bluez ]; services.dbus.packages = [ pkgs.bluez ]; - - }; - + + }; + } diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix index cadd1afbe22..f9fb2dfecef 100644 --- a/modules/services/hardware/hal.nix +++ b/modules/services/hardware/hal.nix @@ -20,11 +20,11 @@ in { ###### interface - + options = { - + services.hal = { - + enable = mkOption { default = false; description = '' @@ -40,12 +40,12 @@ in }; }; - + }; ###### implementation - + config = mkIf cfg.enable { environment.systemPackages = [ hal ]; @@ -67,7 +67,7 @@ in jobs.hal = { description = "HAL daemon"; - + startOn = "started dbus" + optionalString config.services.acpid.enable " and started acpid"; environment = @@ -95,7 +95,7 @@ in '' mkdir -m 0755 -p /var/cache/hald mkdir -m 0755 -p /var/run/hald - + rm -f /var/cache/hald/fdi-cache ''; @@ -111,7 +111,7 @@ in services.dbus.enable = true; services.dbus.packages = [hal]; - + }; } diff --git a/modules/services/hardware/pcscd.nix b/modules/services/hardware/pcscd.nix index 6f4e848ee69..9f389efc06d 100644 --- a/modules/services/hardware/pcscd.nix +++ b/modules/services/hardware/pcscd.nix @@ -7,18 +7,18 @@ with pkgs.lib; ###### interface options = { - + services.pcscd = { enable = mkOption { default = false; description = "Whether to enable the PCSC-Lite daemon."; }; - + }; - + }; - + ###### implementation @@ -40,7 +40,7 @@ with pkgs.lib; exec = "${pkgs.pcsclite}/sbin/pcscd"; }; - + }; - + } diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix index 8715c0cb84e..2af4a50e230 100644 --- a/modules/services/hardware/udev.nix +++ b/modules/services/hardware/udev.nix @@ -15,9 +15,9 @@ let }; modprobe = config.system.sbin.modprobe; - + nixosRules = '' - + # Miscellaneous devices. KERNEL=="sonypi", MODE="0666" KERNEL=="kvm", MODE="0666" @@ -26,7 +26,7 @@ let KERNEL=="vboxadd", NAME="vboxadd", OWNER="root", GROUP="root", MODE="0660" KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", GROUP="root", MODE="0666" ''; - + # Perform substitutions in all udev rules files. udevRules = stdenv.mkDerivation { name = "udev-rules"; @@ -40,7 +40,7 @@ let # Set the firmware search path so that the firmware.sh helper # called by 50-firmware.rules works properly. echo 'ENV{FIRMWARE_DIRS}="/root/test-firmware ${toString config.hardware.firmware}"' >> $out/00-path.rules - + # Add the udev rules from other packages. for i in ${toString cfg.packages}; do echo "Adding rules for package $i" @@ -99,7 +99,7 @@ let done # Use the persistent device rules (naming for CD/DVD and - # network devices) stored in + # network devices) stored in # /var/lib/udev/rules.d/70-persistent-{cd,net}.rules. These are # modified by the write_{cd,net}_rules helpers called from # 75-cd-aliases-generator.rules and @@ -129,7 +129,7 @@ in { ###### interface - + options = { boot.hardwareScan = mkOption { @@ -143,7 +143,7 @@ in parameter to the kernel command line. ''; }; - + services.udev = { packages = mkOption { @@ -181,11 +181,11 @@ in }; }; - + hardware.firmware = mkOption { default = []; example = [ "/root/my-firmware" ]; - merge = mergeListOption; + merge = mergeListOption; description = '' List of directories containing firmware files. Such files will be loaded automatically if the kernel asks for them @@ -198,16 +198,16 @@ in pathsToLink = [ "/" ]; }; }; - + }; - + ###### implementation config = { services.udev.extraRules = nixosRules; - + services.udev.packages = [ pkgs.udev extraUdevRules ]; services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux pkgs.udev ]; diff --git a/modules/services/hardware/udisks.nix b/modules/services/hardware/udisks.nix index 21749da424e..1ba17c589d2 100644 --- a/modules/services/hardware/udisks.nix +++ b/modules/services/hardware/udisks.nix @@ -7,11 +7,11 @@ with pkgs.lib; { ###### interface - + options = { - + services.udisks = { - + enable = mkOption { default = false; description = '' @@ -21,12 +21,12 @@ with pkgs.lib; }; }; - + }; ###### implementation - + config = mkIf config.services.udisks.enable { environment.systemPackages = [ pkgs.udisks ]; diff --git a/modules/services/hardware/upower.nix b/modules/services/hardware/upower.nix index 70f4860304e..1fdaee202d3 100644 --- a/modules/services/hardware/upower.nix +++ b/modules/services/hardware/upower.nix @@ -7,11 +7,11 @@ with pkgs.lib; { ###### interface - + options = { - + services.upower = { - + enable = mkOption { default = false; description = '' @@ -21,12 +21,12 @@ with pkgs.lib; }; }; - + }; ###### implementation - + config = mkIf config.services.upower.enable { environment.systemPackages = [ pkgs.upower ]; diff --git a/modules/services/logging/klogd.nix b/modules/services/logging/klogd.nix index 2b8a6a64d99..2f4bd411e58 100644 --- a/modules/services/logging/klogd.nix +++ b/modules/services/logging/klogd.nix @@ -13,5 +13,5 @@ "${pkgs.sysklogd}/sbin/klogd -c 1 -2 -n " + "-k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map"; }; - + } diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix index a41bd9eaad7..82584ea5de3 100644 --- a/modules/services/mail/dovecot.nix +++ b/modules/services/mail/dovecot.nix @@ -8,9 +8,9 @@ let cfg = config.services.dovecot; - dovecotConf = + dovecotConf = '' - base_dir = /var/run/dovecot/ + base_dir = /var/run/dovecot/ protocols = imap imaps pop3 pop3s '' @@ -33,12 +33,12 @@ let maildir_copy_with_hardlinks = yes auth default { - mechanisms = plain login + mechanisms = plain login userdb passwd { } passdb pam { } - user = root + user = root } auth_debug = yes auth_verbose = yes @@ -47,7 +47,7 @@ let log_path = /var/log/dovecot.log ''; - + confFile = pkgs.writeText "dovecot.conf" dovecotConf; in @@ -57,9 +57,9 @@ in ###### interface options = { - + services.dovecot = { - + enable = mkOption { default = false; description = "Whether to enable the Dovecot POP3/IMAP server."; @@ -69,7 +69,7 @@ in default = "dovecot"; description = "Dovecot user name."; }; - + group = mkOption { default = "dovecot"; description = "Dovecot group name."; @@ -79,22 +79,22 @@ in default = ""; description = "Server certificate"; }; - + sslCACert = mkOption { default = ""; description = "CA certificate used by the server certificate."; }; - + sslServerKey = mkOption { default = ""; description = "Server key."; }; }; - + }; - + ###### implementation config = mkIf config.services.dovecot.enable { @@ -120,13 +120,13 @@ in preStart = '' - ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login + ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login ${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot ''; exec = "${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}"; }; - + }; - + } diff --git a/modules/services/mail/freepops.nix b/modules/services/mail/freepops.nix index 9f8b93d3e33..8f6e9382607 100644 --- a/modules/services/mail/freepops.nix +++ b/modules/services/mail/freepops.nix @@ -84,4 +84,4 @@ in ''; }; }; -} \ No newline at end of file +} diff --git a/modules/services/mail/mail.nix b/modules/services/mail/mail.nix index bdf6b28ffbc..bad0b22625d 100644 --- a/modules/services/mail/mail.nix +++ b/modules/services/mail/mail.nix @@ -7,9 +7,9 @@ with pkgs.lib; ###### interface options = { - + services.mail = { - + sendmailSetuidWrapper = mkOption { default = null; description = '' diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix index 71f3a89f19c..13a02386886 100644 --- a/modules/services/mail/postfix.nix +++ b/modules/services/mail/postfix.nix @@ -11,7 +11,7 @@ let group = cfg.group; setgidGroup = cfg.setgidGroup; - mainCf = + mainCf = '' queue_directory = /var/postfix/queue command_directory = ${pkgs.postfix}/sbin @@ -30,7 +30,7 @@ let '' else if cfg.networksStyle != "" then '' - mynetworks_style = ${cfg.networksStyle} + mynetworks_style = ${cfg.networksStyle} '' else # Postfix default is subnet, but let's play safe @@ -54,12 +54,12 @@ let '' + '' local_recipient_maps = - - relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then - cfg.relayHost - else + + relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then + cfg.relayHost + else "[" + cfg.relayHost + "]"} - + alias_maps = hash:/var/postfix/conf/aliases mail_spool_directory = /var/spool/mail/ @@ -78,13 +78,13 @@ let smtpd_tls_cert_file = ${cfg.sslCert} smtpd_tls_key_file = ${cfg.sslKey} - smtpd_use_tls = yes + smtpd_use_tls = yes recipientDelimiter = ${cfg.recipientDelimiter} '' + cfg.extraConfig; - aliases = + aliases = optionalString (cfg.postmasterAlias != "") '' postmaster: ${cfg.postmasterAlias} '' @@ -96,7 +96,7 @@ let aliasesFile = pkgs.writeText "postfix-aliases" aliases; mainCfFile = pkgs.writeText "postfix-main.cf" mainCf; - + in { @@ -104,9 +104,9 @@ in ###### interface options = { - + services.postfix = { - + enable = mkOption { default = false; description = "Whether to run the Postfix mail server."; @@ -116,44 +116,44 @@ in default = true; description = "Whether to set the system sendmail to postfix's."; }; - + user = mkOption { default = "postfix"; description = "What to call the Postfix user (must be used only for postfix)."; }; - + group = mkOption { default = "postfix"; description = "What to call the Postfix group (must be used only for postfix)."; }; - + setgidGroup = mkOption { default = "postdrop"; description = " - How to call postfix setgid group (for postdrop). Should + How to call postfix setgid group (for postdrop). Should be uniquely used group. "; }; - + networks = mkOption { default = null; example = ["192.168.0.1/24"]; description = " - Net masks for trusted - allowed to relay mail to third parties - - hosts. Leave empty to use mynetworks_style configuration or use + Net masks for trusted - allowed to relay mail to third parties - + hosts. Leave empty to use mynetworks_style configuration or use default (localhost-only). "; }; - + networksStyle = mkOption { default = ""; description = " Name of standard way of trusted network specification to use, - leave blank if you specify it explicitly or if you want to use + leave blank if you specify it explicitly or if you want to use default (localhost-only). "; }; - + hostname = mkOption { default = ""; description =" @@ -161,65 +161,65 @@ in It should be FQDN. "; }; - + domain = mkOption { default = ""; description =" Domain to use. Leave blank to use hostname minus first component. "; }; - + origin = mkOption { default = ""; description =" Origin to use in outgoing e-mail. Leave blank to use hostname. "; }; - + destination = mkOption { default = null; example = ["localhost"]; description = " - Full (!) list of domains we deliver locally. Leave blank for + Full (!) list of domains we deliver locally. Leave blank for acceptable Postfix default. "; }; - + relayDomains = mkOption { default = null; example = ["localdomain"]; description = " - List of domains we agree to relay to. Default is the same as + List of domains we agree to relay to. Default is the same as destination. "; }; - + relayHost = mkOption { default = ""; description = " Mail relay for outbound mail. "; }; - + lookupMX = mkOption { default = false; description = " Whether relay specified is just domain whose MX must be used. "; }; - + postmasterAlias = mkOption { default = "root"; description = "Who should receive postmaster e-mail."; }; - + rootAlias = mkOption { default = ""; description = " Who should receive root e-mail. Blank for no redirection. "; }; - + extraAliases = mkOption { default = ""; description = " @@ -238,12 +238,12 @@ in default = ""; description = "SSL certificate to use."; }; - + sslCACert = mkOption { default = ""; description = "SSL certificate of CA."; }; - + sslKey = mkOption { default = ""; description = "SSL key to use."; @@ -293,19 +293,19 @@ in }; users.extraGroups = - [ { name = group; + [ { name = group; gid = config.ids.gids.postfix; } - { name = setgidGroup; + { name = setgidGroup; gid = config.ids.gids.postdrop; } ]; jobs.postfix = - # I copy _lots_ of shipped configuration filed + # I copy _lots_ of shipped configuration filed # that can be left as is. I am afraid the exact - # will list slightly change in next Postfix - # release, so listing them all one-by-one in an + # will list slightly change in next Postfix + # release, so listing them all one-by-one in an # accurate way is unlikely to be better. { description = "Postfix mail server"; @@ -330,20 +330,20 @@ in if ! [ -d /var/spool/postfix ]; then ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue fi - - ${pkgs.coreutils}/bin/chown -R ${user}.${group} /var/postfix - ${pkgs.coreutils}/bin/chown -R ${user}.${setgidGroup} /var/postfix/queue - ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue + + ${pkgs.coreutils}/bin/chown -R ${user}.${group} /var/postfix + ${pkgs.coreutils}/bin/chown -R ${user}.${setgidGroup} /var/postfix/queue + ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue ${pkgs.coreutils}/bin/chown root.root /var/spool/mail ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail - + ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf ln -sf ${aliasesFile} /var/postfix/conf/aliases ln -sf ${mainCfFile} /var/postfix/conf/main.cf ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases - + exec ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start ''; # */ diff --git a/modules/services/misc/autofs.nix b/modules/services/misc/autofs.nix index ea7a1437928..37ba3bf309c 100644 --- a/modules/services/misc/autofs.nix +++ b/modules/services/misc/autofs.nix @@ -17,9 +17,9 @@ in ###### interface options = { - + services.autofs = { - + enable = mkOption { default = false; description = " @@ -97,7 +97,7 @@ in pkgs.lib.concatMapStrings (module : "modprobe ${module} || true\n") (["autofs4"] ++ cfg.kernelModules); - preStop = + preStop = '' set -e; while :; do pkill -TERM automount; sleep 1; done ''; @@ -125,7 +125,7 @@ in exec ${pkgs.autofs5}/sbin/automount ${if cfg.debug then "-d" else ""} -f -t ${builtins.toString cfg.timeout} "${autoMaster}" ${if cfg.debug then "-l7" else ""} ''; }; - + }; - + } diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix index d0ef5d34a64..1cb538f6a61 100644 --- a/modules/services/misc/disnix.nix +++ b/modules/services/misc/disnix.nix @@ -6,7 +6,7 @@ with pkgs.lib; let cfg = config.services.disnix; - + disnix_activation_scripts = pkgs.disnix_activation_scripts.override (origArgs: { enableApacheWebApplication = config.services.httpd.enable; enableAxis2WebService = config.services.tomcat.axis2.enable; @@ -21,47 +21,47 @@ in { ###### interface - + options = { - + services.disnix = { - + enable = mkOption { default = false; description = "Whether to enable Disnix"; }; - + useWebServiceInterface = mkOption { default = false; description = "Whether to enable the DisnixWebService interface running on Apache Tomcat"; }; - + publishInfrastructure = { enable = mkOption { default = false; description = "Whether to publish capabilities/properties of this machine in as attributes in the infrastructure option"; }; - + enableAuthentication = mkOption { default = false; description = "Whether to publish authentication credentials through the infrastructure attribute (not recommended in combination with Avahi)"; }; - }; - + }; + infrastructure = mkOption { default = {}; description = "List of name value pairs containing properties for the infrastructure model"; }; - + publishAvahi = mkOption { default = false; description = "Whether to publish capabilities/properties as a Disnix service through Avahi"; }; }; - + }; - + ###### implementation @@ -84,7 +84,7 @@ in { name = "disnix"; gid = config.ids.gids.disnix; }; - + services.disnix.infrastructure = optionalAttrs (cfg.publishInfrastructure.enable) ( { hostname = config.networking.hostName; @@ -97,12 +97,12 @@ in // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; } // optionalAttrs (config.services.svnserve.enable) { svnBaseDir = config.services.svnserve.svnBaseDir; } // optionalAttrs (cfg.publishInfrastructure.enableAuthentication) ( - optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = builtins.readFile config.services.mysql.rootPassword; }) + optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = builtins.readFile config.services.mysql.rootPassword; }) ) ; - + services.disnix.publishInfrastructure.enable = cfg.publishAvahi; - + jobs = { disnix = { description = "Disnix server"; @@ -124,9 +124,9 @@ in } // optionalAttrs cfg.publishAvahi { disnixAvahi = { description = "Disnix Avahi publisher"; - + startOn = "started avahi-daemon"; - + exec = '' ${pkgs.avahi}/bin/avahi-publish-service disnix-${config.networking.hostName} _disnix._tcp 22 \ diff --git a/modules/services/misc/felix.nix b/modules/services/misc/felix.nix index f05abc38f08..2da50fc8595 100644 --- a/modules/services/misc/felix.nix +++ b/modules/services/misc/felix.nix @@ -12,16 +12,16 @@ in { ###### interface - + options = { - + services.felix = { - + enable = mkOption { default = false; description = "Whether to enable the Apache Felix OSGi service"; }; - + bundles = mkOption { default = [ pkgs.felix_remoteshell ]; description = "List of bundles that should be activated on startup"; @@ -30,17 +30,17 @@ in user = mkOption { default = "osgi"; description = "User account under which Apache Felix runs."; - }; + }; group = mkOption { default = "osgi"; description = "Group account under which Apache Felix runs."; - }; - + }; + }; - + }; - + ###### implementation @@ -49,7 +49,7 @@ in { name = "osgi"; gid = config.ids.gids.osgi; }; - + users.extraUsers = singleton { name = "osgi"; uid = config.ids.uids.osgi; @@ -60,16 +60,16 @@ in jobs.felix = { description = "Felix server"; - preStart = + preStart = '' # Initialise felix instance on first startup if [ ! -d /var/felix ] then # Symlink system files - + mkdir -p /var/felix chown ${cfg.user}:${cfg.group} /var/felix - + for i in ${pkgs.felix}/* do if [ "$i" != "${pkgs.felix}/bundle" ] @@ -77,11 +77,11 @@ in ln -sfn $i /var/felix/$(basename $i) fi done - + # Symlink bundles mkdir -p /var/felix/bundle chown ${cfg.user}:${cfg.group} /var/felix/bundle - + for i in ${pkgs.felix}/bundle/* ${toString cfg.bundles} do if [ -f $i ] @@ -97,7 +97,7 @@ in done fi ''; - + script = '' cd /var/felix diff --git a/modules/services/misc/folding-at-home.nix b/modules/services/misc/folding-at-home.nix index 06223bc56e0..9f4c4645279 100644 --- a/modules/services/misc/folding-at-home.nix +++ b/modules/services/misc/folding-at-home.nix @@ -7,9 +7,9 @@ let in { ###### interface - + options = { - + services.foldingAtHome = { enable = mkOption { @@ -29,7 +29,7 @@ in { config = mkOption { default = ""; description = '' - Extra configuration. Contents will be added verbatim to the + Extra configuration. Contents will be added verbatim to the configuration file. ''; }; @@ -71,4 +71,4 @@ in { }; -} \ No newline at end of file +} diff --git a/modules/services/misc/gpsd.nix b/modules/services/misc/gpsd.nix index 0d12bbc29f3..bc1d1f4575a 100644 --- a/modules/services/misc/gpsd.nix +++ b/modules/services/misc/gpsd.nix @@ -7,7 +7,7 @@ let uid = config.ids.uids.gpsd; gid = config.ids.gids.gpsd; cfg = config.services.gpsd; - + in { @@ -15,7 +15,7 @@ in ###### interface options = { - + services.gpsd = { enable = mkOption { @@ -70,9 +70,9 @@ in ###### implementation - + config = mkIf cfg.enable { - + users.extraUsers = singleton { name = "gpsd"; inherit uid; @@ -100,5 +100,5 @@ in }; }; - + } diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix index 11a7aa19f23..221ad6e1f54 100644 --- a/modules/services/misc/nix-daemon.nix +++ b/modules/services/misc/nix-daemon.nix @@ -5,7 +5,7 @@ with pkgs.lib; let inherit (config.environment) nix; - + makeNixBuildUser = nr: { name = "nixbld${toString nr}"; description = "Nix build user ${toString nr}"; @@ -34,7 +34,7 @@ in This option specifies the Nix package instance to use throughout the system. "; }; - + nix = { maxJobs = mkOption { @@ -76,10 +76,10 @@ in gc-keep-derivations = true "; description = " - This option allows to append lines to nix.conf. + This option allows to append lines to nix.conf. "; }; - + distributedBuilds = mkOption { default = false; description = " @@ -97,8 +97,8 @@ in manualNixMachines = mkOption { default = false; description = " - Whether to manually manage the list of buildmachines used in distributed - builds in /etc/nix.machines. + Whether to manually manage the list of buildmachines used in distributed + builds in /etc/nix.machines. "; }; @@ -113,7 +113,7 @@ in daemonIONiceLevel = mkOption { default = 7; description = " - Nix daemon process I/O priority. This priority propagates to build processes. + Nix daemon process I/O priority. This priority propagates to build processes. 0 is the default Unix process I/O priority, 7 is the lowest. "; }; @@ -155,11 +155,11 @@ in on the remote machine. "; }; - + proxy = mkOption { default = ""; description = " - This option specifies the proxy to use for fetchurl. The real effect + This option specifies the proxy to use for fetchurl. The real effect is just exporting http_proxy, https_proxy and ftp_proxy with that value. "; @@ -208,13 +208,13 @@ in # in `build-chroot-dirs' - otherwise any builder that uses # /bin/sh won't work. binshDeps = pkgs.writeReferencesToFile config.system.build.binsh; - + # Likewise, if chroots are turned on, we need Nix's own # closure in the chroot. Otherwise nix-channel and nix-env # won't work because the dependencies of its builders (like # coreutils and Perl) aren't visible. Sigh. nixDeps = pkgs.writeReferencesToFile config.environment.nix; - in + in pkgs.runCommand "nix.conf" {extraOptions = config.nix.extraOptions; } '' extraPaths=$(for i in $(cat ${binshDeps} ${nixDeps}); do if test -d $i; then echo $i; fi; done) cat > $out <<END @@ -236,7 +236,7 @@ in source = pkgs.writeText "nix.machines" (concatStrings (map (machine: "${machine.sshUser}@${machine.hostName} " - + (if machine ? system then machine.system else concatStringsSep "," machine.systems) + + (if machine ? system then machine.system else concatStringsSep "," machine.systems) + " ${machine.sshKey} ${toString machine.maxJobs} " + (if machine ? speedFactor then toString machine.speedFactor else "1" ) + "\n" @@ -259,7 +259,7 @@ in ${nix}/bin/nix-worker --daemon > /dev/null 2>&1 ''; - extraConfig = + extraConfig = '' limit nofile 4096 4096 ''; @@ -269,7 +269,7 @@ in '' # Set up the environment variables for running Nix. ${config.nix.envVars} - + # Set up secure multi-user builds: non-root users build through the # Nix daemon. if test "$USER" != root; then diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix index f463a91998e..7853baf3afa 100644 --- a/modules/services/misc/nixos-manual.nix +++ b/modules/services/misc/nixos-manual.nix @@ -15,7 +15,7 @@ let inherit (cfg) revision; inherit pkgs options; }; - + in { @@ -73,7 +73,7 @@ in boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"]; jobs = mkIf cfg.showManual - { nixosManual = + { nixosManual = { name = "nixos-manual"; description = "NixOS manual"; @@ -88,7 +88,7 @@ in }; }; - services.ttyBackgrounds.specificThemes = mkIf cfg.showManual + services.ttyBackgrounds.specificThemes = mkIf cfg.showManual [ { tty = "tty${cfg.ttyNumber}"; theme = pkgs.themes "green"; } @@ -96,7 +96,7 @@ in services.mingetty.helpLine = mkIf cfg.showManual "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual."; - + }; } diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix index 8760ce12510..c313de956fc 100644 --- a/modules/services/misc/rogue.nix +++ b/modules/services/misc/rogue.nix @@ -10,12 +10,12 @@ let cfg = config.services.rogue; in - + { ###### interface options = { - + services.rogue.enable = mkOption { default = false; description = '' @@ -33,13 +33,13 @@ in }; - + ###### implementation config = mkIf cfg.enable { boot.extraTTYs = [ cfg.tty ]; - + jobs.rogue = { description = "Rogue dungeon crawling game"; @@ -56,5 +56,5 @@ in }; }; - + } diff --git a/modules/services/misc/svnserve.nix b/modules/services/misc/svnserve.nix index c1acf5723d8..b0806d14738 100644 --- a/modules/services/misc/svnserve.nix +++ b/modules/services/misc/svnserve.nix @@ -6,30 +6,30 @@ with pkgs.lib; let cfg = config.services.svnserve; - + in { ###### interface - + options = { - + services.svnserve = { - + enable = mkOption { default = false; description = "Whether to enable svnserve to serve Subversion repositories through the SVN protocol."; }; - + svnBaseDir = mkOption { default = "/repos"; description = "Base directory from which Subversion repositories are accessed."; }; }; - + }; - + ###### implementation @@ -37,9 +37,9 @@ in jobs.svnserve = { startOn = "started network-interfaces"; stopOn = "stopping network-interfaces"; - + preStart = "mkdir -p ${cfg.svnBaseDir}"; - + exec = "${pkgs.subversion}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid"; }; }; diff --git a/modules/services/misc/synergy.nix b/modules/services/misc/synergy.nix index 5d21e281b75..667d0c6de97 100644 --- a/modules/services/misc/synergy.nix +++ b/modules/services/misc/synergy.nix @@ -13,7 +13,7 @@ in ###### interface options = { - + services.synergy = { # !!! All these option descriptions needs to be cleaned up. @@ -27,13 +27,13 @@ in }; screenName = mkOption { default = ""; - description = " + description = " use screen-name instead the hostname to identify ourselfs to the server. "; }; serverAddress = mkOption { - description = " + description = " The server address is of the form: [hostname][:port]. The hostname must be the address or hostname of the server. The port overrides the default port, 24800. @@ -56,7 +56,7 @@ in }; screenName = mkOption { default = ""; - description = " + description = " use screen-name instead the hostname to identify this screen in the configuration. "; @@ -76,9 +76,9 @@ in config = { jobs = - + optionalAttrs cfgC.enable - { synergyClient = + { synergyClient = { name = "synergy-client"; description = "Synergy client"; @@ -92,9 +92,9 @@ in ''; }; } - + // optionalAttrs cfgS.enable - { synergyServer = + { synergyServer = { name = "synergy-server"; description = "Synergy server"; @@ -122,7 +122,7 @@ section: screens win: end section: aliases - laptop: + laptop: 192.168.5.5 dm: 192.168.5.78 diff --git a/modules/services/misc/virtualbox.nix b/modules/services/misc/virtualbox.nix index 00b81b2f383..e1384323453 100644 --- a/modules/services/misc/virtualbox.nix +++ b/modules/services/misc/virtualbox.nix @@ -12,20 +12,20 @@ in { ###### interface - + options = { - + services.virtualbox = { - + enable = mkOption { default = false; description = "Whether to enable the VirtualBox service and other guest additions."; - }; + }; }; - + }; - + ###### implementation @@ -34,10 +34,10 @@ in environment.systemPackages = [ ]; boot.extraModulePackages = [ pkgs.linuxPackages.virtualboxGuestAdditions ]; - + jobs.virtualbox = { description = "VirtualBox service"; - + startOn = "started udev"; exec = "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/VBoxService"; diff --git a/modules/services/monitoring/monit.nix b/modules/services/monitoring/monit.nix index 40ad8456d7c..2acc51c64a6 100644 --- a/modules/services/monitoring/monit.nix +++ b/modules/services/monitoring/monit.nix @@ -1,7 +1,7 @@ # Monit system watcher # http://mmonit.org/monit/ -{config, pkgs, ...}: +{config, pkgs, ...}: let inherit (pkgs.lib) mkOption mkIf; in @@ -25,9 +25,9 @@ in }; }; }; - + config = mkIf config.services.monit.enable { - + environment.etc = [ { source = pkgs.writeTextFile { @@ -38,10 +38,10 @@ in mode = "0400"; } ]; - + jobs.monit = { description = "Monit system watcher"; - + startOn = config.services.monit.startOn; exec = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf"; diff --git a/modules/services/monitoring/nagios/default.nix b/modules/services/monitoring/nagios/default.nix index 6b1b3163d26..6d2fe3f2ace 100644 --- a/modules/services/monitoring/nagios/default.nix +++ b/modules/services/monitoring/nagios/default.nix @@ -48,7 +48,7 @@ let illegal_macro_output_chars=`~$&|'"<> retain_state_information=1 ''; # " - + # Plain configuration for the Nagios web-interface with no # authentication. nagiosCGICfgFile = pkgs.writeText "nagios.cgi.conf" @@ -83,12 +83,12 @@ let ''; in - + { ###### interface options = { - + services.nagios = { enable = mkOption { @@ -141,7 +141,7 @@ in ###### implementation config = mkIf cfg.enable { - + users.extraUsers = singleton { name = nagiosUser; uid = config.ids.uids.nagios; @@ -190,7 +190,7 @@ in elsePart = ""; }; }; - + }; } diff --git a/modules/services/monitoring/systemhealth.nix b/modules/services/monitoring/systemhealth.nix index 85f297cfb71..61e6a38fc9a 100644 --- a/modules/services/monitoring/systemhealth.nix +++ b/modules/services/monitoring/systemhealth.nix @@ -118,7 +118,7 @@ in { function = f: { extraConfig = '' Alias ${cfg.urlPrefix} ${htmlDir} - + <Directory ${htmlDir}> Order allow,deny Allow from all diff --git a/modules/services/monitoring/ups.nix b/modules/services/monitoring/ups.nix index b10788c96c4..2874bbf2087 100644 --- a/modules/services/monitoring/ups.nix +++ b/modules/services/monitoring/ups.nix @@ -119,7 +119,7 @@ in description = '' The MODE determines which part of the NUT is to be started, and which configuration files must be modified. - + The values of MODE can be: - none: NUT is not configured, or use the Integrated Power @@ -263,7 +263,7 @@ in description = "UPnP A/V Media Server user"; } ]; - + users.extraGroups = [ { name = "nut"; gid = 84; diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix index 8f598b8a7a1..4d6b267c1a8 100644 --- a/modules/services/monitoring/zabbix-agent.nix +++ b/modules/services/monitoring/zabbix-agent.nix @@ -18,7 +18,7 @@ let Server = ${cfg.server} LogFile = ${logDir}/zabbix_agentd - + PidFile = ${pidFile} StartAgents = 1 @@ -27,13 +27,13 @@ let ''; in - + { ###### interface options = { - + services.zabbixAgent = { enable = mkOption { @@ -61,7 +61,7 @@ in }; }; - + ###### implementation @@ -103,7 +103,7 @@ in ${pkgs.zabbix.agent}/sbin/zabbix_agentd --config ${configFile} 100>${stateDir}/dummy2 wait "$pid" ''; - + postStop = '' pid=$(cat ${pidFile} 2> /dev/null || true) diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix index 9f875d455de..b5af5a2e7bb 100644 --- a/modules/services/monitoring/zabbix-server.nix +++ b/modules/services/monitoring/zabbix-server.nix @@ -18,7 +18,7 @@ let configFile = pkgs.writeText "zabbix_server.conf" '' LogFile = ${logDir}/zabbix_server - + PidFile = ${pidFile} DBHost = ${cfg.dbServer} @@ -33,13 +33,13 @@ let ''; in - + { ###### interface options = { - + services.zabbixServer.enable = mkOption { default = false; description = '' @@ -119,7 +119,7 @@ in while ${pkgs.procps}/bin/pkill -u zabbix zabbix_server; do true; done ''; }; - + }; } diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix index bc828d5bbb8..c475f694499 100644 --- a/modules/services/network-filesystems/nfs-kernel.nix +++ b/modules/services/network-filesystems/nfs-kernel.nix @@ -17,7 +17,7 @@ in ###### interface options = { - + services.nfsKernel = { client.enable = mkOption { @@ -53,7 +53,7 @@ in <manvolnum>8</manvolnum></citerefentry>. ''; }; - + nproc = mkOption { default = 8; description = '' @@ -66,7 +66,7 @@ in description = "Whether to create the mount points in the exports file at startup time."; }; }; - + }; }; @@ -89,9 +89,9 @@ in jobs = optionalAttrs cfg.server.enable - { nfs_kernel_exports = + { nfs_kernel_exports = { name = "nfs-kernel-exports"; - + description = "Kernel NFS server"; startOn = "started network-interfaces"; @@ -100,7 +100,7 @@ in '' export PATH=${pkgs.nfsUtils}/sbin:$PATH mkdir -p /var/lib/nfs - + ${config.system.sbin.modprobe}/sbin/modprobe nfsd || true ${pkgs.sysvtools}/bin/mountpoint -q /proc/fs/nfsd \ @@ -122,9 +122,9 @@ in ''; }; } - + // optionalAttrs cfg.server.enable - { nfs_kernel_nfsd = + { nfs_kernel_nfsd = { name = "nfs-kernel-nfsd"; description = "Kernel NFS server"; @@ -132,7 +132,7 @@ in startOn = "started nfs-kernel-exports and started nfs-kernel-mountd and started nfs-kernel-statd and started portmap"; stopOn = "stopping nfs-kernel-exports"; - preStart = + preStart = '' # Create a state directory required by NFSv4. mkdir -p /var/lib/nfs/v4recovery @@ -162,7 +162,7 @@ in } // optionalAttrs (cfg.client.enable || cfg.server.enable) - { nfs_kernel_statd = + { nfs_kernel_statd = { name = "nfs-kernel-statd"; description = "Kernel NFS server - Network Status Monitor"; @@ -171,7 +171,7 @@ in stopOn = "never"; preStart = - '' + '' mkdir -p /var/lib/nfs mkdir -p /var/lib/nfs/sm mkdir -p /var/lib/nfs/sm.bak @@ -184,7 +184,7 @@ in postStart = "${pkgs.nfsUtils}/sbin/sm-notify -d"; }; }; - + }; - + } diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix index 7ad597a9fa2..7461d12d78b 100644 --- a/modules/services/network-filesystems/samba.nix +++ b/modules/services/network-filesystems/samba.nix @@ -5,13 +5,13 @@ with pkgs.lib; let cfg = config.services.samba; - + user = "smbguest"; group = "smbguest"; logDir = "/var/log/samba"; privateDir = "/var/samba/private"; - + inherit (pkgs) samba; setupScript = @@ -72,7 +72,7 @@ let TZ = config.time.timeZone; LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive"; }; - + daemonType = "fork"; exec = "${samba}/sbin/${appName} ${args}"; @@ -87,7 +87,7 @@ in options = { # !!! clean up the descriptions. - + services.samba = { enable = mkOption { @@ -176,7 +176,7 @@ in }; }; - + ###### implementation @@ -218,5 +218,5 @@ in jobs.winbindd = daemonJob "winbindd" "-D"; }; - + } diff --git a/modules/services/networking/amuled.nix b/modules/services/networking/amuled.nix index f499e72c0d2..658d16af006 100644 --- a/modules/services/networking/amuled.nix +++ b/modules/services/networking/amuled.nix @@ -12,7 +12,7 @@ in ###### interface options = { - + services.amule = { enable = mkOption { @@ -39,7 +39,7 @@ in }; }; - + ###### implementation @@ -67,5 +67,5 @@ in }; }; - + } diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix index 0ca9869db0b..81432d34864 100644 --- a/modules/services/networking/avahi-daemon.nix +++ b/modules/services/networking/avahi-daemon.nix @@ -30,7 +30,7 @@ in ###### interface options = { - + services.avahi = { enable = mkOption { @@ -83,11 +83,11 @@ in domain by transparently querying the Avahi daemon. ''; }; - + }; - + }; - + ###### implementation diff --git a/modules/services/networking/bind.nix b/modules/services/networking/bind.nix index c93c2a9b00e..54eb5e08e9b 100644 --- a/modules/services/networking/bind.nix +++ b/modules/services/networking/bind.nix @@ -5,7 +5,7 @@ with pkgs.lib; let startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces"; - + cfg = config.services.bind; confFile = pkgs.writeText "named.conf" @@ -26,7 +26,7 @@ let ${ concatMapStrings ({ name, file, master ? true, slaves ? [], masters ? [] }: - '' + '' zone "${name}" { type ${if master then "master" else "slave"}; file "${file}"; @@ -56,35 +56,35 @@ in ###### interface options = { - + services.bind = { - + enable = mkOption { default = false; description = " Whether to enable BIND domain name server. "; }; - + cacheNetworks = mkOption { default = ["127.0.0.0/24"]; description = " What networks are allowed to use us as a resolver. "; }; - + blockedNetworks = mkOption { default = []; description = " What networks are just blocked. "; }; - + zones = mkOption { default = []; description = " List of zones we claim authority over. - master=false means slave server; slaves means addresses + master=false means slave server; slaves means addresses who may request zone transfer. "; example = [{ @@ -95,11 +95,11 @@ in slaves = []; }]; }; - + }; }; - + ###### implementation @@ -117,5 +117,5 @@ in }; }; - + } diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix index 573feda5462..8fd79cb00f3 100644 --- a/modules/services/networking/bitlbee.nix +++ b/modules/services/networking/bitlbee.nix @@ -5,9 +5,9 @@ with pkgs.lib; let bitlbeeUid = config.ids.uids.bitlbee; - + inherit (config.services.bitlbee) portNumber interface; - + in { @@ -15,7 +15,7 @@ in ###### interface options = { - + services.bitlbee = { enable = mkOption { @@ -46,7 +46,7 @@ in }; }; - + ###### implementation @@ -58,7 +58,7 @@ in description = "BitlBee user"; home = "/var/empty"; }; - + users.extraGroups = singleton { name = "bitlbee"; gid = config.ids.gids.bitlbee; @@ -88,5 +88,5 @@ in environment.systemPackages = [ pkgs.bitlbee ]; }; - + } diff --git a/modules/services/networking/ddclient.nix b/modules/services/networking/ddclient.nix index 575386c8579..a0523919ef4 100644 --- a/modules/services/networking/ddclient.nix +++ b/modules/services/networking/ddclient.nix @@ -33,9 +33,9 @@ in { ###### interface - + options = { - + services.ddclient = { enable = mkOption { @@ -102,7 +102,7 @@ in config = mkIf config.services.ddclient.enable { environment.systemPackages = [ ddclient ]; - + users.extraUsers = singleton { name = ddclientUser; uid = config.ids.uids.ddclient; @@ -128,5 +128,5 @@ in }; }; - + } diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix index 2acef81e1e5..0a353ae1eab 100644 --- a/modules/services/networking/dhclient.nix +++ b/modules/services/networking/dhclient.nix @@ -8,7 +8,7 @@ let # Don't start dhclient on explicitly configured interfaces or on # interfaces that are part of a bridge. - ignoredInterfaces = + ignoredInterfaces = map (i: i.name) (lib.filter (i: i ? ipAddress && i.ipAddress != "" ) config.networking.interfaces) ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges)); @@ -29,7 +29,7 @@ let # anything ever again ("couldn't resolve ..., giving up on # it"), so we silently lose time synchronisation. ${config.system.build.upstart}/sbin/initctl stop ntpd - + ${config.system.build.upstart}/sbin/initctl emit -n ip-up fi @@ -37,7 +37,7 @@ let ${config.system.build.upstart}/sbin/initctl emit -n ip-down fi ''; - + in { @@ -45,7 +45,7 @@ in ###### interface options = { - + networking.useDHCP = mkOption { default = true; merge = mergeEnableOption; @@ -55,15 +55,15 @@ in configured. "; }; - + }; ###### implementation - + config = mkIf config.networking.useDHCP { - jobs.dhclient = + jobs.dhclient = { startOn = "started network-interfaces"; stopOn = "stopping network-interfaces"; @@ -83,7 +83,7 @@ in # (1), i.e. Ethernet. Ignore peth* devices; on Xen, # they're renamed physical Ethernet cards used for # bridging. Likewise for vif* and tap* (Xen) and - # virbr* and vnet* (libvirt). + # virbr* and vnet* (libvirt). if [ "$(cat /sys/class/net/$i/type)" = 1 ]; then if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i" && ! echo "$i" | grep -x -q "peth.*\|vif.*\|tap.*\|virbr.*\|vnet.*"; @@ -121,7 +121,7 @@ in initctl restart dhclient ''; - }; - + }; + } diff --git a/modules/services/networking/dnsmasq.nix b/modules/services/networking/dnsmasq.nix index 6ff9e05f4d6..389d5c22e82 100644 --- a/modules/services/networking/dnsmasq.nix +++ b/modules/services/networking/dnsmasq.nix @@ -13,9 +13,9 @@ in { ###### interface - + options = { - + services.dnsmasq = { enable = mkOption { @@ -41,7 +41,7 @@ in ###### implementation config = mkIf config.services.dnsmasq.enable { - + jobs.dnsmasq = { description = "dnsmasq daemon"; @@ -51,7 +51,7 @@ in exec = "${dnsmasq}/bin/dnsmasq -R ${serversParam}"; }; - + }; - + } diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix index b4083d3c9e2..64cfcef124a 100644 --- a/modules/services/networking/firewall.nix +++ b/modules/services/networking/firewall.nix @@ -5,7 +5,7 @@ uses several chains: - ‘nixos-fw-input’ is the main chain for input packet processing. - + - ‘nixos-fw-log-refuse’ and ‘nixos-fw-refuse’ are called for refused packets. (The former jumps to the latter after logging the packet.) If you want additional logging, or want to accept @@ -17,7 +17,7 @@ can insert rules at the start of this chain. */ - + { config, pkgs, ... }: @@ -44,7 +44,7 @@ in ###### interface options = { - + networking.firewall.enable = mkOption { default = false; description = @@ -55,7 +55,7 @@ in forwarding. ''; }; - + networking.firewall.logRefusedConnections = mkOption { default = true; description = @@ -63,7 +63,7 @@ in Whether to log rejected or dropped incoming connections. ''; }; - + networking.firewall.logRefusedPackets = mkOption { default = false; description = @@ -95,7 +95,7 @@ in port scanning somewhat easier. ''; }; - + networking.firewall.allowedTCPPorts = mkOption { default = []; example = [ 22 80 ]; @@ -106,7 +106,7 @@ in accepted. ''; }; - + networking.firewall.allowedUDPPorts = mkOption { default = []; example = [ 53 ]; @@ -116,7 +116,7 @@ in List of open UDP ports. ''; }; - + networking.firewall.allowPing = mkOption { default = false; type = types.bool; @@ -128,7 +128,7 @@ in less effective. ''; }; - + networking.firewall.extraCommands = mkOption { default = ""; example = "iptables -A INPUT -p icmp -j ACCEPT"; @@ -140,7 +140,7 @@ in to allow packets that would otherwise be refused. ''; }; - + }; @@ -184,7 +184,7 @@ in # The "nixos-fw-refuse" chain rejects or drops packets. ip46tables -N nixos-fw-refuse - + ${if cfg.rejectPackets then '' # Send a reset for existing TCP connections that we've # somehow forgotten about. Send ICMP "port unreachable" @@ -219,7 +219,7 @@ in # The "nixos-fw" chain does the actual work. ip46tables -N nixos-fw - + # Accept all traffic on the loopback interface. ip46tables -A nixos-fw -i lo -j nixos-fw-accept diff --git a/modules/services/networking/git-daemon.nix b/modules/services/networking/git-daemon.nix index b3841d4f074..a7c7c206198 100644 --- a/modules/services/networking/git-daemon.nix +++ b/modules/services/networking/git-daemon.nix @@ -9,7 +9,7 @@ in { ###### interface - + options = { services.gitDaemon = { @@ -18,7 +18,7 @@ in description = '' Enable Git daemon, which allows public hosting of git repositories without any access controls. This is mostly intended for read-only access. - + You can allow write access by setting daemon.receivepack configuration item of the repository to true. This is solely meant for a closed LAN setting where everybody is friendly. @@ -109,4 +109,4 @@ in }; -} \ No newline at end of file +} diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix index a717ff47f02..a86c3999c2c 100644 --- a/modules/services/networking/gnunet.nix +++ b/modules/services/networking/gnunet.nix @@ -48,9 +48,9 @@ in ###### interface options = { - + services.gnunet = { - + enable = mkOption { default = false; description = '' diff --git a/modules/services/networking/gvpe.nix b/modules/services/networking/gvpe.nix index 102de2bca2d..594a2e80f34 100644 --- a/modules/services/networking/gvpe.nix +++ b/modules/services/networking/gvpe.nix @@ -1,32 +1,32 @@ # GNU Virtual Private Ethernet -{config, pkgs, ...}: +{config, pkgs, ...}: -let +let inherit (pkgs.lib) mkOption mkIf; cfg = config.services.gvpe; - finalConfig = if cfg.configFile != null then + finalConfig = if cfg.configFile != null then cfg.configFile else if cfg.configText != null then pkgs.writeTextFile { name = "gvpe.conf"; text = cfg.configText; } - else + else throw "You must either specify contents of the config file or the config file itself for GVPE"; - ifupScript = if cfg.ipAddress == null || cfg.subnet == null then - throw "Specify IP address and subnet (with mask) for GVPE" - else if cfg.nodename == null then - throw "You must set node name for GVPE" + ifupScript = if cfg.ipAddress == null || cfg.subnet == null then + throw "Specify IP address and subnet (with mask) for GVPE" + else if cfg.nodename == null then + throw "You must set node name for GVPE" else - (pkgs.writeTextFile { + (pkgs.writeTextFile { name = "gvpe-if-up"; text = '' #! /bin/sh - + export PATH=$PATH:${pkgs.iproute}/sbin ip link set $IFNAME up @@ -80,7 +80,7 @@ in udp-port = 655 mtu = 1480 ifname = vpn0 - + node = alpha hostname = alpha.example.org connect = always @@ -124,7 +124,7 @@ in config = mkIf cfg.enable { jobs.gvpe = { description = "GNU Virtual Private Ethernet node"; - + inherit startOn stopOn; preStart = '' diff --git a/modules/services/networking/gw6c/default.nix b/modules/services/networking/gw6c/default.nix index a566679d789..72f72d4c005 100644 --- a/modules/services/networking/gw6c/default.nix +++ b/modules/services/networking/gw6c/default.nix @@ -44,9 +44,9 @@ in ###### interface options = { - + services.gw6c = { - + enable = mkOption { default = false; description = " @@ -57,7 +57,7 @@ in autorun = mkOption { default = true; description = " - Switch to false to create upstart-job and configuration, + Switch to false to create upstart-job and configuration, but not run it automatically "; }; @@ -109,23 +109,23 @@ in }; }; - + security.seccureKeys = { # !!! It's not clear to me (ED) what additional security this # provides. Passwords shouldn't be in configuration.nix, # period. You could just place the password in # /var/blah/password or whatever. - + public = mkOption { default = /var/elliptic-keys/public; description = " Public key. Make it path argument, so it is copied into store and - hashed. + hashed. The key is used to encrypt Gateway 6 configuration in store, as it - contains a password for external service. Unfortunately, - derivation file should be protected by other means. For example, + contains a password for external service. Unfortunately, + derivation file should be protected by other means. For example, nix-http-export.cgi will happily export any non-derivation path, but not a derivation. "; @@ -141,7 +141,7 @@ in }; }; - + ###### implementation @@ -149,7 +149,7 @@ in jobs.gw6c = { description = "Gateway6 client"; - + startOn = if cfg.autorun then "started network-interfaces" else ""; stopOn = "stopping network-interfaces"; diff --git a/modules/services/networking/ifplugd.nix b/modules/services/networking/ifplugd.nix index 6ec71849ca3..e4e4fd9216a 100644 --- a/modules/services/networking/ifplugd.nix +++ b/modules/services/networking/ifplugd.nix @@ -20,14 +20,14 @@ let fi ''; -in +in { ###### interface options = { - + networking.interfaceMonitor.enable = mkOption { default = false; description = " @@ -46,7 +46,7 @@ in plugged in or unplugged. "; }; - + }; @@ -69,7 +69,7 @@ in }; environment.systemPackages = [ifplugd]; - + }; } diff --git a/modules/services/networking/ircd-hybrid/default.nix b/modules/services/networking/ircd-hybrid/default.nix index c4bf1878acf..d28e856eabf 100644 --- a/modules/services/networking/ircd-hybrid/default.nix +++ b/modules/services/networking/ircd-hybrid/default.nix @@ -5,7 +5,7 @@ with pkgs.lib; let cfg = config.services.ircdHybrid; - + ircdService = pkgs.stdenv.mkDerivation rec { name = "ircd-hybrid-service"; scripts = [ "=>/bin" ./control.in ]; @@ -17,7 +17,7 @@ let inherit (cfg) serverName sid description adminEmail extraPort; - cryptoSettings = + cryptoSettings = (optionalString (cfg.rsaKey != null) "rsa_private_key_file = \"${cfg.rsaKey}\";\n") + (optionalString (cfg.certificate != null) "ssl_certificate_file = \"${cfg.certificate}\";\n"); @@ -35,7 +35,7 @@ in ###### interface options = { - + services.ircdHybrid = { enable = mkOption { @@ -70,7 +70,7 @@ in default = null; example = /root/certificates/irc.key; description = " - IRCD server RSA key. + IRCD server RSA key. "; }; @@ -86,7 +86,7 @@ in default = "<bit-bucket@example.com>"; example = "<name@domain.tld>"; description = " - IRCD server administrator e-mail. + IRCD server administrator e-mail. "; }; @@ -115,7 +115,7 @@ in config = mkIf config.services.ircdHybrid.enable { users.extraUsers = singleton - { name = "ircd"; + { name = "ircd"; description = "IRCD owner"; }; diff --git a/modules/services/networking/nat.nix b/modules/services/networking/nat.nix index 50b2590b3be..c51eeb54be7 100644 --- a/modules/services/networking/nat.nix +++ b/modules/services/networking/nat.nix @@ -15,7 +15,7 @@ in ###### interface options = { - + networking.nat.enable = mkOption { default = false; description = @@ -23,7 +23,7 @@ in Whether to enable Network Address Translation (NAT). ''; }; - + networking.nat.internalIPs = mkOption { example = "192.168.1.0/24"; description = @@ -33,7 +33,7 @@ in interface will be rewritten. ''; }; - + networking.nat.externalInterface = mkOption { example = "eth1"; description = @@ -41,7 +41,7 @@ in The name of the external network interface. ''; }; - + networking.nat.externalIP = mkOption { default = ""; example = "203.0.113.123"; @@ -53,7 +53,7 @@ in used. ''; }; - + }; diff --git a/modules/services/networking/ntpd.nix b/modules/services/networking/ntpd.nix index f0b96951eb1..6e3040a2ae1 100644 --- a/modules/services/networking/ntpd.nix +++ b/modules/services/networking/ntpd.nix @@ -30,9 +30,9 @@ in { ###### interface - + options = { - + services.ntp = { enable = mkOption { @@ -62,7 +62,7 @@ in ###### implementation config = mkIf config.services.ntp.enable { - + users.extraUsers = singleton { name = ntpUser; uid = config.ids.uids.ntp; @@ -93,7 +93,7 @@ in exec = "${ntp}/bin/ntpd -g -n ${ntpFlags}"; }; - + }; - + } diff --git a/modules/services/networking/openfire.nix b/modules/services/networking/openfire.nix index 02e6b4c9aaa..7ac53067f77 100644 --- a/modules/services/networking/openfire.nix +++ b/modules/services/networking/openfire.nix @@ -5,12 +5,12 @@ with pkgs.lib; let inherit (pkgs) jre openfire coreutils which gnugrep gawk gnused; - + startDependency = if config.services.openfire.usePostgreSQL then "postgresql" else if config.services.gw6c.enable then "gw6c" else "network-interfaces"; - + in { @@ -18,16 +18,16 @@ in ###### interface options = { - + services.openfire = { - + enable = mkOption { default = false; description = " Whether to enable OpenFire XMPP server. "; }; - + usePostgreSQL = mkOption { default = true; description = " @@ -56,8 +56,8 @@ in '' export PATH=${jre}/bin:${openfire}/bin:${coreutils}/bin:${which}/bin:${gnugrep}/bin:${gawk}/bin:${gnused}/bin export HOME=/tmp - mkdir /var/log/openfire || true - mkdir /etc/openfire || true + mkdir /var/log/openfire || true + mkdir /etc/openfire || true for i in ${openfire}/conf.inst/*; do if ! test -f /etc/openfire/$(basename $i); then cp $i /etc/openfire/ @@ -68,5 +68,5 @@ in }; }); - + } diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix index 772a9509064..bec5d7b8107 100644 --- a/modules/services/networking/openvpn.nix +++ b/modules/services/networking/openvpn.nix @@ -75,15 +75,15 @@ let }; in - + { ###### interface options = { - + services.openvpn = { - + enable = mkOption { default = false; description = "Whether to enable OpenVPN."; @@ -98,7 +98,7 @@ in mostSimple = { config = '' # Most simple configuration: http://openvpn.net/index.php/documentation/miscellaneous/static-key-mini-howto.html. - # server : + # server : dev tun ifconfig 10.8.0.1 10.8.0.2 secret static.key @@ -132,7 +132,7 @@ in Each instance will result in a new job file. Additionally you can specify the up/ down scripts by setting - the up down properties. + the up down properties. Config lines up=/nix/store/xxx-up-script down=... will be appended to your configuration file automatically @@ -161,5 +161,5 @@ in environment.systemPackages = [ openvpn ]; }; - + } diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix index 9c0d559f867..0b03c6ccdb4 100644 --- a/modules/services/networking/portmap.nix +++ b/modules/services/networking/portmap.nix @@ -8,7 +8,7 @@ let gid = config.ids.gids.portmap; portmap = pkgs.portmap.override { daemonUID = uid; daemonGID = gid; }; - + in { @@ -16,9 +16,9 @@ in ###### interface options = { - + services.portmap = { - + enable = mkOption { default = false; description = '' @@ -45,7 +45,7 @@ in }; }; - + ###### implementation diff --git a/modules/services/networking/privoxy.nix b/modules/services/networking/privoxy.nix index a63a32996eb..443328f67b0 100644 --- a/modules/services/networking/privoxy.nix +++ b/modules/services/networking/privoxy.nix @@ -28,9 +28,9 @@ in { ###### interface - + options = { - + services.privoxy = { enable = mkOption { @@ -69,7 +69,7 @@ in config = mkIf config.services.privoxy.enable { environment.systemPackages = [ privoxy ]; - + users.extraUsers = singleton { name = privoxyUser; uid = config.ids.uids.privoxy; @@ -95,5 +95,5 @@ in }; }; - + } diff --git a/modules/services/networking/quassel.nix b/modules/services/networking/quassel.nix index 916694c6910..d5c38cfd048 100644 --- a/modules/services/networking/quassel.nix +++ b/modules/services/networking/quassel.nix @@ -13,7 +13,7 @@ in ###### interface options = { - + services.quassel = { enable = mkOption { @@ -56,7 +56,7 @@ in }; }; - + ###### implementation @@ -66,7 +66,7 @@ in { name = "quassel"; description = "Quassel IRC client daemon"; }]; - + jobs.quassel = { description = "Quassel IRC client daemon"; @@ -86,5 +86,5 @@ in }; }; - + } diff --git a/modules/services/networking/radvd.nix b/modules/services/networking/radvd.nix index 4da60525e38..8d586ce6e46 100644 --- a/modules/services/networking/radvd.nix +++ b/modules/services/networking/radvd.nix @@ -17,7 +17,7 @@ in ###### interface options = { - + services.radvd.enable = mkOption { default = false; description = @@ -53,10 +53,10 @@ in config = mkIf cfg.enable { environment.systemPackages = [ pkgs.radvd ]; - + jobs.radvd = { description = "IPv6 Router Advertisement Daemon"; - + startOn = "started network-interfaces"; preStart = @@ -66,12 +66,12 @@ in # necessarily for all interfaces). echo 1 > /proc/sys/net/ipv6/conf/all/forwarding ''; - + exec = "${pkgs.radvd}/sbin/radvd -m syslog -s -C ${confFile}"; daemonType = "fork"; }; }; - -} \ No newline at end of file + +} diff --git a/modules/services/networking/rdnssd.nix b/modules/services/networking/rdnssd.nix index 11017b8e250..f797206ad5c 100644 --- a/modules/services/networking/rdnssd.nix +++ b/modules/services/networking/rdnssd.nix @@ -10,7 +10,7 @@ with pkgs.lib; ###### interface options = { - + services.rdnssd.enable = mkOption { default = false; #default = config.networking.enableIPv6; @@ -32,7 +32,7 @@ with pkgs.lib; jobs.rdnssd = { description = "RDNSS daemon"; - + # Start before the network interfaces are brought up so that # the daemon receives RDNSS advertisements from the kernel. startOn = "starting network-interfaces"; @@ -44,5 +44,5 @@ with pkgs.lib; }; }; - + } diff --git a/modules/services/networking/sabnzbd.nix b/modules/services/networking/sabnzbd.nix index 06c528188b6..8816ac0d2f8 100644 --- a/modules/services/networking/sabnzbd.nix +++ b/modules/services/networking/sabnzbd.nix @@ -2,7 +2,7 @@ with pkgs.lib; -let +let cfg = config.services.sabnzbd; inherit (pkgs) sabnzbd; @@ -25,7 +25,7 @@ in }; }; }; - + ###### implementation diff --git a/modules/services/networking/ssh/lshd.nix b/modules/services/networking/ssh/lshd.nix index 63943990f61..d32fabbde24 100644 --- a/modules/services/networking/ssh/lshd.nix +++ b/modules/services/networking/ssh/lshd.nix @@ -2,7 +2,7 @@ with pkgs.lib; -let +let inherit (pkgs) lsh; @@ -15,7 +15,7 @@ in ###### interface options = { - + services.lshd = { enable = mkOption { @@ -106,7 +106,7 @@ in an executable implementing it. ''; }; - + }; }; @@ -169,7 +169,7 @@ in subsystems)} ''; }; - + }; - + } diff --git a/modules/services/networking/tftpd.nix b/modules/services/networking/tftpd.nix index 002fc991555..37935496c59 100644 --- a/modules/services/networking/tftpd.nix +++ b/modules/services/networking/tftpd.nix @@ -5,7 +5,7 @@ with pkgs.lib; { ###### interface - + options = { services.tftpd.enable = mkOption { diff --git a/modules/services/networking/vsftpd.nix b/modules/services/networking/vsftpd.nix index 837f44c4213..1b2432401de 100644 --- a/modules/services/networking/vsftpd.nix +++ b/modules/services/networking/vsftpd.nix @@ -2,10 +2,10 @@ with pkgs.lib; -let +let cfg = config.services.vsftpd; - + inherit (pkgs) vsftpd; yesNoOption = p : name : @@ -18,9 +18,9 @@ in ###### interface options = { - + services.vsftpd = { - + enable = mkOption { default = false; description = "Whether to enable the vsftpd FTP server."; @@ -72,9 +72,9 @@ in }; }; - + }; - + ###### implementation @@ -133,5 +133,5 @@ in }; }; - + } diff --git a/modules/services/networking/wakeonlan.nix b/modules/services/networking/wakeonlan.nix index 936936d2948..1fc54986b16 100644 --- a/modules/services/networking/wakeonlan.nix +++ b/modules/services/networking/wakeonlan.nix @@ -14,7 +14,7 @@ let if method == "magicpacket" then "wol g" else if method == "password" then "wol s so ${passwordParameter password}" else throw "Wake-On-Lan method not supported"; - + line = { interface, method ? "magicpacket", password ? "" }: '' ${ethtool} -s ${interface} ${methodParameter {inherit method password;}} ''; @@ -26,7 +26,7 @@ in { ###### interface - + options = { services.wakeonlan.interfaces = mkOption { diff --git a/modules/services/networking/wicd.nix b/modules/services/networking/wicd.nix index b26511bcb52..8e012273216 100644 --- a/modules/services/networking/wicd.nix +++ b/modules/services/networking/wicd.nix @@ -7,7 +7,7 @@ with pkgs.lib; ###### interface options = { - + networking.wicd.enable = mkOption { default = false; description = '' @@ -20,12 +20,12 @@ with pkgs.lib; ###### implementation - + config = mkIf config.networking.wicd.enable { environment.systemPackages = [pkgs.wicd]; - jobs.wicd = + jobs.wicd = { startOn = "started network-interfaces"; stopOn = "stopping network-interfaces"; @@ -35,7 +35,7 @@ with pkgs.lib; services.dbus.enable = true; services.dbus.packages = [pkgs.wicd]; - + }; } diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix index 5b74d7e420a..0bd6052c125 100644 --- a/modules/services/networking/xinetd.nix +++ b/modules/services/networking/xinetd.nix @@ -2,10 +2,10 @@ with pkgs.lib; -let +let cfg = config.services.xinetd; - + inherit (pkgs) xinetd; configFile = pkgs.writeText "xinetd.conf" @@ -16,7 +16,7 @@ let log_on_failure = HOST log_on_success = PID HOST DURATION EXIT } - + ${concatMapStrings makeService cfg.services} ''; @@ -35,15 +35,15 @@ let ${optionalString (srv.serverArgs != "") "server_args = ${srv.serverArgs}"} } ''; - + in - + { ###### interface - + options = { - + services.xinetd.enable = mkOption { default = false; description = '' @@ -58,7 +58,7 @@ in ''; type = types.list types.optionSet; - + options = { name = mkOption { @@ -120,7 +120,7 @@ in }; }; - + ###### implementation diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix index 632bdbae90d..81ab8a1531e 100644 --- a/modules/services/printing/cupsd.nix +++ b/modules/services/printing/cupsd.nix @@ -143,7 +143,7 @@ in }; services.printing.drivers = [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends ]; - + services.printing.cupsdConf = '' LogLevel info diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix index 8f6d1667bdb..8213f4b3667 100644 --- a/modules/services/scheduling/atd.nix +++ b/modules/services/scheduling/atd.nix @@ -5,7 +5,7 @@ with pkgs.lib; let cfg = config.services.atd; - + inherit (pkgs) at; in @@ -15,7 +15,7 @@ in ###### interface options = { - + services.atd.enable = mkOption { default = true; description = '' @@ -26,14 +26,14 @@ in services.atd.allowEveryone = mkOption { default = false; description = '' - Whether to make /var/spool/at{jobs,spool} writeable + Whether to make /var/spool/at{jobs,spool} writeable by everyone (and sticky). This is normally not needed since the `at' commands are setuid/setgid `atd'. ''; }; - + }; - + ###### implementation diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix index 555cde92876..9a81eb6e72c 100644 --- a/modules/services/scheduling/cron.nix +++ b/modules/services/scheduling/cron.nix @@ -22,7 +22,7 @@ let # should have sendmail in this path. sendmailPath = "/var/setuid-wrappers/sendmail"; }; - + in { @@ -30,7 +30,7 @@ in ###### interface options = { - + services.cron = { enable = mkOption { @@ -66,7 +66,7 @@ in }; }; - + }; @@ -89,7 +89,7 @@ in { description = "Cron daemon"; startOn = "startup"; - + # Needed to interpret times in the local timezone. environment = { TZ = config.time.timeZone; }; @@ -108,5 +108,5 @@ in }; }; - + } diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix index 4521b3c5760..bf70bb65727 100644 --- a/modules/services/scheduling/fcron.nix +++ b/modules/services/scheduling/fcron.nix @@ -5,7 +5,7 @@ with pkgs.lib; let cfg = config.services.fcron; - + queuelen = if cfg.queuelen == "" then "" else "-q ${toString cfg.queuelen}"; systemCronJobs = @@ -28,38 +28,38 @@ in { ###### interface - + options = { - + services.fcron = { - + enable = mkOption { default = false; description = "Whether to enable the `fcron' daemon."; }; - + allow = mkOption { default = [ "all" ]; description = '' Users allowed to use fcrontab and fcrondyn (one name per line, "all" for everyone). ''; }; - + deny = mkOption { default = []; description = "Users forbidden from using fcron."; }; - + maxSerialJobs = mkOption { default = 1; description = "Maximum number of serial jobs which can run simultaneously."; }; - + queuelen = mkOption { default = ""; description = "Number of jobs the serial queue and the lavg queue can contain - empty to net set this number (-q)"; }; - + systab = mkOption { default = ""; description = ''The "system" crontab contents.''; diff --git a/modules/services/security/tor.nix b/modules/services/security/tor.nix index 6e1b2838ead..6582ba70253 100644 --- a/modules/services/security/tor.nix +++ b/modules/services/security/tor.nix @@ -22,15 +22,15 @@ in { ###### interface - + options = { - + services.tor = { config = mkOption { default = ""; description = '' - Extra configuration. Contents will be added verbatim to the + Extra configuration. Contents will be added verbatim to the configuration file. ''; }; @@ -49,7 +49,7 @@ in default = "127.0.0.1:9050"; example = "192.168.0.1:9100"; description = '' - Bind to this address to listen for connections from Socks-speaking + Bind to this address to listen for connections from Socks-speaking applications. ''; }; @@ -70,9 +70,9 @@ in default = true; description = '' Whether to enable a special instance of privoxy dedicated to Tor. - To have anonymity, protocols need to be scrubbed of identifying + To have anonymity, protocols need to be scrubbed of identifying information. - Most people using Tor want to anonymize their web traffic, so by + Most people using Tor want to anonymize their web traffic, so by default we enable an special instance of privoxy specifically for Tor. However, if you are only going to use Tor only for other kinds of @@ -84,9 +84,9 @@ in default = "127.0.0.1:8118"; description = '' Address that Tor's instance of privoxy is listening to. - *This does not configure the standard NixOS instance of privoxy.* - This is for Tor connections only! - See services.privoxy.listenAddress to configure the standard NixOS + *This does not configure the standard NixOS instance of privoxy.* + This is for Tor connections only! + See services.privoxy.listenAddress to configure the standard NixOS instace of privoxy. ''; }; @@ -94,11 +94,11 @@ in config = mkOption { default = ""; description = '' - Extra configuration for Tor's instance of privoxy. Contents will be + Extra configuration for Tor's instance of privoxy. Contents will be added verbatim to the configuration file. - *This does not configure the standard NixOS instance of privoxy.* - This is for Tor connections only! - See services.privoxy.extraConfig to configure the standard NixOS + *This does not configure the standard NixOS instance of privoxy.* + This is for Tor connections only! + See services.privoxy.extraConfig to configure the standard NixOS instace of privoxy. ''; }; @@ -107,7 +107,7 @@ in }; - relay = { + relay = { enable = mkOption { default = false; @@ -246,7 +246,7 @@ in torPrivoxy = { name = "tor-privoxy"; startOn = "starting tor"; - stopOn = "stopping tor"; + stopOn = "stopping tor"; preStart = '' mkdir -m 0755 -p ${privoxyDir} @@ -275,7 +275,7 @@ in ${if cfg.relay.isExit then opt "ExitPolicy" cfg.relay.exitPolicy else "ExitPolicy reject *:*"} ${if cfg.relay.isBridge then "BridgeRelay 1" else ""} ''; - + services.tor.client.privoxy.config = '' # Generally, this file goes in /etc/privoxy/config # @@ -287,14 +287,14 @@ in actionsfile default.action # Main actions file actionsfile user.action # User customizations filterfile default.filter - + # Don't log interesting things, only startup messages, warnings and errors logfile logfile #jarfile jarfile #debug 0 # show each GET/POST/CONNECT request debug 4096 # Startup banner and warnings debug 8192 # Errors - *we highly recommended enabling this* - + user-manual ${privoxy}/doc/privoxy/user-manual listen-address ${cfg.client.privoxy.listenAddress} toggle 1 @@ -302,10 +302,10 @@ in enable-edit-actions 0 enable-remote-http-toggle 0 buffer-limit 4096 - + # Extra config goes here ''; - + }); - + } diff --git a/modules/services/security/torsocks.nix b/modules/services/security/torsocks.nix index 5257327b384..e56bd012d04 100644 --- a/modules/services/security/torsocks.nix +++ b/modules/services/security/torsocks.nix @@ -19,9 +19,9 @@ in { ###### interface - + options = { - + services.tor.torsocks = { enable = mkOption { diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix index 248b29a3dd5..4f6d577e936 100644 --- a/modules/services/system/dbus.nix +++ b/modules/services/system/dbus.nix @@ -14,13 +14,13 @@ let name = "dbus-conf"; buildCommand = '' ensureDir $out - + cp -v ${pkgs.dbus_daemon}/etc/dbus-1/system.conf $out/system.conf # !!! Hm, these `sed' calls are rather error-prone... # Tell the daemon where the setuid wrapper around - # dbus-daemon-launch-helper lives. + # dbus-daemon-launch-helper lives. sed -i $out/system.conf \ -e 's|<servicehelper>.*/libexec/dbus-daemon-launch-helper|<servicehelper>${config.security.wrapperDir}/dbus-daemon-launch-helper|' @@ -31,7 +31,7 @@ let -e 's|<includedir>system.d</includedir>|${systemIncludeDirs}|' cp ${pkgs.dbus_daemon}/etc/dbus-1/session.conf $out/session.conf - + # Add the services and session.d directories to the session bus # search path. sed -i $out/session.conf \ @@ -63,7 +63,7 @@ in ###### interface options = { - + services.dbus = { enable = mkOption { @@ -87,7 +87,7 @@ in }; }; - + }; @@ -125,7 +125,7 @@ in mkdir -m 0755 -p /var/lib/dbus ${pkgs.dbus_tools}/bin/dbus-uuidgen --ensure - + rm -f ${homeDir}/pid ''; @@ -160,7 +160,7 @@ in ]; environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; - + }; - + } diff --git a/modules/services/system/kerberos.nix b/modules/services/system/kerberos.nix index 4ca9a0169bf..2a47b904589 100644 --- a/modules/services/system/kerberos.nix +++ b/modules/services/system/kerberos.nix @@ -12,9 +12,9 @@ in { ###### interface - + options = { - + services.kerberos_server = { enable = mkOption { @@ -32,9 +32,9 @@ in ###### implementation config = mkIf config.services.kerberos_server.enable { - + environment.systemPackages = [ heimdal ]; - + services.xinetd.enable = true; services.xinetd.services = pkgs.lib.singleton { name = "kerberos-adm"; @@ -67,5 +67,5 @@ in exec = "${heimdal}/sbin/kpasswdd"; }; }; - + } diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix index ede6c4213db..971b73706ae 100644 --- a/modules/services/system/nscd.nix +++ b/modules/services/system/nscd.nix @@ -7,7 +7,7 @@ let nssModulesPath = config.system.nssModules.path; inherit (pkgs.lib) singleton; - + in { @@ -32,7 +32,7 @@ in ###### implementation config = mkIf config.services.nscd.enable { - + users.extraUsers = singleton { name = "nscd"; uid = config.ids.uids.nscd; @@ -45,7 +45,7 @@ in startOn = "startup"; environment = { LD_LIBRARY_PATH = nssModulesPath; }; - + preStart = '' mkdir -m 0755 -p /var/run/nscd diff --git a/modules/services/system/uptimed.nix b/modules/services/system/uptimed.nix index fd4c1652bd3..51874cfc0e5 100644 --- a/modules/services/system/uptimed.nix +++ b/modules/services/system/uptimed.nix @@ -19,9 +19,9 @@ in { ###### interface - + options = { - + services.uptimed = { enable = mkOption { @@ -39,9 +39,9 @@ in ###### implementation config = mkIf config.services.uptimed.enable { - + environment.systemPackages = [ uptimed ]; - + users.extraUsers = singleton { name = uptimedUser; uid = config.ids.uids.uptimed; @@ -69,7 +69,7 @@ in exec = "${uptimed}/sbin/uptimed ${uptimedFlags}"; }; - + }; - + } diff --git a/modules/services/ttys/gpm.nix b/modules/services/ttys/gpm.nix index 256fe8d2380..6a425cf327f 100644 --- a/modules/services/ttys/gpm.nix +++ b/modules/services/ttys/gpm.nix @@ -7,15 +7,15 @@ let cfg = config.services.gpm; in - + { ###### interface options = { - + services.gpm = { - + enable = mkOption { default = false; description = '' @@ -23,16 +23,16 @@ in which enables mouse support in virtual consoles. ''; }; - + protocol = mkOption { default = "ps/2"; description = "Mouse protocol to use."; }; }; - + }; - + ###### implementation @@ -47,5 +47,5 @@ in }; }; - + } diff --git a/modules/services/ttys/mingetty.nix b/modules/services/ttys/mingetty.nix index e924d38dd60..1de075588e7 100644 --- a/modules/services/ttys/mingetty.nix +++ b/modules/services/ttys/mingetty.nix @@ -7,7 +7,7 @@ with pkgs.lib; ###### interface options = { - + services.mingetty = { ttys = mkOption { @@ -47,7 +47,7 @@ with pkgs.lib; }; }; - + }; @@ -55,25 +55,25 @@ with pkgs.lib; config = { - # Generate a separate job for each tty. + # Generate a separate job for each tty. jobs = listToAttrs (map (tty: nameValuePair tty { - + startOn = "started udev and filesystem"; exec = "${pkgs.mingetty}/sbin/mingetty --loginprog=${pkgs.shadow}/bin/login --noclear ${tty}"; - + }) config.services.mingetty.ttys); environment.etc = singleton { # Friendly greeting on the virtual consoles. source = pkgs.writeText "issue" '' - + [1;32m${config.services.mingetty.greetingLine}[0m ${config.services.mingetty.helpLine} - + ''; target = "issue"; }; }; - + } diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix index c6cbac5e611..a7e0472cd3f 100644 --- a/modules/services/web-servers/apache-httpd/default.nix +++ b/modules/services/web-servers/apache-httpd/default.nix @@ -5,7 +5,7 @@ with pkgs.lib; let mainCfg = config.services.httpd; - + startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces"; httpd = pkgs.apacheHttpd; @@ -16,7 +16,7 @@ let extraForeignModules = filter builtins.isAttrs extraModules; extraApacheModules = filter (x: !(builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet - + makeServerInfo = cfg: { # Canonical name must not include a trailing slash. canonicalName = @@ -40,7 +40,7 @@ let }; vhosts = let - makeVirtualHost = cfgIn: + makeVirtualHost = cfgIn: let # Fill in defaults for missing options. cfg = addDefaultOptionValues vhostOptions cfgIn; @@ -49,11 +49,11 @@ let allHosts = [mainCfg] ++ vhosts; - + callSubservices = serverInfo: defs: let f = svc: - let + let svcFunction = if svc ? function then svc.function else import "${./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix"; @@ -77,7 +77,7 @@ let in map f defs; - # !!! callSubservices is expensive + # !!! callSubservices is expensive subservicesFor = cfg: callSubservices (makeServerInfo cfg) cfg.extraSubservices; mainSubservices = subservicesFor mainCfg; @@ -91,10 +91,10 @@ let enableSSL = any (vhost: vhost.enableSSL) allHosts; - + # Names of modules from ${httpd}/modules that we want to load. - apacheModules = + apacheModules = [ # HTTP authentication mechanisms: basic and digest. "auth_basic" "auth_digest" @@ -110,10 +110,10 @@ let "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs" "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling" "userdir" "alias" "rewrite" "proxy" "proxy_http" - ] + ] ++ optional enableSSL "ssl" ++ extraApacheModules; - + loggingConf = '' ErrorLog ${mainCfg.logDir}/error_log @@ -208,7 +208,7 @@ let SSLCertificateFile ${cfg.sslServerCert} SSLCertificateKeyFile ${cfg.sslServerKey} '' else ""} - + ${if cfg.enableSSL then '' SSLEngine on '' else if enableSSL then /* i.e., SSL is enabled for some host, but not this one */ @@ -230,10 +230,10 @@ let ${if isMainServer || cfg.documentRoot != null then documentRootConf else ""} ${if cfg.enableUserDir then '' - + UserDir public_html UserDir disabled root - + <Directory "/home/*/public_html"> AllowOverride FileInfo AuthConfig Limit Indexes Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec @@ -246,7 +246,7 @@ let Deny from all </LimitExcept> </Directory> - + '' else ""} ${if cfg.globalRedirect != "" then '' @@ -278,9 +278,9 @@ let ${cfg.extraConfig} ''; - + httpdConf = pkgs.writeText "httpd.conf" '' - + ServerRoot ${httpd} PidFile ${mainCfg.stateDir}/httpd.pid @@ -305,7 +305,7 @@ let concatMap (svc: svc.extraModulesPre) allSubservices ++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++ optional enablePHP { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; } - ++ concatMap (svc: svc.extraModules) allSubservices + ++ concatMap (svc: svc.extraModules) allSubservices ++ extraForeignModules; in concatMapStrings load allModules } @@ -325,7 +325,7 @@ let Include ${httpd}/conf/extra/httpd-autoindex.conf Include ${httpd}/conf/extra/httpd-multilang-errordoc.conf Include ${httpd}/conf/extra/httpd-languages.conf - + ${if enableSSL then sslConf else ""} # Fascist default - deny access to everything. @@ -346,7 +346,7 @@ let # Generate directives for the main server. ${perServerConf true mainCfg} - + # Always enable virtual hosts; it doesn't seem to hurt. ${let ports = map getPort allHosts; @@ -387,9 +387,9 @@ in ###### interface options = { - + services.httpd = { - + enable = mkOption { default = false; description = " @@ -609,5 +609,5 @@ in }; }; - + } diff --git a/modules/services/web-servers/apache-httpd/mediawiki.nix b/modules/services/web-servers/apache-httpd/mediawiki.nix index c5c892825f4..d45d477b671 100644 --- a/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -5,13 +5,13 @@ with pkgs.lib; let src_clean_skin = pkgs.fetchurl { - url = "http://lastlog.de/misc/clean-1.01.tar.gz"; - sha256 = "5fb1736b64b33ca3429d035f1358cf8217da2d02019d8a80b14c7985367f659f"; + url = "http://lastlog.de/misc/clean-1.01.tar.gz"; + sha256 = "5fb1736b64b33ca3429d035f1358cf8217da2d02019d8a80b14c7985367f659f"; }; src_nixos_skin = pkgs.fetchurl { - url = "http://lastlog.de/misc/nixos-1.0.tar.gz"; - sha256 = "413b0f451bde81ac2dd0bede17dd088f9abcd0f3cea1722279311ca648a855cf"; + url = "http://lastlog.de/misc/nixos-1.0.tar.gz"; + sha256 = "413b0f451bde81ac2dd0bede17dd088f9abcd0f3cea1722279311ca648a855cf"; }; mediawikiConfig = pkgs.writeText "LocalSettings.php" @@ -83,7 +83,7 @@ let # Unpack Mediawiki and put the config file in its root directory. mediawikiRoot = pkgs.stdenv.mkDerivation rec { name= "mediawiki-1.15.5"; - + src = pkgs.fetchurl { url = "http://download.wikimedia.org/mediawiki/1.15/${name}.tar.gz"; sha256 = "1d8afbdh3lsg54b69mnh6a47psb3lg978xpp277qs08yz15cjf7q"; @@ -116,7 +116,7 @@ let --add-flags ${mediawikiRoot}/maintenance/$i done ''; - + in { @@ -132,7 +132,7 @@ in Options -Indexes </Directory> ''} - + Alias ${config.urlPrefix} ${mediawikiRoot} <Directory ${mediawikiRoot}> @@ -170,7 +170,7 @@ in default = "mediawiki"; description = "Name of the database that holds the MediaWiki data."; }; - + dbServer = mkOption { default = ""; # use a Unix domain socket example = "10.0.2.2"; @@ -185,7 +185,7 @@ in default = "mediawiki"; description = "The user name for accessing the database."; }; - + dbPassword = mkOption { default = ""; example = "foobar"; @@ -194,7 +194,7 @@ in cleartext in the Nix store! ''; }; - + emergencyContact = mkOption { default = serverInfo.serverConfig.adminAddr; example = "admin@example.com"; @@ -203,7 +203,7 @@ in admin address. ''; }; - + passwordSender = mkOption { default = serverInfo.serverConfig.adminAddr; example = "password@example.com"; @@ -277,7 +277,7 @@ in extraPath = [ mediawikiScripts ]; # !!! Need to specify that Apache has a dependency on PostgreSQL! - + startupScript = pkgs.writeScript "mediawiki_startup.sh" # Initialise the database automagically if we're using a Postgres # server on localhost. diff --git a/modules/services/web-servers/apache-httpd/mercurial.nix b/modules/services/web-servers/apache-httpd/mercurial.nix index 45cb8197917..ad1c332a657 100644 --- a/modules/services/web-servers/apache-httpd/mercurial.nix +++ b/modules/services/web-servers/apache-httpd/mercurial.nix @@ -5,9 +5,9 @@ let inherit (pkgs.lib) mkOption; urlPrefix = config.urlPrefix; - + cgi = pkgs.stdenv.mkDerivation { - name = "mercurial-cgi"; + name = "mercurial-cgi"; buildCommand = '' ensureDir $out cp -v ${mercurial}/share/cgi-bin/hgweb.cgi $out @@ -21,7 +21,7 @@ let " > $out/hgweb.config ''; }; - + in { extraConfig = '' @@ -45,18 +45,18 @@ in { PassEnv PYTHONPATH </Directory> ''; - + robotsEntries = '' User-agent: * Disallow: ${urlPrefix} ''; - + extraServerPath = [ - (pkgs.python+"/bin") + (pkgs.python+"/bin") ]; - + globalEnvVars = [ { name = "PYTHONPATH"; value = "${mercurial}/lib/${pkgs.python.libPrefix}/site-packages"; } ]; - + options = { urlPrefix = mkOption { default = "/hg"; @@ -65,7 +65,7 @@ in { Use the empty string to have it appear in the server root. "; }; - + dataDir = mkOption { example = "/data/mercurial"; description = " @@ -73,5 +73,5 @@ in { "; }; }; - + } diff --git a/modules/services/web-servers/apache-httpd/per-server-options.nix b/modules/services/web-servers/apache-httpd/per-server-options.nix index 8a2ee0e849a..00b82550bbe 100644 --- a/modules/services/web-servers/apache-httpd/per-server-options.nix +++ b/modules/services/web-servers/apache-httpd/per-server-options.nix @@ -40,9 +40,9 @@ # Note: sslServerCert and sslServerKey can be left empty, but this # only makes sense for virtual hosts (they will inherit from the # main server). - + sslServerCert = mkOption { - default = ""; + default = ""; example = "/var/host.cert"; description = " Path to server SSL certificate. diff --git a/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/modules/services/web-servers/apache-httpd/tomcat-connector.nix index 00cca42c6e0..f815eeb290c 100644 --- a/modules/services/web-servers/apache-httpd/tomcat-connector.nix +++ b/modules/services/web-servers/apache-httpd/tomcat-connector.nix @@ -43,8 +43,8 @@ JkLogLevel info JkLogStampFormat "[%a %b %d %H:%M:%S %Y]" # JkOptions indicates to send SSK KEY SIZE -# Note: Changed from +ForwardURICompat. -# See http://tomcat.apache.org/security-jk.html +# Note: Changed from +ForwardURICompat. +# See http://tomcat.apache.org/security-jk.html JkOptions +ForwardKeySize +ForwardURICompatUnparsed -ForwardDirectories # JkRequestLogFormat @@ -63,13 +63,13 @@ JkMount /__application__/* loadbalancer # This directive is present with 1.2.10 and # later versions of mod_jk, and is needed for # for load balancing to work properly -# Note: Replaced JkShmFile logs/jk.shm due to SELinux issues. Refer to +# Note: Replaced JkShmFile logs/jk.shm due to SELinux issues. Refer to # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=225452 JkShmFile ${config.stateDir}/jk.shm # Static files in all Tomcat webapp context directories are served by apache JkAutoAlias /var/tomcat/webapps - + # All requests go to worker by default JkMount /* loadbalancer # Serve some static files using httpd diff --git a/modules/services/web-servers/apache-httpd/trac.nix b/modules/services/web-servers/apache-httpd/trac.nix index 676aaa83178..5e31c1f2643 100644 --- a/modules/services/web-servers/apache-httpd/trac.nix +++ b/modules/services/web-servers/apache-httpd/trac.nix @@ -3,7 +3,7 @@ with pkgs.lib; let - + # Build a Subversion instance with Apache modules and Swig/Python bindings. subversion = pkgs.subversion.override (origArgs: { bdbSupport = true; @@ -14,18 +14,18 @@ let }); pythonLib = p: "${p}/"; - + in { options = { - + projectsLocation = mkOption { description = "URL path in which Trac projects can be accessed"; default = "/projects"; }; - + projects = mkOption { description = "List of projects that should be provided by Trac. If they are not defined yet empty projects are created."; default = []; @@ -37,7 +37,7 @@ in } ]; }; - + user = mkOption { default = "wwwrun"; description = "User account under which Trac runs."; @@ -64,12 +64,12 @@ in description = "AuthName"; }; }; - + }; extraModules = singleton { name = "python"; path = "${pkgs.mod_python}/modules/mod_python.so"; }; - + extraConfig = '' <Location ${config.projectsLocation}> SetHandler mod_python @@ -89,7 +89,7 @@ in '' else ""} </LocationMatch> ''; - + globalEnvVars = singleton { name = "PYTHONPATH"; value = @@ -103,11 +103,11 @@ in subversion ]; }; - + startupScript = pkgs.writeScript "activateTrac" '' mkdir -p /var/trac chown ${config.user}:${config.group} /var/trac - + ${concatMapStrings (project: '' if [ ! -d /var/trac/${project.identifier} ] @@ -117,5 +117,5 @@ in fi '' ) (config.projects)} ''; - + } diff --git a/modules/services/web-servers/apache-httpd/zabbix.nix b/modules/services/web-servers/apache-httpd/zabbix.nix index 3c2a30322f4..66b6c0ea9b0 100644 --- a/modules/services/web-servers/apache-httpd/zabbix.nix +++ b/modules/services/web-servers/apache-httpd/zabbix.nix @@ -29,10 +29,10 @@ in max_execution_time = 300 mbstring.func_overload = 2 ''; - + extraConfig = '' Alias ${config.urlPrefix}/ ${zabbixPHP}/ - + <Directory ${zabbixPHP}> DirectoryIndex index.php Order deny,allow diff --git a/modules/services/web-servers/jboss/default.nix b/modules/services/web-servers/jboss/default.nix index a1bdce50eee..e1bcede6563 100644 --- a/modules/services/web-servers/jboss/default.nix +++ b/modules/services/web-servers/jboss/default.nix @@ -5,7 +5,7 @@ with pkgs.lib; let cfg = config.services.jboss; - + jbossService = pkgs.stdenv.mkDerivation { name = "jboss-server"; builder = ./builder.sh; @@ -20,9 +20,9 @@ in ###### interface options = { - + services.jboss = { - + enable = mkOption { default = false; description = "Whether to enable jboss"; @@ -62,7 +62,7 @@ in default = false; description = "Whether to use to connector to the Apache HTTP server"; }; - + }; }; @@ -79,5 +79,5 @@ in }; }; - + } diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix index 83b95655011..078877b15bc 100644 --- a/modules/services/web-servers/tomcat.nix +++ b/modules/services/web-servers/tomcat.nix @@ -5,7 +5,7 @@ with pkgs.lib; let cfg = config.services.tomcat; - + in { @@ -13,9 +13,9 @@ in ###### interface options = { - + services.tomcat = { - + enable = mkOption { default = false; description = "Whether to enable Apache Tomcat"; @@ -31,16 +31,16 @@ in example = [ "users" ]; description = "Defines extra groups to which the tomcat user belongs."; }; - + user = mkOption { default = "tomcat"; description = "User account under which Apache Tomcat runs."; - }; + }; group = mkOption { default = "tomcat"; description = "Group account under which Apache Tomcat runs."; - }; + }; javaOpts = mkOption { default = ""; @@ -73,12 +73,12 @@ in }; logPerVirtualHost = mkOption { - default = false; + default = false; description = "Whether to enable logging per virtual host."; - }; + }; axis2 = { - + enable = mkOption { default = false; description = "Whether to enable an Apache Axis2 container"; @@ -88,9 +88,9 @@ in default = []; description = "List containing AAR files or directories with AAR files which are web services to be deployed on Axis2"; }; - + }; - + }; }; @@ -104,7 +104,7 @@ in { name = "tomcat"; gid = config.ids.gids.tomcat; }; - + users.extraUsers = singleton { name = "tomcat"; uid = config.ids.uids.tomcat; @@ -112,7 +112,7 @@ in home = "/homeless-shelter"; extraGroups = cfg.extraGroups; }; - + jobs.tomcat = { description = "Apache Tomcat server"; @@ -122,62 +122,62 @@ in environment = { TZ = config.time.timeZone; }; preStart = - '' + '' # Create the base directory mkdir -p ${cfg.baseDir} - + # Create a symlink to the bin directory of the tomcat component ln -sfn ${pkgs.tomcat6}/bin ${cfg.baseDir}/bin - + # Create a conf/ directory mkdir -p ${cfg.baseDir}/conf chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf - + # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml) for i in $(ls ${pkgs.tomcat6}/conf | grep -v catalina.properties | grep -v server.xml) do ln -sfn ${pkgs.tomcat6}/conf/$i ${cfg.baseDir}/conf/`basename $i` done - + # Create subdirectory for virtual hosts mkdir -p ${cfg.baseDir}/virtualhosts - - # Create a modified catalina.properties file + + # Create a modified catalina.properties file # Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries sed -e 's|''${catalina.home}|''${catalina.base}|g' \ -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \ ${pkgs.tomcat6}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties - + # Create a modified server.xml which also includes all virtual hosts sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\ ${ toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" >${if cfg.logPerVirtualHost then ''<Valve className=\"org.apache.catalina.valves.AccessLogValve\" directory=\"logs/${virtualHost.name}\" prefix=\"${virtualHost.name}_access_log.\" pattern=\"combined\" resolveHosts=\"false\"/>'' else ""}</Host>'') cfg.virtualHosts)}" \ ${pkgs.tomcat6}/conf/server.xml > ${cfg.baseDir}/conf/server.xml - + # Create a logs/ directory mkdir -p ${cfg.baseDir}/logs chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs - ${if cfg.logPerVirtualHost then + ${if cfg.logPerVirtualHost then toString (map (h: '' mkdir -p ${cfg.baseDir}/logs/${h.name} chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name} '') cfg.virtualHosts) else ''''} - + # Create a temp/ directory mkdir -p ${cfg.baseDir}/temp chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/temp - # Create a lib/ directory + # Create a lib/ directory mkdir -p ${cfg.baseDir}/lib chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/lib - + # Create a shared/lib directory mkdir -p ${cfg.baseDir}/shared/lib chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/shared/lib - + # Create a webapps/ directory mkdir -p ${cfg.baseDir}/webapps chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps - + # Symlink all the given common libs files or paths into the lib/ directory for i in ${pkgs.tomcat6} ${toString cfg.commonLibs} do @@ -189,13 +189,13 @@ in then # If the given web application is a directory, then iterate over the files # in the special purpose directories and symlink them into the tomcat tree - + for j in $i/lib/* do ln -sfn $j ${cfg.baseDir}/lib/`basename $j` done fi - done + done # Symlink all the given shared libs files or paths into the shared/lib/ directory for i in ${toString cfg.sharedLibs} @@ -208,14 +208,14 @@ in then # If the given web application is a directory, then iterate over the files # in the special purpose directories and symlink them into the tomcat tree - + for j in $i/shared/lib/* do ln -sfn $j ${cfg.baseDir}/shared/lib/`basename $j` done fi - done - + done + # Symlink all the given web applications files or paths into the webapps/ directory for i in ${toString cfg.webapps} do @@ -227,12 +227,12 @@ in then # If the given web application is a directory, then iterate over the files # in the special purpose directories and symlink them into the tomcat tree - + for j in $i/webapps/* do ln -sfn $j ${cfg.baseDir}/webapps/`basename $j` done - + # Also symlink the configuration files if they are included if [ -d $i/conf/Catalina ] then @@ -243,15 +243,15 @@ in done fi fi - done - + done + ${toString (map (virtualHost: '' # Create webapps directory for the virtual host mkdir -p ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps - + # Modify ownership chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps - + # Symlink all the given web applications files or paths into the webapps/ directory # of this virtual host for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}" @@ -264,12 +264,12 @@ in then # If the given web application is a directory, then iterate over the files # in the special purpose directories and symlink them into the tomcat tree - + for j in $i/webapps/* do ln -sfn $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j` done - + # Also symlink the configuration files if they are included if [ -d $i/conf/Catalina ] then @@ -279,27 +279,27 @@ in ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j` done fi - fi + fi done - + '' ) cfg.virtualHosts) } - + # Create a work/ directory mkdir -p ${cfg.baseDir}/work chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/work - + ${if cfg.axis2.enable then '' # Copy the Axis2 web application cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps - + # Turn off addressing, which causes many errors sed -i -e 's%<module ref="addressing"/>%<!-- <module ref="addressing"/> -->%' ${cfg.baseDir}/webapps/axis2/WEB-INF/conf/axis2.xml - + # Modify permissions on the Axis2 application chown -R ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps/axis2 - + # Symlink all the given web service files or paths into the webapps/axis2/WEB-INF/services directory for i in ${toString cfg.axis2.services} do @@ -311,12 +311,12 @@ in then # If the given web application is a directory, then iterate over the files # in the special purpose directories and symlink them into the tomcat tree - + for j in $i/webapps/axis2/WEB-INF/services/* do ln -sfn $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j` done - + # Also symlink the configuration files if they are included if [ -d $i/conf/Catalina ] then @@ -326,13 +326,13 @@ in done fi fi - done + done '' else ""} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${pkgs.tomcat6}/bin/startup.sh' ''; - + postStop = '' echo "Stopping tomcat..." diff --git a/modules/services/x11/desktop-managers/default.nix b/modules/services/x11/desktop-managers/default.nix index d1343c1c0ec..79d65b19699 100644 --- a/modules/services/x11/desktop-managers/default.nix +++ b/modules/services/x11/desktop-managers/default.nix @@ -10,7 +10,7 @@ let # Whether desktop manager `d' is capable of setting a background. # If it isn't, the `feh' program is used as a fallback. needBGCond = d: ! (d ? bgSupport && d.bgSupport); - + in { @@ -20,7 +20,7 @@ in imports = [ ./none.nix ./xterm.nix ./xfce.nix ./gnome.nix ./kde4.nix ]; options = { - + services.xserver.desktopManager = { session = mkOption { @@ -64,7 +64,7 @@ in }; }; - + }; config = { diff --git a/modules/services/x11/desktop-managers/kde4.nix b/modules/services/x11/desktop-managers/kde4.nix index 3be115094d5..cce5ef54df1 100644 --- a/modules/services/x11/desktop-managers/kde4.nix +++ b/modules/services/x11/desktop-managers/kde4.nix @@ -30,7 +30,7 @@ in }; - + config = mkIf (xcfg.enable && cfg.enable) { # If KDE 4 is enabled, make it the default desktop manager (unless @@ -86,7 +86,7 @@ in (if !isKDE47 then # KDE <= 4.6 [ # temporary workarounds - pkgs.shared_desktop_ontologies + pkgs.shared_desktop_ontologies pkgs.strigi pkgs.kde4.kdelibs diff --git a/modules/services/x11/desktop-managers/xfce.nix b/modules/services/x11/desktop-managers/xfce.nix index eccba4ec480..25d3f4d11e1 100644 --- a/modules/services/x11/desktop-managers/xfce.nix +++ b/modules/services/x11/desktop-managers/xfce.nix @@ -22,7 +22,7 @@ in }; - + config = mkIf (xcfg.enable && cfg.enable) { services.xserver.desktopManager.session = singleton @@ -32,7 +32,7 @@ in '' # Set GTK_PATH so that GTK+ can find the Xfce theme engine. export GTK_PATH=${pkgs.xfce.gtk_xfce_engine}/lib/gtk-2.0 - + # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes. export GTK_DATA_PREFIX=${config.system.path} @@ -86,12 +86,12 @@ in '' export GIO_EXTRA_MODULES=${pkgs.xfce.gvfs}/lib/gio/modules ''; - + # Enable helpful DBus services. services.hal = mkIf (!isXfce48) { enable = true; }; services.udisks = mkIf isXfce48 { enable = true; }; services.upower = mkIf (isXfce48 && config.powerManagement.enable) { enable = true; }; - + }; } diff --git a/modules/services/x11/desktop-managers/xterm.nix b/modules/services/x11/desktop-managers/xterm.nix index 8524c0c6544..7aa70269dc4 100644 --- a/modules/services/x11/desktop-managers/xterm.nix +++ b/modules/services/x11/desktop-managers/xterm.nix @@ -14,7 +14,7 @@ let }; }; - + in mkIf cfg.enable { diff --git a/modules/services/x11/display-managers/auto.nix b/modules/services/x11/display-managers/auto.nix index e2b1ee42e83..cccc6e62a15 100644 --- a/modules/services/x11/display-managers/auto.nix +++ b/modules/services/x11/display-managers/auto.nix @@ -14,9 +14,9 @@ in ###### interface options = { - + services.xserver.displayManager.auto = { - + enable = mkOption { default = false; description = '' @@ -42,7 +42,7 @@ in config = mkIf cfg.enable { services.xserver.displayManager.slim.enable = false; - + services.xserver.displayManager.job = { execCmd = '' diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix index 7e21f27ff69..2261d417d04 100644 --- a/modules/services/x11/display-managers/default.nix +++ b/modules/services/x11/display-managers/default.nix @@ -207,24 +207,24 @@ in description = "This option defines how to start the display manager."; options = { - + preStart = mkOption { default = ""; example = "rm -f /var/log/my-display-manager.log"; description = "Script executed before the display manager is started."; }; - + execCmd = mkOption { example = "${pkgs.slim}/bin/slim"; description = "Command to start the display manager."; }; - + environment = mkOption { default = {}; example = { SLIM_CFGFILE = /etc/slim.conf; }; description = "Additional environment variables needed by the display manager."; }; - + logsXsession = mkOption { default = false; description = '' @@ -233,13 +233,13 @@ in <filename>~/.xsession-errors</filename>. ''; }; - + }; - + }; }; - + }; } diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix index f82e83d7e49..cfcf62e487e 100644 --- a/modules/services/x11/display-managers/kdm.nix +++ b/modules/services/x11/display-managers/kdm.nix @@ -36,11 +36,11 @@ let [X-*-Greeter] HiddenUsers=root,nixbld1,nixbld2,nixbld3,nixbld4,nixbld5,nixbld6,nixbld7,nixbld8,nixbld9,nixbld10 PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so - + ${optionalString (cfg.enableXDMCP) '' [Xdmcp] - Enable=true + Enable=true ''} ''; @@ -59,11 +59,11 @@ in { ###### interface - + options = { services.xserver.displayManager.kdm = { - + enable = mkOption { default = false; description = '' @@ -85,18 +85,18 @@ in configuration file of KDM. ''; }; - + }; }; - - + + ###### implementation - + config = mkIf cfg.enable { services.xserver.displayManager.slim.enable = false; - + services.xserver.displayManager.job = { execCmd = '' @@ -109,7 +109,7 @@ in }; security.pam.services = [ { name = "kde"; } ]; - + users.extraUsers = singleton { name = "kdm"; uid = config.ids.uids.kdm; @@ -117,5 +117,5 @@ in }; }; - + } diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix index 0e48cae7423..6e34bc2eb51 100644 --- a/modules/services/x11/display-managers/slim.nix +++ b/modules/services/x11/display-managers/slim.nix @@ -41,9 +41,9 @@ in ###### interface options = { - + services.xserver.displayManager.slim = { - + enable = mkOption { default = true; description = '' diff --git a/modules/services/x11/hardware/multitouch.nix b/modules/services/x11/hardware/multitouch.nix index d360902f2ab..ae0ae2e5a3a 100644 --- a/modules/services/x11/hardware/multitouch.nix +++ b/modules/services/x11/hardware/multitouch.nix @@ -28,7 +28,7 @@ with pkgs.lib; Section "InputClass" MatchIsTouchpad "true" Identifier "Multitouch Touchpad" - Driver "multitouch" + Driver "multitouch" EndSection ''; diff --git a/modules/services/x11/hardware/synaptics.nix b/modules/services/x11/hardware/synaptics.nix index 2cb85aaeb52..554180049be 100644 --- a/modules/services/x11/hardware/synaptics.nix +++ b/modules/services/x11/hardware/synaptics.nix @@ -9,7 +9,7 @@ let cfg = config.services.xserver.synaptics; in options = { services.xserver.synaptics = { - + enable = mkOption { default = false; example = true; @@ -19,7 +19,7 @@ let cfg = config.services.xserver.synaptics; in dev = mkOption { default = null; example = "/dev/input/event0"; - description = + description = '' Path for touchpad device. Set to null to apply to any auto-detected touchpad. diff --git a/modules/services/x11/window-managers/awesome.nix b/modules/services/x11/window-managers/awesome.nix index 0746bd34b9d..880ebf1eca6 100644 --- a/modules/services/x11/window-managers/awesome.nix +++ b/modules/services/x11/window-managers/awesome.nix @@ -13,7 +13,7 @@ in ###### interface options = { - + services.xserver.windowManager.awesome.enable = mkOption { default = false; description = "Enable the Awesome window manager."; @@ -36,7 +36,7 @@ in }; environment.x11Packages = [ pkgs.awesome ]; - + }; } diff --git a/modules/services/x11/window-managers/compiz.nix b/modules/services/x11/window-managers/compiz.nix index fd439a3cddc..209401f2646 100644 --- a/modules/services/x11/window-managers/compiz.nix +++ b/modules/services/x11/window-managers/compiz.nix @@ -8,13 +8,13 @@ let xorg = config.services.xserver.package; in - + { options = { services.xserver.windowManager.compiz = { - + enable = mkOption { default = false; description = "Enable the Compiz window manager."; @@ -25,14 +25,14 @@ in example = "--indirect-rendering"; description = "Pass the <option>--indirect-rendering</option> flag to Compiz."; }; - + }; }; - + config = mkIf cfg.enable { - + services.xserver.windowManager.session = singleton { name = "compiz"; start = diff --git a/modules/services/x11/window-managers/icewm.nix b/modules/services/x11/window-managers/icewm.nix index 1aec252dea5..9da4a415fad 100644 --- a/modules/services/x11/window-managers/icewm.nix +++ b/modules/services/x11/window-managers/icewm.nix @@ -13,7 +13,7 @@ in ###### interface options = { - + services.xserver.windowManager.icewm.enable = mkOption { default = false; description = "Enable the IceWM window manager."; @@ -36,7 +36,7 @@ in }; environment.x11Packages = [ pkgs.icewm ]; - + }; } diff --git a/modules/services/x11/window-managers/twm.nix b/modules/services/x11/window-managers/twm.nix index 3c4780386ce..c1a99b97566 100644 --- a/modules/services/x11/window-managers/twm.nix +++ b/modules/services/x11/window-managers/twm.nix @@ -13,7 +13,7 @@ in ###### interface options = { - + services.xserver.windowManager.twm.enable = mkOption { default = false; description = "Enable the twm window manager."; @@ -36,7 +36,7 @@ in }; environment.x11Packages = [ pkgs.xorg.twm ]; - + }; } diff --git a/modules/services/x11/xfs.nix b/modules/services/x11/xfs.nix index 424e386b78b..edaafacc27e 100644 --- a/modules/services/x11/xfs.nix +++ b/modules/services/x11/xfs.nix @@ -5,12 +5,12 @@ with pkgs.lib; let configFile = ./xfs.conf; - + startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces"; - + in { @@ -18,7 +18,7 @@ in ###### interface options = { - + services.xfs = { enable = mkOption { @@ -40,12 +40,12 @@ in jobs.xfs = { description = "X Font Server"; - + startOn = "started ${startingDependency}"; exec = "${pkgs.xorg.xfs}/bin/xfs -config ${configFile}"; }; }); - + } diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index 15240d65cee..f1e8044fc6b 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -71,7 +71,7 @@ let done fi done - + for i in $(find ${toString cfg.modules} -type d); do if test $(echo $i/*.so* | wc -w) -ne 0; then echo " ModulePath \"$i\"" >> $out @@ -79,7 +79,7 @@ let done echo 'EndSection' >> $out - + echo "$config" >> $out ''; # */ }; @@ -96,9 +96,9 @@ in ###### interface - + options = { - + services.xserver = { enable = mkOption { @@ -311,7 +311,7 @@ in Virtual screen size for Xrandr. ''; }; - + }; environment.x11Packages = mkOption { @@ -322,7 +322,7 @@ in activated (<option>services.xserver.enable</option>). ''; }; - + }; @@ -337,7 +337,7 @@ in { boot.extraModulePackages = - optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ + optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96 ++ optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173 ++ optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++ @@ -352,7 +352,7 @@ in target = "X11/xkb"; } ]; - + environment.x11Packages = [ xorg.xorgserver xorg.xrandr @@ -370,7 +370,7 @@ in ++ optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173 ++ optional (elem "virtualbox" driverNames) xorg.xrefresh ++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11; - + environment.systemPackages = config.environment.x11Packages; environment.pathsToLink = @@ -378,7 +378,7 @@ in jobs.xserver = { startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else ""; - + environment = { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. @@ -440,7 +440,7 @@ in [ xorg.xorgserver xorg.xf86inputevdev ]; - + services.xserver.config = '' Section "ServerFlags" @@ -478,7 +478,7 @@ in # For each supported driver, add a "Device" and "Screen" # section. ${flip concatMapStrings drivers (driver: '' - + Section "Device" Identifier "Device-${driver.name}[0]" Driver "${driver.driverName}" @@ -521,7 +521,7 @@ in ''; in concatMapStrings f [8 16 24] )} - + EndSection '')} ''; |