Merge branch 'master' into add-success-attempt

Resolved symlink to nixpkgs channel before passing to nix-env command (#191 )
Co-authored-by: Jonah Bron <hi@jonah.id>
2024-03-11 08:39:34 -07:00 · 2024-03-11 08:34:49 -07:00 · 2024-03-11 08:34:16 -07:00 · 2024-03-11 08:33:32 -07:00 · 2024-03-11 08:32:24 -07:00 · 2024-03-11 08:32:00 -07:00
2 changed files with 34 additions and 18 deletions
--- a/README.md
+++ b/README.md
@ -55,7 +55,7 @@ and most importantly, simply didn't work for me!

 4) run the script with:
 ```
-  curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | NIX_CHANNEL=nixos-22.11 bash -x
+  curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | NIX_CHANNEL=nixos-23.05 bash -x
 ```

 *NB*: This script wipes out the targeted host's root filesystem when it runs to completion.
@ -72,7 +72,7 @@ and supply to it the following example yaml stanzas:
 #cloud-config

 runcmd:
-  - curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | PROVIDER=digitalocean NIX_CHANNEL=nixos-22.11 bash 2>&1 | tee /tmp/infect.log
+  - curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | PROVIDER=digitalocean NIX_CHANNEL=nixos-23.05 bash 2>&1 | tee /tmp/infect.log
 ```

 #### Potential tweaks:
@ -90,7 +90,7 @@ write_files:
      environment.systemPackages = with pkgs; [ vim ];
    }
 runcmd:
-  - curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | PROVIDER=digitalocean NIXOS_IMPORT=./host.nix NIX_CHANNEL=nixos-22.11 bash 2>&1 | tee /tmp/infect.log
+  - curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | PROVIDER=digitalocean NIXOS_IMPORT=./host.nix NIX_CHANNEL=nixos-23.05 bash 2>&1 | tee /tmp/infect.log
 ```


@ -106,6 +106,7 @@ runcmd:
 |CoreOS      |2430.0.0 (alpha) | _unable_  |2020-03-30|
 |Debian      |10.3 x64         |**success**|2020-03-30|
 |Debian      |9.12 x64         |**success**|2020-03-30|
+|Debian      |11   x64         |**success**|2023-11-12|
 |Fedora      |30 x64           |**success**|2020-03-30|
 |Fedora      |31 x64           |**success**|2020-03-30|
 |FreeBSD     |11.3 x64 ufs     | _failure_ |2020-03-30|
@ -120,6 +121,7 @@ runcmd:
 |Ubuntu      |20.04 x64        |**success**|2022-03-23|
 |Ubuntu      |22.04 x64        |**success**|2023-06-05|
 |Ubuntu      |22.10 x64        | _failure_ |2023-06-05|
+|Ubuntu      |23.10 x64        | _failure_ |2023-11-16|

 ### Vultr
 To set up a NixOS Vultr server, instantiate an Ubuntu box with the following "Cloud-Init User-Data":
@ -127,7 +129,7 @@ To set up a NixOS Vultr server, instantiate an Ubuntu box with the following "Cl
 ```bash
 #!/bin/sh

-curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | NIX_CHANNEL=nixos-22.11 bash
+curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | NIX_CHANNEL=nixos-23.05 bash
 ```

 Allow for a few minutes over the usual Ubuntu deployment time for NixOS to download & install itself.
@ -147,7 +149,7 @@ When creating a server provide the following yaml as "Cloud config":
 #cloud-config

 runcmd:
-  - curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | PROVIDER=hetznercloud NIX_CHANNEL=nixos-22.11 bash 2>&1 | tee /tmp/infect.log
+  - curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | PROVIDER=hetznercloud NIX_CHANNEL=nixos-23.05 bash 2>&1 | tee /tmp/infect.log
 ```

 #### Tested on
@ -254,11 +256,13 @@ Requred some Xen modules to work out, after that NixOS erected itself without a
 ### Google Cloud Platform

 #### Tested on
-|Distribution |       Name      | Status    | test date| Machine type |
-|-------------|-----------------|-----------|----------|--------------|
-| Debian      | 11              |**success**|2023-11-12|ec2-micro     |
-| Ubuntu      | 20.04           |-failure-  |2023-11-12|ec2-micro     |
-| Ubuntu      | 20.04           |**success**|2022-09-07|Ampere Ultra  |
+|Distribution                         |       Name      | Status    | test date| Machine type |
+|-------------------------------------|-----------------|-----------|----------|--------------|
+| Debian                              | 11              |**success**|2023-11-12|ec2-micro     |
+| Debian (Amd64)                      | 11              |**success**|2023-11-12|              |
+| Ubuntu on Ampere Altra (Arm64)      | 20.04           |**success**|2022-09-07|              |
+| Ubuntu                              | 20.04           |**success**|2022-09-07|Ampere Ultra  |
+| Ubuntu                              | 20.04           |-failure-  |2023-11-12|ec2-micro     |

 ### Contabo
 Tested on Cloud VPS. Contabo sets the hostname to something like `vmi######.contaboserver.net`, Nixos only allows RFC 1035 compliant hostnames ([see here](https://search.nixos.org/options?show=networking.hostName&query=hostname)). Run `hostname something_without_dots` before running the script. If you run the script before changing the hostname - remove the `/etc/nixos/configuration.nix` so it's regenerated with the new hostname.
@ -276,7 +280,7 @@ build time or using `ssh-copy-id` before running nixos-infect
 ```
 #!/bin/sh

-curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | NIX_CHANNEL=nixos-22.11 bash 2>&1 | tee /tmp/infect.log
+curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | NIX_CHANNEL=nixos-23.05 bash 2>&1 | tee /tmp/infect.log
 ```

 #### Tested on
@ -304,7 +308,7 @@ Tested on vServer. The network configuration seems to be important so the same t
 ### ServArica
 Requires the same static network settings that Digital Ocean does.

-    curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | PROVIDER=servarica NIX_CHANNEL=nixos-22.11 bash
+    curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | PROVIDER=servarica NIX_CHANNEL=nixos-23.05 bash

 #### Tested on
 |Distribution|       Name      | Status    | test date|
@ -335,7 +339,7 @@ write_files:
      environment.systemPackages = with pkgs; [ tmux ];
    }
 runcmd:
-  - curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect |  NIXOS_IMPORT=./host.nix NIX_CHANNEL=nixos-22.10 bash 2>&1 | tee /tmp/infect.log
+  - curl https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect |  NIXOS_IMPORT=./host.nix NIX_CHANNEL=nixos-23.05 bash 2>&1 | tee /tmp/infect.log
 ```

 #### Tested on
@ -351,7 +355,7 @@ and have a copy of the private key on your local box.

 On RackNerd's Ubuntu 20.04, there's no `curl` by default, so `wget -O-` needs to be used instead:
 ```command
-# wget -O- https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | NIX_CHANNEL=nixos-22.11 bash -x
+# wget -O- https://raw.githubusercontent.com/elitak/nixos-infect/master/nixos-infect | NIX_CHANNEL=nixos-23.05 bash -x
 ```

 #### Tested on
--- a/20
+++ b/20
@ -4,6 +4,12 @@

 set -e -o pipefail

+autodetectProvider() {
+  if [ -e /etc/hetzner-build ]; then
+    PROVIDER="hetznercloud"
+  fi
+}
+
 makeConf() {
  # Skip everything if main config already present
  [[ -e /etc/nixos/configuration.nix ]] && return 0
@ -20,7 +26,7 @@ makeConf() {
  local IFS=$'\n'
  for trypath in /root/.ssh/authorized_keys /home/$SUDO_USER/.ssh/authorized_keys $HOME/.ssh/authorized_keys; do
      [[ -r "$trypath" ]] \
-      && keys=$(sed -E 's/^.*((ssh|ecdsa)-[^[:space:]]+)[[:space:]]+([^[:space:]]+)([[:space:]]*.*)$/\1 \3\4/' "$trypath") \
+      && keys=$(sed -E 's/^[^#].*[[:space:]]((sk-ssh|sk-ecdsa|ssh|ecdsa)-[^[:space:]]+)[[:space:]]+([^[:space:]]+)([[:space:]]*.*)$/\1 \3\4/' "$trypath") \
      && [[ ! -z "$keys" ]] \
      && break
  done
@ -35,7 +41,7 @@ makeConf() {
    $NIXOS_IMPORT
  ];

-  boot.cleanTmpDir = true;
+  boot.tmp.cleanOnBoot = true;
  zramSwap.enable = ${zramswap};
  networking.hostName = "$(hostname -s)";
  networking.domain = "$(hostname -d)";
@ -45,6 +51,7 @@ makeConf() {
    trimmed_line=$(echo -n "$line" | xargs)
    echo -n "''$trimmed_line'' "
  done <<< "$keys")];
+  system.stateVersion = "23.11";
 }
 EOF

@ -89,9 +96,10 @@ EOF
 makeLightsailConf() {
  mkdir -p /etc/nixos
  cat > /etc/nixos/configuration.nix << EOF
-{ config, pkgs, modulesPath, ... }:
+{ config, pkgs, modulesPath, lib, ... }:
 {
  imports = [ "\${modulesPath}/virtualisation/amazon-image.nix" ];
+  boot.loader.grub.device = lib.mkForce "/dev/nvme0n1";
 }
 EOF
 }
@ -337,7 +345,7 @@ infect() {
  export NIXOS_CONFIG="${NIXOS_CONFIG:-/etc/nixos/configuration.nix}"

  nix-env --set \
-    -I nixpkgs=$HOME/.nix-defexpr/channels/nixos \
+    -I nixpkgs=$(realpath $HOME/.nix-defexpr/channels/nixos) \
    -f '<nixpkgs/nixos>' \
    -p /nix/var/nix/profiles/system \
    -A system
@ -374,6 +382,10 @@ infect() {
  /nix/var/nix/profiles/system/bin/switch-to-configuration boot
 }

+if [ ! -v PROVIDER ]; then
+  autodetectProvider
+fi
+
 [ "$PROVIDER" = "digitalocean" ] && doNetConf=y # digitalocean requires detailed network config to be generated
 [ "$PROVIDER" = "lightsail" ] && newrootfslabel="nixos"
 if [[ "$PROVIDER" = "digitalocean" ]] || [[ "$PROVIDER" = "servarica" ]] || [[ "$PROVIDER" = "hetznercloud" ]]; then
Author	SHA1	Message	Date
Eric Litak	ba1d3bf0f5	Merge branch 'master' into add-success-attempt	2024-03-11 08:39:34 -07:00
Jonah Dahlquist	45e2361a9e	Resolved symlink to nixpkgs channel before passing to nix-env command (#191 ) Co-authored-by: Jonah Bron <hi@jonah.id>	2024-03-11 08:34:49 -07:00
Dominik Gleich	bbe94a1175	fix: Authorized keys parsing and extraction (#187 ) * add support for SK authorized keys nixos-infect incorrectly handles * Update nixos-infect * Replace space with [[:space:]] * Fix possible security issue	2024-03-11 08:34:16 -07:00
iosmanthus	095fcbc28d	change lightsail boot device to /dev/nvme0n1 (#186 ) * change lightsail boot device to /dev/nvme0n1 Signed-off-by: iosmanthus <myosmanthustree@gmail.com> * fix missing import Signed-off-by: iosmanthus <myosmanthustree@gmail.com> --------- Signed-off-by: iosmanthus <myosmanthustree@gmail.com>	2024-03-11 08:33:32 -07:00
Donovan Glover	20b43baa2a	chore: Rename boot.cleanTmpDir to boot.tmp.cleanOnBoot (#181 )	2024-03-11 08:32:24 -07:00
Sridhar Ratnakumar	de39be8be7	readme/DO: Mark ubuntu 23.10 as failure (#180 )	2024-03-11 08:32:00 -07:00
Donovan Glover	f6d3db8432	chore(docs): Update channel version to 23.05 (#178 )	2024-03-11 08:31:38 -07:00
Star	2ef79962d8	Update README (#176 ) * Update README.md Add successful cases running on Google Cloud Debian11 * Update README.md	2024-03-11 08:30:52 -07:00
Maciej Krüger	6712970770	Add provider autodetection for hetzner (#174 )	2024-03-11 08:30:14 -07:00
Jonah Dahlquist	9c5b46d78e	Added explicit system.stateVersion to match channel set (#194 ) * Added explicit system.stateVersion to match channel set * Channel and state version are not the same thing, pinning a recent state version.	2024-01-31 08:16:15 -08:00