summary refs log tree commit diff
diff options
context:
space:
mode:
authorpennae <github@quasiparticle.net>2022-08-30 13:08:40 +0200
committerpennae <github@quasiparticle.net>2022-08-31 16:27:25 +0200
commit7d102d113abd84dd29bed71cd589f1c68a7f7f3d (patch)
treebbf4f554e776a8620007cdec85b069a2af78692c
parent0cfcb5908cc7164236f78cd21e02cc168dd028ac (diff)
downloadnixpkgs-7d102d113abd84dd29bed71cd589f1c68a7f7f3d.tar
nixpkgs-7d102d113abd84dd29bed71cd589f1c68a7f7f3d.tar.gz
nixpkgs-7d102d113abd84dd29bed71cd589f1c68a7f7f3d.tar.bz2
nixpkgs-7d102d113abd84dd29bed71cd589f1c68a7f7f3d.tar.lz
nixpkgs-7d102d113abd84dd29bed71cd589f1c68a7f7f3d.tar.xz
nixpkgs-7d102d113abd84dd29bed71cd589f1c68a7f7f3d.tar.zst
nixpkgs-7d102d113abd84dd29bed71cd589f1c68a7f7f3d.zip
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.
-rw-r--r--nixos/modules/services/databases/cockroachdb.nix4
-rw-r--r--nixos/modules/services/hardware/lcd.nix4
-rw-r--r--nixos/modules/services/logging/awstats.nix8
-rw-r--r--nixos/modules/services/networking/3proxy.nix12
-rw-r--r--nixos/modules/services/networking/hylafax/options.nix4
-rw-r--r--nixos/modules/services/security/hockeypuck.nix4
-rw-r--r--nixos/modules/virtualisation/lxcfs.nix6
-rw-r--r--nixos/modules/virtualisation/lxd.nix6
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:
 
-          <literal>
+          <programlisting>
               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
-          </literal>
+          </programlisting>
         '';
       };
 
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 <command>lsusb</command> command. Example
             output:
 
-            <literal>
+            <programlisting>
             Bus 005 Device 002: ID 0403:c630 Future Technology Devices International, Ltd lcd2usb interface
-            </literal>
+            </programlisting>
 
             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
-          <literal>
+          <programlisting>
           journalctl $OLD_CURSOR -u postfix.service | ''${pkgs.perl}/bin/perl ''${pkgs.awstats.out}/share/awstats/tools/maillogconvert.pl standard |
-          </literal>
+          </programlisting>
         '';
       };
 
@@ -42,9 +42,9 @@ let
           The log format being used.
 
           For mail, set this to
-          <literal>
+          <programlisting>
           %time2 %email %email_r %host %host_r %method %url %code %bytesd
-          </literal>
+          </programlisting>
         '';
       };
 
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:
 
-        <literal>
+        <programlisting>
           test1:CL:password1
           test2:CL:password2
-        </literal>
+        </programlisting>
 
         Example users file with md5-crypted passwords:
 
-        <literal>
+        <programlisting>
           test1:CR:$1$tFkisVd2$1GA8JXkRmTXdLDytM/i3a1
           test2:CR:$1$rkpibm5J$Aq1.9VtYAn0JrqZ8M.1ME.
-        </literal>
+        </programlisting>
 
         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.
 
-              <literal>
+              <programlisting>
                 {
                   auth = [ "iponly" "strong" ];
                   acl = [
@@ -144,7 +144,7 @@ in {
                     }
                   ];
                 }
-              </literal>
+              </programlisting>
               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 <literal>uucp</literal> user.
         See hosts.hfaxd(5) for details.
         This configuration permits access for all users:
-        <literal>
+        <programlisting>
           environment.etc."hosts.hfaxd" = {
             mode = "0600";
             user = "uucp";
             text = ".*";
           };
-        </literal>
+        </programlisting>
         Note that host-based access can be controlled with
         <option>config.systemd.sockets.hylafax-hfaxd.listenStreams</option>;
         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:
-        <literal>
+        <programlisting>
           services.postgresql = {
             enable = true;
             ensureDatabases = [ "hockeypuck" ];
@@ -58,7 +58,7 @@ in {
               ensurePermissions."DATABASE hockeypuck" = "ALL PRIVILEGES";
             }];
           };
-        </literal>
+        </programlisting>
       '';
     };
   };
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:
-          <code>
-            virtualisation.lxc.defaultConfig = "lxc.include = ''${pkgs.lxcfs}/share/lxc/config/common.conf.d/00-lxcfs.conf";
-          </code>
+          <programlisting>
+          virtualisation.lxc.defaultConfig = "lxc.include = ''${pkgs.lxcfs}/share/lxc/config/common.conf.d/00-lxcfs.conf";
+          </programlisting>
         '';
       };
   };
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:
-          <code>
-            virtualisation.lxc.lxcfs.enable = true;
-          </code>
+          <programlisting>
+          virtualisation.lxc.lxcfs.enable = true;
+          </programlisting>
         '';
       };