From 9772890f59b344befa352f32e0e2810f75417492 Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Fri, 17 Mar 2023 13:28:32 +0100 Subject: [PATCH] data-hoarder-staging: deploy from master --- hosts/server10/microvm-staging.nix | 47 +----------------------------- 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/hosts/server10/microvm-staging.nix b/hosts/server10/microvm-staging.nix index 711da37e..418fed71 100644 --- a/hosts/server10/microvm-staging.nix +++ b/hosts/server10/microvm-staging.nix @@ -1,50 +1,8 @@ { config, pkgs, ... }: let microvms = { - staging-data-hoarder.flakeref = "git+file:///tmp/dvb-nix-config"; + staging-data-hoarder.flakeref = "git+https://github.com/tlm-solutions/nix-config"; }; - - realizeFlake = with pkgs; "${writeScriptBin "realize-flake" '' - #! ${runtimeShell} -e - - NAME=$1 - if [ $NAME = "staging-data-hoarder" ]; then - SRC_NIX_CONFIG=https://github.com/dump-dvb/nix-config.git - SRC_DUMP_DVB=https://github.com/dump-dvb/dump-dvb.nix.git - BRANCH=master - - DIR_NIX_CONFIG=dvb-nix-config - DIR_DUMP_DVB=dvb-dump - else - echo "Do not know what to do" - exit 0 - fi - - cd /tmp - if [ -d $DIR_DUMP_DVB ]; then - cd $DIR_DUMP_DVB - git fetch origin - git reset --hard origin/$BRANCH - else - git clone -b $BRANCH --single-branch $SRC_DUMP_DVB $DIR_DUMP_DVB - cd $DIR_DUMP_DVB - fi - git config --global user.email "astro@spaceboyz.net" - git config --global user.name "Updater" - nix flake update --commit-lock-file - - cd /tmp - if [ -d $DIR_NIX_CONFIG ]; then - cd $DIR_NIX_CONFIG - git fetch origin - git reset --hard origin/$BRANCH - else - git clone -b $BRANCH --single-branch $SRC_NIX_CONFIG $DIR_NIX_CONFIG - cd $DIR_NIX_CONFIG - fi - - nix flake update --commit-lock-file --override-input dump-dvb /tmp/$DIR_DUMP_DVB - ''}/bin/realize-flake"; in { microvm.autostart = builtins.attrNames microvms; @@ -63,7 +21,6 @@ in scriptArgs = "%i"; script = '' NAME=$1 - ${realizeFlake} $NAME /run/current-system/sw/bin/microvm -Ru $NAME ''; }; @@ -83,8 +40,6 @@ in environment.HOME = config.users.users.root.home; scriptArgs = "${name}"; script = '' - ${realizeFlake} ${name} - /run/current-system/sw/bin/microvm -c ${name} -f "${microvms.${name}.flakeref}" ''; };