From c265ec0deeea7d5d4328c34df524bc5d1f163763 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 18 Nov 2020 11:28:42 -0300 Subject: Remove default.nix and shell.nix --- .gitignore | 6 ------ default.nix | 22 --------------------- .../plan-files/2020-11-18T11:28:25-03:00.tfplan | Bin 0 -> 3808 bytes secrets/terraform/terraform.tfstate | Bin 3076 -> 3145 bytes secrets/terraform/terraform.tfstate.backup | Bin 3079 -> 3133 bytes shell.nix | 1 - terraform-apply.sh | 4 +--- 7 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 default.nix create mode 100644 secrets/terraform/plan-files/2020-11-18T11:28:25-03:00.tfplan delete mode 100644 shell.nix diff --git a/.gitignore b/.gitignore index 8364fd3..3913496 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,2 @@ # Terraform /.terraform/ - -# Nix -/result - -# workflow -/tmp diff --git a/default.nix b/default.nix deleted file mode 100644 index 41673a6..0000000 --- a/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -let - niv-sources = import ./nix/sources.nix; - pkgs = import niv-sources.nixpkgs { }; - src = pkgs.nix-gitignore.gitignoreSource [ "!.git" ] ./.; - projectBuildInputs = with pkgs; [ gitMinimal shellcheck nixfmt terraform ]; -in { - test = pkgs.stdenv.mkDerivation { - inherit src; - name = "vps-test"; - phases = [ "unpackPhase" "buildPhase" ]; - buildInputs = projectBuildInputs; - buildPhase = '' - patchShebangs . - ./tests.sh - touch $out - ''; - }; - shell = pkgs.mkShell { - name = "vps-shell"; - buildInputs = projectBuildInputs; - }; -} diff --git a/secrets/terraform/plan-files/2020-11-18T11:28:25-03:00.tfplan b/secrets/terraform/plan-files/2020-11-18T11:28:25-03:00.tfplan new file mode 100644 index 0000000..ce6187d Binary files /dev/null and b/secrets/terraform/plan-files/2020-11-18T11:28:25-03:00.tfplan differ diff --git a/secrets/terraform/terraform.tfstate b/secrets/terraform/terraform.tfstate index 550cf6d..78a3106 100644 Binary files a/secrets/terraform/terraform.tfstate and b/secrets/terraform/terraform.tfstate differ diff --git a/secrets/terraform/terraform.tfstate.backup b/secrets/terraform/terraform.tfstate.backup index 135ef81..96a51dc 100644 Binary files a/secrets/terraform/terraform.tfstate.backup and b/secrets/terraform/terraform.tfstate.backup differ diff --git a/shell.nix b/shell.nix deleted file mode 100644 index af299aa..0000000 --- a/shell.nix +++ /dev/null @@ -1 +0,0 @@ -(import ./default.nix).shell diff --git a/terraform-apply.sh b/terraform-apply.sh index 588e1bb..d09fb3c 100755 --- a/terraform-apply.sh +++ b/terraform-apply.sh @@ -1,6 +1,4 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -# shellcheck shell=bash +#!/usr/bin/env bash set -Eeuo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -- cgit v1.2.3