X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fscripts%2Fsetup;h=db0f353b679429f10ccf14b60c4420489b662588;hb=668ba4d439d3b60ade9f96fd158ed293ff211f60;hp=22f43ce0b8af983b39e6da0ea4a3ceadb504a812;hpb=1052bfda27ad0607cd4dc5dc91e2d8e8220c30c7;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 22f43ce..db0f353 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -1,9 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -euo pipefail
 
-MAKEFILE_DIR="$( cd "$( dirname $( dirname "${BASH_SOURCE[0]}" ))" >/dev/null 2>&1 && pwd )"
-
 if ! which nix 2>/dev/null >/dev/null; then
   cat <<-EOF
 	nix is needed, please install it:
@@ -20,23 +18,47 @@ if [ "${NIX_STORE:-/nix/store}" != "/nix/store" ]; then
   exit 1
 fi
 
-gpg_keys=$(pass ls Nixops/GPGKeys | sed -e "1d" | cut -d" " -f2)
-for key in $gpg_keys; do
-  content=$(pass show Nixops/GPGKeys/$key)
-  fpr=$(echo "$content" | gpg --import-options show-only --import --with-colons | grep -e "^pub" | cut -d':' -f5)
+if ! which direnv 2>/dev/null >/dev/null; then
+  cat <<-EOF
+	direnv is needed, please install it
+	EOF
+  exit 1
+fi
+
+if [ -z "$NIXOPS_ENV_LOADED" ]; then
+  cat <<-EOF
+	direnv environment needs to be loaded
+	EOF
+  exit 1
+fi
+
+if [ "$(git config --get include.path)" != "../.gitconfig" ]; then
+  cat <<-EOF
+	it is recommended to include the .gitconfig file into (local) git configuration:
+	git config --local include.path '../.gitconfig'
+	Run this command? [y/N]
+	EOF
+  read y
+  if [ "$y" = "y" -o "$y" = "Y" ]; then
+    git config --local include.path '../.gitconfig'
+  fi
+fi
+
+for key in public_keys/*; do
+  fpr=$(cat "$key" | gpg --import-options show-only --import --with-colons | grep -e "^pub" | cut -d':' -f5)
   gpg --list-key "$fpr" >/dev/null 2>/dev/null && imported=yes || imported=no
   # /usr/share/doc/gnupg/DETAILS field 2
-  (echo "$content" | gpg --import-options show-only --import --with-colons |
+  (cat "$key" | gpg --import-options show-only --import --with-colons |
       grep -E '^pub:' |
       cut -d':' -f2 |
       grep -q '[fu]') && signed=yes || signed=no
   if [ "$signed" = no -o "$imported" = no ] ; then
     echo "The key for $key needs to be imported and signed (a local signature is enough)"
-    echo "$content" | gpg --import-options show-only --import
+    cat "$key" | gpg --import-options show-only --import
     echo "Continue? [y/N]"
     read y
     if [ "$y" = "y" -o "$y" = "Y" ]; then
-      echo "$content" | gpg --import
+      cat "$key" | gpg --import
       gpg --expert --edit-key "$fpr" lsign quit
     else
       echo "Aborting"
@@ -62,20 +84,6 @@ if nix show-config --json | jq -e '.sandbox.value == "true"' >/dev/null; then
   read y
 fi
 
-if ! make -C $MAKEFILE_DIR deployment_is_set 2>/dev/null >/dev/null; then
-  cat <<-EOF
-	Importing deployment file into nixops:
-	Continue? [y/N]
-	EOF
-  read y
-  if [ "$y" = "y" -o "$y" = "Y" ]; then
-    make -C $MAKEFILE_DIR pull_deployment
-  else
-    echo "Aborting"
-    exit 1
-  fi
-fi
-
 cat <<-EOF
 	All set up.
 	Please make sure you’re using make commands when deploying