Refactor and tidy the flake definition. #13

plietar · 2024-10-24T12:46:24Z

This removes a bunch of duplication in the deploy/start-vm/diff scripts left over from the introduction of the wpia-packit-private machine. These script now only exist as one script, that accepts a machine name as their argument.

In order to split up the flake.nix file, it makes use of the flake-parts library. This library uses the same module system as NixOS itself, but at the flake configuration level itself.

The deploy script is changed from using nixos-rebuild switch to our own implementation of it. The primary goal of this is to ensure the derivation of the built system gets deployed too, allowing us to reliable diff the system state in the future.

Co-authored-by: Rich FitzJohn <[email protected]>

This removes a bunch of duplication in the deploy/start-vm/diff scripts left over from the introduction of the wpia-packit-private machine. These script now only exist as one script, that accepts a machine name as their argument. In order to split up the `flake.nix` file, it makes use of the [`flake-parts`][flake-parts] library. This library uses the same module system as NixOS itself, but at the flake configuration level itself. The deploy script is changed from using `nixos-rebuild switch` to our own implementation of it. The primary goal of this is to ensure the derivation of the built system gets deployed too, allowing us to reliable diff the system state in the future. [flake-parts]: https://flake.parts/

github-actions · 2024-10-24T13:30:53Z

Comparing system configuration for wpia-packit against main branch

- /nix/store/5bbb2p4zc3d28xqil3n5s32m055c4r8f-nixos-system-wpia-packit-24.05.20240916.086b448.drv:{out}
+ /nix/store/30aai224bndkypilbc7kgv5vp1ay1i77-nixos-system-wpia-packit-24.05.20240916.086b448.drv:{out}
• The input derivation named `etc` differs
  - /nix/store/1mw8z7yqpaw324s58mw9s7k9ch4c07if-etc.drv:{out}
  + /nix/store/lcaary55326c2hlhms7n060zba0n215a-etc.drv:{out}
  • The input derivation named `hosts` differs
    - /nix/store/hsm835pq1nq7c5z6qm95s3byvhx23jl7-hosts.drv:{out}
    + /nix/store/vf83rclccr6zhrzrzhynkz609slmd83a-hosts.drv:{out}
    • The input derivation named `string-hosts` differs
      - /nix/store/rmbrcvg80jcy7hr4yw0n7vrb9jnl3xb5-string-hosts.drv:{out}
      + /nix/store/193kg2fxsm8zgkxa9zpdczf80jd7494j-string-hosts.drv:{out}
      • The environments do not match:
          text=''
          - 127.0.0.2 wpia-packit
          - ::1 wpia-packit
          + 127.0.0.2 wpia-packit.dide.ic.ac.uk wpia-packit
          + ::1 wpia-packit.dide.ic.ac.uk wpia-packit
      ''
    • Skipping environment comparison
  • The input derivation named `nix.conf` differs
    - /nix/store/0clghpfj0cvip2h5g802iiifgfaqkf58-nix.conf.drv:{out}
    + /nix/store/k2lkac9gl7q7hnk3rqn417z3rhjav60l-nix.conf.drv:{out}
    • The environments do not match:
        text=''
          # WARNING: this file is generated from the nix.* options in
          # your NixOS configuration, typically
          # /etc/nixos/configuration.nix.  Do not edit it!
          allowed-users = *
          auto-optimise-store = false
          builders = 
          cores = 0
          experimental-features = nix-command flakes
        + keep-derivations = true
          max-jobs = auto
          require-sigs = true
          sandbox = true
          sandbox-fallback = false
          substituters = https://cache.nixos.org/
          system-features = nixos-test benchmark big-parallel kvm
          trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
          trusted-substituters = 
          trusted-users = root
          extra-sandbox-paths = 
        
    ''
  • The input derivation named `system-units` differs
    - /nix/store/965246aw8c6jccj97f9l237qczfrb4nh-system-units.drv:{out}
    + /nix/store/7f935yr7p6ahpsjnc196ymjx6q75dwrq-system-units.drv:{out}
    • The set of input derivation names do not match:
        + unit-domainname.service
    • The input derivation named `unit-nix-daemon.service` differs
      - /nix/store/rpr67clad82nmw44v5fjpw1kyq6lv40v-unit-nix-daemon.service.drv:{out}
      + /nix/store/f2ff45a4xflm7av4whxdslicv7sjnchr-unit-nix-daemon.service.drv:{out}
      • The input derivation named `X-Restart-Triggers-nix-daemon` differs
        - /nix/store/gwxp6vr1kg4hm3s0y1v1jbqk8fn84j2p-X-Restart-Triggers-nix-daemon.drv:{out}
        + /nix/store/12jf26y3zzh6g6iw2kvshz2dmixqnmmp-X-Restart-Triggers-nix-daemon.drv:{out}
        • The input derivation named `nix.conf` differs
          • These two derivations have already been compared
        • Skipping environment comparison
      • Skipping environment comparison
    • The input derivation named `unit-outpack-malariaverse-sitefiles.service` differs
      - /nix/store/3f9hw69raa3pnapm6myfc9bynfnzkmva-unit-outpack-malariaverse-sitefiles.service.drv:{out}
      + /nix/store/brdb8yfzxwxyfbdi1md4sn3skzwbv9sb-unit-outpack-malariaverse-sitefiles.service.drv:{out}
      • The input derivation named `unit-script-outpack-malariaverse-sitefiles-pre-start` differs
        - /nix/store/y52g160ax23inrd9m8nqba7zk15c9inq-unit-script-outpack-malariaverse-sitefiles-pre-start.drv:{out}
        + /nix/store/j6q6chx9rm81nc8n30zhl78gizgba1qk-unit-script-outpack-malariaverse-sitefiles-pre-start.drv:{out}
        • The environments do not match:
            text=''
              #!/nix/store/1xhds5s320nfp2022yjah1h7dpv8qqns-bash-5.2p32/bin/bash
              set -e
              if [[ ! -d /var/lib/outpack/malariaverse-sitefiles ]]; then
            +   printf >&2 "Initializing outpack root at %s" "/var/lib/outpack/malariaverse-sitefiles"
                /nix/store/bz7q8nkrbwr9ylmq9l38lf8mhi1vv4xk-outpack_server/bin/outpack init --require-complete-tree --use-file-store /var/lib/outpack/malariaverse-sitefiles
              fi
            
            
        ''
      • Skipping environment comparison
    • The input derivation named `unit-outpack-priority-pathogens.service` differs
      - /nix/store/2zs7pjx9asjw7h7wch0flk18j2wcl2a0-unit-outpack-priority-pathogens.service.drv:{out}
      + /nix/store/g9kalpxi51fyx43kqigh9xcpbbk5d8ri-unit-outpack-priority-pathogens.service.drv:{out}
      • The input derivation named `unit-script-outpack-priority-pathogens-pre-start` differs
        - /nix/store/62j42dvvkz0dg1lmcgljwcv502lfhxvs-unit-script-outpack-priority-pathogens-pre-start.drv:{out}
        + /nix/store/sfd3j5p5fvg574rga1lqc7cfql7r8x2c-unit-script-outpack-priority-pathogens-pre-start.drv:{out}
        • The environments do not match:
            text=''
              #!/nix/store/1xhds5s320nfp2022yjah1h7dpv8qqns-bash-5.2p32/bin/bash
              set -e
              if [[ ! -d /var/lib/outpack/priority-pathogens ]]; then
            +   printf >&2 "Initializing outpack root at %s" "/var/lib/outpack/priority-pathogens"
                /nix/store/bz7q8nkrbwr9ylmq9l38lf8mhi1vv4xk-outpack_server/bin/outpack init --require-complete-tree --use-file-store /var/lib/outpack/priority-pathogens
              fi
            
            
        ''
      • Skipping environment comparison
    • The input derivation named `unit-outpack-reside.service` differs
      - /nix/store/1gr56i5nyakr78ryhgsf6a3cdxqwflp6-unit-outpack-reside.service.drv:{out}
      + /nix/store/f37a2z5hlmyg1c43wsq1v1cz4wqiyq18-unit-outpack-reside.service.drv:{out}
      • The input derivation named `unit-script-outpack-reside-pre-start` differs
        - /nix/store/i6zwln78j2a4z6my6xi4z9gpd0b7v7l0-unit-script-outpack-reside-pre-start.drv:{out}
        + /nix/store/ybg5y4wx7phpkgn9rw71a678qwxx1v8r-unit-script-outpack-reside-pre-start.drv:{out}
        • The environments do not match:
            text=''
              #!/nix/store/1xhds5s320nfp2022yjah1h7dpv8qqns-bash-5.2p32/bin/bash
              set -e
              if [[ ! -d /var/lib/outpack/reside ]]; then
            +   printf >&2 "Initializing outpack root at %s" "/var/lib/outpack/reside"
                /nix/store/bz7q8nkrbwr9ylmq9l38lf8mhi1vv4xk-outpack_server/bin/outpack init --require-complete-tree --use-file-store /var/lib/outpack/reside
              fi
            
            
        ''
      • Skipping environment comparison
    • The input derivation named `unit-outpack-training.service` differs
      - /nix/store/s12gwv0j3qzphcn7x0yqv41hd1p63iiq-unit-outpack-training.service.drv:{out}
      + /nix/store/gw6ny10scqc4z3mpkp999l05rfjxx6nr-unit-outpack-training.service.drv:{out}
      • The input derivation named `unit-script-outpack-training-pre-start` differs
        - /nix/store/sqh80mkmvp206rphcf8690gnqaarsrqw-unit-script-outpack-training-pre-start.drv:{out}
        + /nix/store/7l3a9h6x0138yzx574cwcl3d1vjr1zan-unit-script-outpack-training-pre-start.drv:{out}
        • The environments do not match:
            text=''
              #!/nix/store/1xhds5s320nfp2022yjah1h7dpv8qqns-bash-5.2p32/bin/bash
              set -e
              if [[ ! -d /var/lib/outpack/training ]]; then
            +   printf >&2 "Initializing outpack root at %s" "/var/lib/outpack/training"
                /nix/store/bz7q8nkrbwr9ylmq9l38lf8mhi1vv4xk-outpack_server/bin/outpack init --require-complete-tree --use-file-store /var/lib/outpack/training
              fi
            
            
        ''
      • Skipping environment comparison
    • The input derivation named `unit-packit-api-malariaverse-sitefiles.service` differs
      - /nix/store/3zwnz6qpivr681p80vsrf1ivg1q2m2j8-unit-packit-api-malariaverse-sitefiles.service.drv:{out}
      + /nix/store/wrf92v574h84yqahmkqanxzzc1hjvrxg-unit-packit-api-malariaverse-sitefiles.service.drv:{out}
      • The environments do not match:
          text=''
            [Unit]
            After=postgresql.service
            Description=Packit API malariaverse-sitefiles
            Wants=postgresql.service
          
            [Service]
            Environment="LOCALE_ARCHIVE=/nix/store/mlya4575shc0a73ssr0j2maf168wyzar-glibc-locales-2.39-52/lib/locale/locale-archive"
            Environment="PACKIT_API_ROOT=https://packit.dide.ic.ac.uk/malariaverse-sitefiles/packit/api"
            Environment="PACKIT_AUTH_GITHUB_ORG=malariaverse"
            Environment="PACKIT_AUTH_GITHUB_TEAM=sitefiles"
            Environment="PACKIT_AUTH_METHOD=github"
            Environment="PACKIT_AUTH_REDIRECT_URL=https://packit.dide.ic.ac.uk/malariaverse-sitefiles/redirect"
            Environment="PACKIT_CORS_ALLOWED_ORIGINS=https://packit.dide.ic.ac.uk"
            Environment="PACKIT_DB_PASSWORD=malariaverse-sitefiles"
            Environment="PACKIT_DB_URL=jdbc:postgresql://localhost:5432/malariaverse-sitefiles?stringtype=unspecified"
            Environment="PACKIT_DB_USER=malariaverse-sitefiles"
            Environment="PACKIT_DEFAULT_ROLES=USER"
            Environment="PACKIT_MANAGEMENT_PORT=8162"
            Environment="PACKIT_OUTPACK_SERVER_URL=http://localhost:8002"
            Environment="PATH=/nix/store/k71apxkm38m3g34k01sb6zhysi0y7gph-coreutils-9.5/bin:/nix/store/asgsrh9ijxmypmxi0dy3f5bwy84bmjp7-findutils-4.9.0/bin:/nix/store/xpq4yhadyhazkcsggmqd7rsgvxb3kjy4-gnugrep-3.11/bin:/nix/store/5ppp0xw11navs501xv805jwxgn5yrymf-gnused-4.9/bin:/nix/store/109w24xsb42fali6vh051vd2ghiphj4s-systemd-255.9/bin:/nix/store/k71apxkm38m3g34k01sb6zhysi0y7gph-coreutils-9.5/sbin:/nix/store/asgsrh9ijxmypmxi0dy3f5bwy84bmjp7-findutils-4.9.0/sbin:/nix/store/xpq4yhadyhazkcsggmqd7rsgvxb3kjy4-gnugrep-3.11/sbin:/nix/store/5ppp0xw11navs501xv805jwxgn5yrymf-gnused-4.9/sbin:/nix/store/109w24xsb42fali6vh051vd2ghiphj4s-systemd-255.9/sbin"
            Environment="SERVER_PORT=8082"
            Environment="TZDIR=/nix/store/jq5vhjvin5mgilzy7dr9hfcwg5jxxg1s-tzdata-2024a/share/zoneinfo"
            DynamicUser=true
            EnvironmentFile=/var/secrets/packit/malariaverse-sitefiles/jwt-key
            EnvironmentFile=/var/secrets/github-oauth
            ExecStart='/nix/store/bkcd53jl0fh0xpxmx3dkdqidvri9l4hk-packit-api/bin/packit-api'
            ProtectSystem=true
          + SuccessExitStatus=143
            Type=simple
          
            [Install]
            WantedBy=multi-user.target
      ''
    • The input derivation named `unit-packit-api-priority-pathogens.service` differs
      - /nix/store/mgp1asdwsfvlh27j243fmpzgc49rdwil-unit-packit-api-priority-pathogens.service.drv:{out}
      + /nix/store/qsh6igxn01ybijzy3pjywm8s7q8jw9zq-unit-packit-api-priority-pathogens.service.drv:{out}
      • The environments do not match:
          text=''
            [Unit]
            After=postgresql.service
            Description=Packit API priority-pathogens
            Wants=postgresql.service
          
            [Service]
            Environment="LOCALE_ARCHIVE=/nix/store/mlya4575shc0a73ssr0j2maf168wyzar-glibc-locales-2.39-52/lib/locale/locale-archive"
            Environment="PACKIT_API_ROOT=https://packit.dide.ic.ac.uk/priority-pathogens/packit/api"
            Environment="PACKIT_AUTH_GITHUB_ORG=mrc-ide"
            Environment="PACKIT_AUTH_GITHUB_TEAM=priority-pathogens"
            Environment="PACKIT_AUTH_METHOD=github"
            Environment="PACKIT_AUTH_REDIRECT_URL=https://packit.dide.ic.ac.uk/priority-pathogens/redirect"
            Environment="PACKIT_CORS_ALLOWED_ORIGINS=https://packit.dide.ic.ac.uk"
            Environment="PACKIT_DB_PASSWORD=priority-pathogens"
            Environment="PACKIT_DB_URL=jdbc:postgresql://localhost:5432/priority-pathogens?stringtype=unspecified"
            Environment="PACKIT_DB_USER=priority-pathogens"
            Environment="PACKIT_DEFAULT_ROLES="
            Environment="PACKIT_MANAGEMENT_PORT=8160"
            Environment="PACKIT_OUTPACK_SERVER_URL=http://localhost:8000"
            Environment="PATH=/nix/store/k71apxkm38m3g34k01sb6zhysi0y7gph-coreutils-9.5/bin:/nix/store/asgsrh9ijxmypmxi0dy3f5bwy84bmjp7-findutils-4.9.0/bin:/nix/store/xpq4yhadyhazkcsggmqd7rsgvxb3kjy4-gnugrep-3.11/bin:/nix/store/5ppp0xw11navs501xv805jwxgn5yrymf-gnused-4.9/bin:/nix/store/109w24xsb42fali6vh051vd2ghiphj4s-systemd-255.9/bin:/nix/store/k71apxkm38m3g34k01sb6zhysi0y7gph-coreutils-9.5/sbin:/nix/store/asgsrh9ijxmypmxi0dy3f5bwy84bmjp7-findutils-4.9.0/sbin:/nix/store/xpq4yhadyhazkcsggmqd7rsgvxb3kjy4-gnugrep-3.11/sbin:/nix/store/5ppp0xw11navs501xv805jwxgn5yrymf-gnused-4.9/sbin:/nix/store/109w24xsb42fali6vh051vd2ghiphj4s-systemd-255.9/sbin"
            Environment="SERVER_PORT=8080"
            Environment="TZDIR=/nix/store/jq5vhjvin5mgilzy7dr9hfcwg5jxxg1s-tzdata-2024a/share/zoneinfo"
            DynamicUser=true
            EnvironmentFile=/var/secrets/packit/priority-pathogens/jwt-key
            EnvironmentFile=/var/secrets/github-oauth
            ExecStart='/nix/store/bkcd53jl0fh0xpxmx3dkdqidvri9l4hk-packit-api/bin/packit-api' '--auth.service.audience=https://packit.dide.ic.ac.uk/priority-pathogens' '--auth.service.policies[0].grantedPermissions[0]=outpack.read' '--auth.service.policies[0].grantedPermissions[1]=outpack.write' '--auth.service.policies[0].issuer=https://token.actions.githubusercontent.com' '--auth.service.policies[0].jwkSetUri=https://token.actions.githubusercontent.com/.well-known/jwks' '--auth.service.policies[0].requiredClaims.repository=mrc-ide/priority-pathogens'
            ProtectSystem=true
          + SuccessExitStatus=143
            Type=simple
          
            [Install]
            WantedBy=multi-user.target
      ''
    • The input derivation named `unit-packit-api-reside.service` differs
      - /nix/store/qb7y1ysx2z0lyrj688xs5r8pv24fv8bh-unit-packit-api-reside.service.drv:{out}
      + /nix/store/zgxssa0xr9bgpvrbym4q7bnkhy3iza3v-unit-packit-api-reside.service.drv:{out}
      • The environments do not match:
          text=''
            [Unit]
            After=postgresql.service
            Description=Packit API reside
            Wants=postgresql.service
          
            [Service]
            Environment="LOCALE_ARCHIVE=/nix/store/mlya4575shc0a73ssr0j2maf168wyzar-glibc-locales-2.39-52/lib/locale/locale-archive"
            Environment="PACKIT_API_ROOT=https://packit.dide.ic.ac.uk/reside/packit/api"
            Environment="PACKIT_AUTH_GITHUB_ORG=reside-ic"
            Environment="PACKIT_AUTH_GITHUB_TEAM="
            Environment="PACKIT_AUTH_METHOD=github"
            Environment="PACKIT_AUTH_REDIRECT_URL=https://packit.dide.ic.ac.uk/reside/redirect"
            Environment="PACKIT_CORS_ALLOWED_ORIGINS=https://packit.dide.ic.ac.uk"
            Environment="PACKIT_DB_PASSWORD=reside"
            Environment="PACKIT_DB_URL=jdbc:postgresql://localhost:5432/reside?stringtype=unspecified"
            Environment="PACKIT_DB_USER=reside"
            Environment="PACKIT_DEFAULT_ROLES=ADMIN"
            Environment="PACKIT_MANAGEMENT_PORT=8161"
            Environment="PACKIT_OUTPACK_SERVER_URL=http://localhost:8001"
            Environment="PATH=/nix/store/k71apxkm38m3g34k01sb6zhysi0y7gph-coreutils-9.5/bin:/nix/store/asgsrh9ijxmypmxi0dy3f5bwy84bmjp7-findutils-4.9.0/bin:/nix/store/xpq4yhadyhazkcsggmqd7rsgvxb3kjy4-gnugrep-3.11/bin:/nix/store/5ppp0xw11navs501xv805jwxgn5yrymf-gnused-4.9/bin:/nix/store/109w24xsb42fali6vh051vd2ghiphj4s-systemd-255.9/bin:/nix/store/k71apxkm38m3g34k01sb6zhysi0y7gph-coreutils-9.5/sbin:/nix/store/asgsrh9ijxmypmxi0dy3f5bwy84bmjp7-findutils-4.9.0/sbin:/nix/store/xpq4yhadyhazkcsggmqd7rsgvxb3kjy4-gnugrep-3.11/sbin:/nix/store/5ppp0xw11navs501xv805jwxgn5yrymf-gnused-4.9/sbin:/nix/store/109w24xsb42fali6vh051vd2ghiphj4s-systemd-255.9/sbin"
            Environment="SERVER_PORT=8081"
            Environment="TZDIR=/nix/store/jq5vhjvin5mgilzy7dr9hfcwg5jxxg1s-tzdata-2024a/share/zoneinfo"
            DynamicUser=true
            EnvironmentFile=/var/secrets/packit/reside/jwt-key
            EnvironmentFile=/var/secrets/github-oauth
            ExecStart='/nix/store/bkcd53jl0fh0xpxmx3dkdqidvri9l4hk-packit-api/bin/packit-api' '--auth.service.audience=https://packit.dide.ic.ac.uk/reside' '--auth.service.policies[0].grantedPermissions[0]=outpack.read' '--auth.service.policies[0].grantedPermissions[1]=outpack.write' '--auth.service.policies[0].issuer=https://token.actions.githubusercontent.com' '--auth.service.policies[0].jwkSetUri=https://token.actions.githubusercontent.com/.well-known/jwks' '--auth.service.policies[0].requiredClaims.repository=mrc-ide/orderly-action'
            ProtectSystem=true
          + SuccessExitStatus=143
            Type=simple
          
            [Install]
            WantedBy=multi-user.target
      ''
    • The input derivation named `unit-packit-api-training.service` differs
      - /nix/store/pxqrwa4q52jp071h25ah72d8maz3w6is-unit-packit-api-training.service.drv:{out}
      + /nix/store/k9nvp1g70ka46ky97kh02dl76gafprv3-unit-packit-api-training.service.drv:{out}
      • The environments do not match:
          text=''
            [Unit]
            After=postgresql.service
            Description=Packit API training
            Wants=postgresql.service
          
            [Service]
            Environment="LOCALE_ARCHIVE=/nix/store/mlya4575shc0a73ssr0j2maf168wyzar-glibc-locales-2.39-52/lib/locale/locale-archive"
            Environment="PACKIT_API_ROOT=https://packit.dide.ic.ac.uk/training/packit/api"
            Environment="PACKIT_AUTH_GITHUB_ORG=mrc-ide"
            Environment="PACKIT_AUTH_GITHUB_TEAM="
            Environment="PACKIT_AUTH_METHOD=github"
            Environment="PACKIT_AUTH_REDIRECT_URL=https://packit.dide.ic.ac.uk/training/redirect"
            Environment="PACKIT_CORS_ALLOWED_ORIGINS=https://packit.dide.ic.ac.uk"
            Environment="PACKIT_DB_PASSWORD=training"
            Environment="PACKIT_DB_URL=jdbc:postgresql://localhost:5432/training?stringtype=unspecified"
            Environment="PACKIT_DB_USER=training"
            Environment="PACKIT_DEFAULT_ROLES=USER"
            Environment="PACKIT_MANAGEMENT_PORT=8163"
            Environment="PACKIT_OUTPACK_SERVER_URL=http://localhost:8003"
            Environment="PATH=/nix/store/k71apxkm38m3g34k01sb6zhysi0y7gph-coreutils-9.5/bin:/nix/store/asgsrh9ijxmypmxi0dy3f5bwy84bmjp7-findutils-4.9.0/bin:/nix/store/xpq4yhadyhazkcsggmqd7rsgvxb3kjy4-gnugrep-3.11/bin:/nix/store/5ppp0xw11navs501xv805jwxgn5yrymf-gnused-4.9/bin:/nix/store/109w24xsb42fali6vh051vd2ghiphj4s-systemd-255.9/bin:/nix/store/k71apxkm38m3g34k01sb6zhysi0y7gph-coreutils-9.5/sbin:/nix/store/asgsrh9ijxmypmxi0dy3f5bwy84bmjp7-findutils-4.9.0/sbin:/nix/store/xpq4yhadyhazkcsggmqd7rsgvxb3kjy4-gnugrep-3.11/sbin:/nix/store/5ppp0xw11navs501xv805jwxgn5yrymf-gnused-4.9/sbin:/nix/store/109w24xsb42fali6vh051vd2ghiphj4s-systemd-255.9/sbin"
            Environment="SERVER_PORT=8083"
            Environment="TZDIR=/nix/store/jq5vhjvin5mgilzy7dr9hfcwg5jxxg1s-tzdata-2024a/share/zoneinfo"
            DynamicUser=true
            EnvironmentFile=/var/secrets/packit/training/jwt-key
            EnvironmentFile=/var/secrets/github-oauth
            ExecStart='/nix/store/bkcd53jl0fh0xpxmx3dkdqidvri9l4hk-packit-api/bin/packit-api'
            ProtectSystem=true
          + SuccessExitStatus=143
            Type=simple
          
            [Install]
            WantedBy=multi-user.target
      ''
    • The input derivation named `unit-prometheus-node-exporter.service` differs
      - /nix/store/90002q0iy9g87ns2prpdp6z6vkw3w0s6-unit-prometheus-node-exporter.service.drv:{out}
      + /nix/store/09y144wsfzjm1c6lysd7ds2lhy81ml4r-unit-prometheus-node-exporter.service.drv:{out}
      • The input derivation named `static-metrics.prom` differs
        - /nix/store/0j5vsf0jxzr6gppfvidawi0k6h03z7xy-static-metrics.prom.drv:{out}
        + /nix/store/lffi2a7pr2xh4m5k5bqhsl39rpcrapfn-static-metrics.prom.drv:{out}
        • The environments do not match:
            text=''
            - nixos_configuration_info{revision="1bde8c519ea32cf4f1bffa8c9a1a90219f07ee4e", flake_hash="sha256-f4WHDxAVC4XR/5yfqjuHYcKLGVTqaqI19HjiG86o9bg="} 1
            + nixos_configuration_info{revision="6bee484dc003c2e84dd91a1ebf5342e47960d9a2", flake_hash="sha256-zaTYB5M9+kbH26zSLKIWOLLTiljHuUWkfWB62z0uSX0="} 1
        ''
      • Skipping environment comparison
    • Skipping environment comparison
  • Skipping environment comparison
• Skipping environment comparison

Comparing system configuration for wpia-packit-private against main branch

- /nix/store/xpl3w832mzp1rqfnxbxn2882nbgckiab-nixos-system-wpia-packit-private-24.05.20240916.086b448.drv:{out}
+ /nix/store/6gan2fdwknv05bb3c6s12j7frrpqrqmr-nixos-system-wpia-packit-private-24.05.20240916.086b448.drv:{out}
• The input derivation named `etc` differs
  - /nix/store/nh1inpaaf3dy69cz06i9d662msbdq2y5-etc.drv:{out}
  + /nix/store/ip95f0p7whhdjpq1vqnwv7hv3rpz5z04-etc.drv:{out}
  • The input derivation named `hosts` differs
    - /nix/store/zs6sdz2ysg5yxnf21qy4nicwx2pgfzfv-hosts.drv:{out}
    + /nix/store/n0xnvazrhrsms593qkjd8307zbj88bbp-hosts.drv:{out}
    • The input derivation named `string-hosts` differs
      - /nix/store/7d5qmsxnq5pvbi1s2fvxp0ircfpxv84s-string-hosts.drv:{out}
      + /nix/store/yccyxkfpw92dj7990mdwrjhh4fr88fj3-string-hosts.drv:{out}
      • The environments do not match:
          text=''
          - 127.0.0.2 wpia-packit-private
          - ::1 wpia-packit-private
          + 127.0.0.2 wpia-packit-private.dide.ic.ac.uk wpia-packit-private
          + ::1 wpia-packit-private.dide.ic.ac.uk wpia-packit-private
      ''
    • Skipping environment comparison
  • The input derivation named `nix.conf` differs
    - /nix/store/0clghpfj0cvip2h5g802iiifgfaqkf58-nix.conf.drv:{out}
    + /nix/store/k2lkac9gl7q7hnk3rqn417z3rhjav60l-nix.conf.drv:{out}
    • The environments do not match:
        text=''
          # WARNING: this file is generated from the nix.* options in
          # your NixOS configuration, typically
          # /etc/nixos/configuration.nix.  Do not edit it!
          allowed-users = *
          auto-optimise-store = false
          builders = 
          cores = 0
          experimental-features = nix-command flakes
        + keep-derivations = true
          max-jobs = auto
          require-sigs = true
          sandbox = true
          sandbox-fallback = false
          substituters = https://cache.nixos.org/
          system-features = nixos-test benchmark big-parallel kvm
          trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
          trusted-substituters = 
          trusted-users = root
          extra-sandbox-paths = 
        
    ''
  • The input derivation named `system-units` differs
    - /nix/store/1dmpnwsvd0kh6qs7zbwn9b0f2q8nvhz7-system-units.drv:{out}
    + /nix/store/89hi878q86vdhkcg745arylq8qxw9i8h-system-units.drv:{out}
    • The set of input derivation names do not match:
        + unit-domainname.service
    • The input derivation named `unit-nix-daemon.service` differs
      - /nix/store/rpr67clad82nmw44v5fjpw1kyq6lv40v-unit-nix-daemon.service.drv:{out}
      + /nix/store/f2ff45a4xflm7av4whxdslicv7sjnchr-unit-nix-daemon.service.drv:{out}
      • The input derivation named `X-Restart-Triggers-nix-daemon` differs
        - /nix/store/gwxp6vr1kg4hm3s0y1v1jbqk8fn84j2p-X-Restart-Triggers-nix-daemon.drv:{out}
        + /nix/store/12jf26y3zzh6g6iw2kvshz2dmixqnmmp-X-Restart-Triggers-nix-daemon.drv:{out}
        • The input derivation named `nix.conf` differs
          • These two derivations have already been compared
        • Skipping environment comparison
      • Skipping environment comparison
    • The input derivation named `unit-outpack-kipling.service` differs
      - /nix/store/9spgd7hz0y5bmm70id8yf7p8va4fda97-unit-outpack-kipling.service.drv:{out}
      + /nix/store/n8nqryrhf3swq0fr5c82frcdv27726ma-unit-outpack-kipling.service.drv:{out}
      • The input derivation named `unit-script-outpack-kipling-pre-start` differs
        - /nix/store/s1nhknw6wy9fyjw0h80x81xpkddb0gzx-unit-script-outpack-kipling-pre-start.drv:{out}
        + /nix/store/3c5fgfzazzld0a41sl4k0s44g66z30v9-unit-script-outpack-kipling-pre-start.drv:{out}
        • The environments do not match:
            text=''
              #!/nix/store/1xhds5s320nfp2022yjah1h7dpv8qqns-bash-5.2p32/bin/bash
              set -e
              if [[ ! -d /var/lib/outpack/kipling ]]; then
            +   printf >&2 "Initializing outpack root at %s" "/var/lib/outpack/kipling"
                /nix/store/bz7q8nkrbwr9ylmq9l38lf8mhi1vv4xk-outpack_server/bin/outpack init --require-complete-tree --use-file-store /var/lib/outpack/kipling
              fi
            
            
        ''
      • Skipping environment comparison
    • The input derivation named `unit-packit-api-kipling.service` differs
      - /nix/store/zi23wx3lh32crn7c7x99apmfivz3xlc5-unit-packit-api-kipling.service.drv:{out}
      + /nix/store/4qryjc3j85q5nwhnmx8zsgi54qsq0srh-unit-packit-api-kipling.service.drv:{out}
      • The environments do not match:
          text=''
            [Unit]
            After=postgresql.service
            Description=Packit API kipling
            Wants=postgresql.service
          
            [Service]
            Environment="LOCALE_ARCHIVE=/nix/store/mlya4575shc0a73ssr0j2maf168wyzar-glibc-locales-2.39-52/lib/locale/locale-archive"
            Environment="PACKIT_API_ROOT=https://packit-private.dide.ic.ac.uk/kipling/packit/api"
            Environment="PACKIT_AUTH_GITHUB_ORG=mrc-ide"
            Environment="PACKIT_AUTH_GITHUB_TEAM=kipling"
            Environment="PACKIT_AUTH_METHOD=github"
            Environment="PACKIT_AUTH_REDIRECT_URL=https://packit-private.dide.ic.ac.uk/kipling/redirect"
            Environment="PACKIT_CORS_ALLOWED_ORIGINS=https://packit-private.dide.ic.ac.uk"
            Environment="PACKIT_DB_PASSWORD=kipling"
            Environment="PACKIT_DB_URL=jdbc:postgresql://localhost:5432/kipling?stringtype=unspecified"
            Environment="PACKIT_DB_USER=kipling"
            Environment="PACKIT_DEFAULT_ROLES=ADMIN"
            Environment="PACKIT_MANAGEMENT_PORT=8160"
            Environment="PACKIT_OUTPACK_SERVER_URL=http://localhost:8000"
            Environment="PATH=/nix/store/k71apxkm38m3g34k01sb6zhysi0y7gph-coreutils-9.5/bin:/nix/store/asgsrh9ijxmypmxi0dy3f5bwy84bmjp7-findutils-4.9.0/bin:/nix/store/xpq4yhadyhazkcsggmqd7rsgvxb3kjy4-gnugrep-3.11/bin:/nix/store/5ppp0xw11navs501xv805jwxgn5yrymf-gnused-4.9/bin:/nix/store/109w24xsb42fali6vh051vd2ghiphj4s-systemd-255.9/bin:/nix/store/k71apxkm38m3g34k01sb6zhysi0y7gph-coreutils-9.5/sbin:/nix/store/asgsrh9ijxmypmxi0dy3f5bwy84bmjp7-findutils-4.9.0/sbin:/nix/store/xpq4yhadyhazkcsggmqd7rsgvxb3kjy4-gnugrep-3.11/sbin:/nix/store/5ppp0xw11navs501xv805jwxgn5yrymf-gnused-4.9/sbin:/nix/store/109w24xsb42fali6vh051vd2ghiphj4s-systemd-255.9/sbin"
            Environment="SERVER_PORT=8080"
            Environment="TZDIR=/nix/store/jq5vhjvin5mgilzy7dr9hfcwg5jxxg1s-tzdata-2024a/share/zoneinfo"
            DynamicUser=true
            EnvironmentFile=/var/secrets/packit/kipling/jwt-key
            EnvironmentFile=/var/secrets/github-oauth
            ExecStart='/nix/store/bkcd53jl0fh0xpxmx3dkdqidvri9l4hk-packit-api/bin/packit-api'
            ProtectSystem=true
          + SuccessExitStatus=143
            Type=simple
          
            [Install]
            WantedBy=multi-user.target
      ''
    • The input derivation named `unit-prometheus-node-exporter.service` differs
      - /nix/store/90002q0iy9g87ns2prpdp6z6vkw3w0s6-unit-prometheus-node-exporter.service.drv:{out}
      + /nix/store/09y144wsfzjm1c6lysd7ds2lhy81ml4r-unit-prometheus-node-exporter.service.drv:{out}
      • The input derivation named `static-metrics.prom` differs
        - /nix/store/0j5vsf0jxzr6gppfvidawi0k6h03z7xy-static-metrics.prom.drv:{out}
        + /nix/store/lffi2a7pr2xh4m5k5bqhsl39rpcrapfn-static-metrics.prom.drv:{out}
        • The environments do not match:
            text=''
            - nixos_configuration_info{revision="1bde8c519ea32cf4f1bffa8c9a1a90219f07ee4e", flake_hash="sha256-f4WHDxAVC4XR/5yfqjuHYcKLGVTqaqI19HjiG86o9bg="} 1
            + nixos_configuration_info{revision="6bee484dc003c2e84dd91a1ebf5342e47960d9a2", flake_hash="sha256-zaTYB5M9+kbH26zSLKIWOLLTiljHuUWkfWB62z0uSX0="} 1
        ''
      • Skipping environment comparison
    • Skipping environment comparison
  • Skipping environment comparison
• Skipping environment comparison

plietar and others added 4 commits October 22, 2024 15:58

Add playbook for wiping an instance.

e8d87ee

Move existing documentation to the playbooks folder.

1da9147

Apply suggestions from code review

7d85cf3

Co-authored-by: Rich FitzJohn <[email protected]>

Code review.

a0d6366

plietar force-pushed the flake-parts branch from 85c7312 to b10014a Compare October 24, 2024 12:50

plietar changed the base branch from sop to main October 24, 2024 13:18

Merge branch '1bde8c5'

a1d8677

plietar force-pushed the flake-parts branch from 9c79cef to b90d3b1 Compare October 24, 2024 13:23

plietar force-pushed the flake-parts branch from b90d3b1 to acd8532 Compare October 24, 2024 13:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor and tidy the flake definition. #13

Refactor and tidy the flake definition. #13

plietar commented Oct 24, 2024

github-actions bot commented Oct 24, 2024

Refactor and tidy the flake definition. #13

Are you sure you want to change the base?

Refactor and tidy the flake definition. #13

Conversation

plietar commented Oct 24, 2024

github-actions bot commented Oct 24, 2024