From dbcba2ea2b7301aaa7e6487c2589b09ef09ba066 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 24 May 2019 14:43:09 +0200 Subject: [PATCH] Reorganize files --- Makefile | 20 ++++++++++++++++++++ default.nix | 2 +- libs.nix => lib/default.nix | 2 +- nixops/{eldiron.nix => default.nix} | 0 nixops/scripts/nixops_wrap | 2 +- nixops/scripts/pull_deployment | 2 +- nixops/scripts/push_deployment | 2 +- nixops/scripts/setup | 6 +++--- overlays/default.nix | 2 +- pkgs/default.nix | 2 +- pkgs/private/default.nix | 2 +- fetch_version => scripts/fetch_version | 0 scripts/make-env | 7 ++++--- nix_path_env => scripts/nix_env | 2 +- scripts/nix_infos | 2 +- 15 files changed, 37 insertions(+), 16 deletions(-) create mode 100644 Makefile rename libs.nix => lib/default.nix (98%) rename nixops/{eldiron.nix => default.nix} (100%) rename fetch_version => scripts/fetch_version (100%) rename nix_path_env => scripts/nix_env (89%) diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..f4bb3f5 --- /dev/null +++ b/Makefile @@ -0,0 +1,20 @@ +subrecipes = setup ssh-eldiron info debug dry-run build upload deploy reboot push pull pull-deployment list-generations delete-generations cleanup +${subrecipes}: + @$(MAKE) --no-print-directory -C nixops/ $@ + +env: + ./scripts/make-env + +env-dry-run: + ./scripts/make-env --dry-run + +nix-info: + NIXOPS_DEPLOYMENT="" ./scripts/nix_infos + +nix-info-nixops: + NIXOPS_DEPLOYMENT="n" ./scripts/nix_infos + +nur: + ./scripts/make-nur + +.PHONY: env env-dry-run nix-info nix-info-nixops diff --git a/default.nix b/default.nix index c7f515b..ae27e32 100644 --- a/default.nix +++ b/default.nix @@ -4,7 +4,7 @@ let mypkgs = import ./pkgs { pkgs = pkgs_; }; in { - lib = import ./libs.nix { pkgs = pkgs_; }; + lib = import ./lib { pkgs = pkgs_; }; modules = import ./modules; overlays = import ./overlays; pkgs = mypkgs; diff --git a/libs.nix b/lib/default.nix similarity index 98% rename from libs.nix rename to lib/default.nix index 48787af..1baee1f 100644 --- a/libs.nix +++ b/lib/default.nix @@ -10,7 +10,7 @@ rec { in (callPackage src {}) // { inherit src; }; - nodeEnv = import ./lib/node-env.nix; + nodeEnv = import ./node-env.nix; fetchedGithub = path: let diff --git a/nixops/eldiron.nix b/nixops/default.nix similarity index 100% rename from nixops/eldiron.nix rename to nixops/default.nix diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap index e75fa2f..28aa917 100755 --- a/nixops/scripts/nixops_wrap +++ b/nixops/scripts/nixops_wrap @@ -8,7 +8,7 @@ fi DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" export NIXOPS_DEPLOYMENT="$DeploymentUuid" -source $(dirname $(dirname $DIR))/nix_path_env +source $(dirname $(dirname $DIR))/scripts/nix_env TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files) chmod go-rwx $TEMP diff --git a/nixops/scripts/pull_deployment b/nixops/scripts/pull_deployment index ef0f221..2f50875 100755 --- a/nixops/scripts/pull_deployment +++ b/nixops/scripts/pull_deployment @@ -8,7 +8,7 @@ fi DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" export NIXOPS_DEPLOYMENT="$DeploymentUuid" -source $(dirname $(dirname $DIR))/nix_path_env +source $(dirname $(dirname $DIR))/scripts/nix_env export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" diff --git a/nixops/scripts/push_deployment b/nixops/scripts/push_deployment index 26f8cd2..f2d25f9 100755 --- a/nixops/scripts/push_deployment +++ b/nixops/scripts/push_deployment @@ -8,6 +8,6 @@ fi DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" export NIXOPS_DEPLOYMENT="$DeploymentUuid" -source $(dirname $(dirname $DIR))/nix_path_env +source $(dirname $(dirname $DIR))/scripts/nix_env nixops_custom export | pass insert -m $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment diff --git a/nixops/scripts/setup b/nixops/scripts/setup index 72b19c0..cc03482 100755 --- a/nixops/scripts/setup +++ b/nixops/scripts/setup @@ -94,7 +94,7 @@ if nix show-config --json | jq -e '.sandbox.value == "true"' >/dev/null; then fi DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -source $(dirname $(dirname $DIR))/nix_path_env +source $(dirname $(dirname $DIR))/scripts/nix_env export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" export NIXOPS_DEPLOYMENT="$DeploymentUuid" @@ -107,14 +107,14 @@ if ! nixops_custom info 2>/dev/null >/dev/null; then if [ "$y" = "y" -o "$y" = "Y" ]; then deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment) echo "$deployment" | nixops_custom import - - nixops_custom modify "$(dirname $DIR)/eldiron.nix" else echo "Aborting" exit 1 fi fi +nixops_custom modify "$(dirname $DIR)/default.nix" + cat <<-EOF All set up. Please make sure you’re using scripts/nixops_wrap when deploying diff --git a/overlays/default.nix b/overlays/default.nix index 408515e..42c0386 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,5 @@ { - mylibs = self: super: { mylibs = import ../libs.nix { pkgs = self; }; }; + mylibs = self: super: { mylibs = import ../lib { pkgs = self; }; }; mypkgs = self: super: import ../pkgs { pkgs = self; }; bitlbee = import ./bitlbee; diff --git a/pkgs/default.nix b/pkgs/default.nix index 8ea65a5..297f524 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,7 +1,7 @@ { pkgs }: with pkgs; let - mylibs = import ../libs.nix { inherit pkgs; }; + mylibs = import ../lib { inherit pkgs; }; in rec { boinctui = callPackage ../pkgs/boinctui {}; diff --git a/pkgs/private/default.nix b/pkgs/private/default.nix index 60fabad..1abdd29 100644 --- a/pkgs/private/default.nix +++ b/pkgs/private/default.nix @@ -1,7 +1,7 @@ { pkgs }: with pkgs; let - mylibs = import ../../libs.nix { inherit pkgs; }; + mylibs = import ../../lib { inherit pkgs; }; in rec { webapps = callPackage ./webapps { diff --git a/fetch_version b/scripts/fetch_version similarity index 100% rename from fetch_version rename to scripts/fetch_version diff --git a/scripts/make-env b/scripts/make-env index ebb1eed..983a359 100755 --- a/scripts/make-env +++ b/scripts/make-env @@ -2,10 +2,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -source $(dirname $DIR)/nix_path_env +source $DIR/nix_env nix-env -r -i -A myEnvironments.immae-eu -f "" "$@" +result=$? cat >> $(dirname $DIR)/versions_log </dev/null 2>&1 && pwd )" - d=$(nix-build --no-out-link -E "with import { overlays = builtins.attrValues (import $DIR/overlays); }; nixops") + d=$(nix-build --no-out-link -E "with import { overlays = builtins.attrValues (import $(dirname $DIR)/overlays); }; nixops") ${d}/bin/nixops "$@" } diff --git a/scripts/nix_infos b/scripts/nix_infos index f824305..56e5b19 100755 --- a/scripts/nix_infos +++ b/scripts/nix_infos @@ -2,7 +2,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -source $(dirname $DIR)/nix_path_env +source $DIR/nix_env version=$(nix eval --raw nixpkgs.lib.version) mainversion=$(echo $version | cut -d"." -f -2) -- 2.41.0