From 7d102d113abd84dd29bed71cd589f1c68a7f7f3d Mon Sep 17 00:00:00 2001 From: pennae Date: Tue, 30 Aug 2022 13:08:40 +0200 Subject: nixos/*: convert multiline inline code to listings presumably it was not intended to have these blocks rendered inline, and markdown conversion would be messy as well. --- nixos/modules/services/databases/cockroachdb.nix | 4 ++-- nixos/modules/services/hardware/lcd.nix | 4 ++-- nixos/modules/services/logging/awstats.nix | 8 ++++---- nixos/modules/services/networking/3proxy.nix | 12 ++++++------ nixos/modules/services/networking/hylafax/options.nix | 4 ++-- nixos/modules/services/security/hockeypuck.nix | 4 ++-- nixos/modules/virtualisation/lxcfs.nix | 6 +++--- nixos/modules/virtualisation/lxd.nix | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix index b8d7321d00f..850fed6d541 100644 --- a/nixos/modules/services/databases/cockroachdb.nix +++ b/nixos/modules/services/databases/cockroachdb.nix @@ -68,12 +68,12 @@ in like datacenter. The tiers and order must be the same on all nodes. Including more tiers is better than including fewer. For example: - + country=us,region=us-west,datacenter=us-west-1b,rack=12 country=ca,region=ca-east,datacenter=ca-east-2,rack=4 planet=earth,province=manitoba,colo=secondary,power=3 - + ''; }; diff --git a/nixos/modules/services/hardware/lcd.nix b/nixos/modules/services/hardware/lcd.nix index c817225c1f2..7eb5f58d9fb 100644 --- a/nixos/modules/services/hardware/lcd.nix +++ b/nixos/modules/services/hardware/lcd.nix @@ -72,9 +72,9 @@ in with lib; { values, you can run the lsusb command. Example output: - + Bus 005 Device 002: ID 0403:c630 Future Technology Devices International, Ltd lcd2usb interface - + In this case the vendor id is 0403 and the product id is c630. ''; diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix index ad87c3bd907..3d116f1118e 100644 --- a/nixos/modules/services/logging/awstats.nix +++ b/nixos/modules/services/logging/awstats.nix @@ -29,9 +29,9 @@ let The log file to be scanned. For mail, set this to - + journalctl $OLD_CURSOR -u postfix.service | ''${pkgs.perl}/bin/perl ''${pkgs.awstats.out}/share/awstats/tools/maillogconvert.pl standard | - + ''; }; @@ -42,9 +42,9 @@ let The log format being used. For mail, set this to - + %time2 %email %email_r %host %host_r %method %url %code %bytesd - + ''; }; diff --git a/nixos/modules/services/networking/3proxy.nix b/nixos/modules/services/networking/3proxy.nix index 9fc1dac7c28..fb11f5bc05e 100644 --- a/nixos/modules/services/networking/3proxy.nix +++ b/nixos/modules/services/networking/3proxy.nix @@ -23,17 +23,17 @@ in { Example users file with plain-text passwords: - + test1:CL:password1 test2:CL:password2 - + Example users file with md5-crypted passwords: - + test1:CR:$1$tFkisVd2$1GA8JXkRmTXdLDytM/i3a1 test2:CR:$1$rkpibm5J$Aq1.9VtYAn0JrqZ8M.1ME. - + You can generate md5-crypted passwords via https://unix4lyfe.org/crypt/ Note that htpasswd tool generates incompatible md5-crypted passwords. @@ -130,7 +130,7 @@ in { Double authentication is possible, e.g. - + { auth = [ "iponly" "strong" ]; acl = [ @@ -144,7 +144,7 @@ in { } ]; } - + In this example strong username authentication is not required to access 192.168.0.0/16. ''; }; diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix index 79275d628b6..4b013ec5549 100644 --- a/nixos/modules/services/networking/hylafax/options.nix +++ b/nixos/modules/services/networking/hylafax/options.nix @@ -180,13 +180,13 @@ in readable only by the uucp user. See hosts.hfaxd(5) for details. This configuration permits access for all users: - + environment.etc."hosts.hfaxd" = { mode = "0600"; user = "uucp"; text = ".*"; }; - + Note that host-based access can be controlled with ; by default, only 127.0.0.1 is permitted to connect. diff --git a/nixos/modules/services/security/hockeypuck.nix b/nixos/modules/services/security/hockeypuck.nix index 6fdad13f255..43e90c64605 100644 --- a/nixos/modules/services/security/hockeypuck.nix +++ b/nixos/modules/services/security/hockeypuck.nix @@ -49,7 +49,7 @@ in { the database yourself. Example: - + services.postgresql = { enable = true; ensureDatabases = [ "hockeypuck" ]; @@ -58,7 +58,7 @@ in { ensurePermissions."DATABASE hockeypuck" = "ALL PRIVILEGES"; }]; }; - + ''; }; }; diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix index b2457403463..7d2879a95f4 100644 --- a/nixos/modules/virtualisation/lxcfs.nix +++ b/nixos/modules/virtualisation/lxcfs.nix @@ -19,9 +19,9 @@ in { This enables LXCFS, a FUSE filesystem for LXC. To use lxcfs in include the following configuration in your container configuration: - - virtualisation.lxc.defaultConfig = "lxc.include = ''${pkgs.lxcfs}/share/lxc/config/common.conf.d/00-lxcfs.conf"; - + + virtualisation.lxc.defaultConfig = "lxc.include = ''${pkgs.lxcfs}/share/lxc/config/common.conf.d/00-lxcfs.conf"; + ''; }; }; diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index f1eabee5ffa..e81edf67f3c 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -26,9 +26,9 @@ in { Most of the time, you'll also want to start lxcfs, so that containers can "see" the limits: - - virtualisation.lxc.lxcfs.enable = true; - + + virtualisation.lxc.lxcfs.enable = true; + ''; }; -- cgit 1.4.1