Replace fetchgitPrivate by its builtins counterpart

diff --git a/libs.nix b/libs.nix
index 2ddfcbb59d48598cf8a82c0c8a42b3d45a0015b0..48787af10ef1295ed621092950635e9607aee678 100644 (file)
--- a/libs.nix
+++ b/libs.nix
@@ -36,7 +36,11 @@ rec {
     in rec {
       version = json.tag;
       name = "${json.meta.name}-${version}";
-      src = fetchgitPrivate json.git;
+      src = builtins.fetchGit {
+        url = json.git.url;
+        ref = "master";
+        rev = json.git.rev;
+      };
     };
 
   wrap = { paths ? [], vars ? {}, file ? null, script ? null, name ? "wrap" }:

diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index d03784e78c3fa575217f6d37a795aca0be72d171..9cf33886183f8e8c78c05d4c8366908b8df5d029 100755 (executable)
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -14,10 +14,6 @@ nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixop
 TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files)
 chmod go-rwx $TEMP
 
-# __noChroot: ssh-config-file requires relaxed
-export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:$NIX_PATH"
-
-
 finish() {
   rm -rf "$TEMP"
   $nixops set-args --unset privateFiles

diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 1586265d48faae553f7122b81a79e2833f266120..58dbf5516bbc9a2656526a3d63af008eded150e6 100755 (executable)
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -80,47 +80,6 @@ for key in $gpg_keys; do
   fi
 done
 
-nix_group=$(stat -c %G /nix/store)
-if [ "$nix_group" = "nixbld" ]; then
-  nix_user="nixbld1"
-else
-  nix_user="$(stat -c %U /nix/store)"
-fi
-
-if [ ! -f /etc/ssh/ssh_rsa_key_nixops ]; then
-  cat <<-EOF
-       The key to access private git repositories (websites hosted by the
-       server) needs to be accessible to nix builders. It will be put in
-       /etc/ssh/ssh_rsa_key_nixops (sudo right is needed for that)
-       > pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/SshKey | sudo tee /etc/ssh/ssh_rsa_key_nixops > /dev/null
-       > pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/SshKey.pub | sudo tee /etc/ssh/ssh_rsa_key_nixops.pub > /dev/null
-       > sudo chmod u=r,go-rwx /etc/ssh/ssh_rsa_key_nixops
-       > sudo chown $nix_user:$nix_group /etc/ssh/ssh_rsa_key_nixops /etc/ssh/ssh_rsa_key_nixops.pub
-       Continue? [y/N]
-       EOF
-  read y
-  if [ "$y" = "y" -o "$y" = "Y" ]; then
-    if ! id -u $nix_user 2>/dev/null >/dev/null; then
-      echo "User $nix_user seems inexistant, did you install nix?"
-      exit 1
-    fi
-    mask=$(umask)
-    umask 0777
-    # Don’t forward it directly to tee, it would break ncurse pinentry
-    key=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/SshKey)
-    echo "$key" | sudo tee /etc/ssh/ssh_rsa_key_nixops > /dev/null
-    sudo chmod u=r,go=- /etc/ssh/ssh_rsa_key_nixops
-    pubkey=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/SshKey.pub)
-    echo "$pubkey" | sudo tee /etc/ssh/ssh_rsa_key_nixops.pub > /dev/null
-    sudo chmod a=r /etc/ssh/ssh_rsa_key_nixops.pub
-    sudo chown $nix_user:$nix_group /etc/ssh/ssh_rsa_key_nixops /etc/ssh/ssh_rsa_key_nixops.pub
-    umask $mask
-  else
-    echo "Aborting"
-    exit 1
-  fi
-fi
-
 if nix show-config --json | jq -e '.sandbox.value == "true"' >/dev/null; then
   cat <<-EOF
        There are some impure derivations in the repo currently (grep __noChroot), please put

diff --git a/nixops/ssh/config b/nixops/ssh/config
deleted file mode 100644 (file)
index 3d4dc3e..0000000
--- a/nixops/ssh/config
+++ /dev/null
@@ -1,5 +0,0 @@
-Host git.immae.eu
-IdentityFile /etc/ssh/ssh_rsa_key_nixops
-StrictHostKeyChecking no
-UserKnownHostsFile /dev/null
-CheckHostIP no

diff --git a/pkgs/private/webapps/aten/aten.json b/pkgs/private/webapps/aten/aten.json
index 53569b6227b6752302eb740bb02e1baa46453f26..10a315a85c9eaaa2c14706cd931942d097f64a5c 100644 (file)
--- a/pkgs/private/webapps/aten/aten.json
+++ b/pkgs/private/webapps/aten/aten.json
@@ -2,11 +2,11 @@
   "tag": "b99537f-master",
   "meta": {
     "name": "aten",
-    "url": "gitolite@git.immae.eu:perso/Immae/Sites/Aten",
+    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten",
     "branch": "master"
   },
   "git": {
-    "url": "gitolite@git.immae.eu:perso/Immae/Sites/Aten",
+    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten",
     "rev": "b99537fdad41291afb4f1bb8b2e2aa4081c71fae",
     "sha256": "15mlyik6zivxwry6zc906bqnivxhby27yr8kj4lg5n68pvb877dn",
     "fetchSubmodules": true

diff --git a/pkgs/private/webapps/chloe/chloe.json b/pkgs/private/webapps/chloe/chloe.json
index 686d751e55a2e76ab59a563f0fe0ecf40782c160..6d58e8cc20106e9fd46ac6a89d53fee1470c404c 100644 (file)
--- a/pkgs/private/webapps/chloe/chloe.json
+++ b/pkgs/private/webapps/chloe/chloe.json
@@ -2,11 +2,11 @@
   "tag": "96fc4eb-master",
   "meta": {
     "name": "chloe",
-    "url": "gitolite@git.immae.eu:perso/Immae/Sites/Chloe",
+    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe",
     "branch": "master"
   },
   "git": {
-    "url": "gitolite@git.immae.eu:perso/Immae/Sites/Chloe",
+    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe",
     "rev": "96fc4eb0099a29b0f9a58fb4eaec4bf14ac65f0a",
     "sha256": "0mf15j6z86j2smm2k360cmm5djhcjbs9949pznwi57kw97vkm1s3",
     "fetchSubmodules": true

diff --git a/pkgs/private/webapps/connexionswing/connexionswing.json b/pkgs/private/webapps/connexionswing/connexionswing.json
index 44d9f0e40f50f6a7b08319ba8afc0031c1333ede..3b50916b8d27b1ba6ccdc633bc8735bbac680265 100644 (file)
--- a/pkgs/private/webapps/connexionswing/connexionswing.json
+++ b/pkgs/private/webapps/connexionswing/connexionswing.json
@@ -2,11 +2,11 @@
   "tag": "dfcdce0-master",
   "meta": {
     "name": "connexionswing",
-    "url": "gitolite@git.immae.eu:perso/Immae/Projets/Connexionswing",
+    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Connexionswing",
     "branch": "master"
   },
   "git": {
-    "url": "gitolite@git.immae.eu:perso/Immae/Projets/Connexionswing",
+    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Projets/Connexionswing",
     "rev": "dfcdce04d11a75f5e850e6dc3a049de4517fc107",
     "sha256": "0ddirwxs2ify3bni6nv787nb31ckyn2hsrcq8g01b5cfv5havkwq",
     "fetchSubmodules": true

diff --git a/pkgs/private/webapps/ludivinecassal/ludivinecassal.json b/pkgs/private/webapps/ludivinecassal/ludivinecassal.json
index f39b143494c92bc5d01bb43392b3704c91facf83..f0d23c311c3de03483e10b437987b2b3370bbc7a 100644 (file)
--- a/pkgs/private/webapps/ludivinecassal/ludivinecassal.json
+++ b/pkgs/private/webapps/ludivinecassal/ludivinecassal.json
@@ -2,11 +2,11 @@
   "tag": "0dacc32-master",
   "meta": {
     "name": "ludivinecassal",
-    "url": "gitolite@git.immae.eu:perso/Immae/Sites/Ludivine",
+    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Ludivine",
     "branch": "master"
   },
   "git": {
-    "url": "gitolite@git.immae.eu:perso/Immae/Sites/Ludivine",
+    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Ludivine",
     "rev": "0dacc320ea052b69f79861c84bceaa89be53de60",
     "sha256": "10khg1fq9ixly3xak591n3v0rv3f2hn91rd46d75yv3wjxaj1c2d",
     "fetchSubmodules": true

diff --git a/pkgs/private/webapps/piedsjaloux/piedsjaloux.json b/pkgs/private/webapps/piedsjaloux/piedsjaloux.json
index a34c7e8e705d073fc45d63bc61d42c807ffc689b..dc2c08359b4cea7532172823ad59daa2345c907c 100644 (file)
--- a/pkgs/private/webapps/piedsjaloux/piedsjaloux.json
+++ b/pkgs/private/webapps/piedsjaloux/piedsjaloux.json
@@ -2,11 +2,11 @@
   "tag": "4ee4538-master",
   "meta": {
     "name": "piedsjaloux",
-    "url": "gitolite@git.immae.eu:Pieds_jaloux/NewSite",
+    "url": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite",
     "branch": "master"
   },
   "git": {
-    "url": "gitolite@git.immae.eu:Pieds_jaloux/NewSite",
+    "url": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite",
     "rev": "4ee45386ad9ec9c081234a2fbde66e5b0c3294be",
     "sha256": "10a41chh4crn95z6lk6nhkx27089djkngypa9m76bg7ph508mvnq",
     "fetchSubmodules": true

diff --git a/pkgs/private/webapps/tellesflorian/tellesflorian.json b/pkgs/private/webapps/tellesflorian/tellesflorian.json
index 81b42af679a2f18c3bdcaa43243cc84791dd55bb..693336da56c9ede665082c5a04b608cf675b4049 100644 (file)
--- a/pkgs/private/webapps/tellesflorian/tellesflorian.json
+++ b/pkgs/private/webapps/tellesflorian/tellesflorian.json
@@ -2,11 +2,11 @@
   "tag": "1793d5c-master",
   "meta": {
     "name": "tellesflorian",
-    "url": "gitolite@git.immae.eu:perso/florian_telles/stabilo",
+    "url": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo",
     "branch": "master"
   },
   "git": {
-    "url": "gitolite@git.immae.eu:perso/florian_telles/stabilo",
+    "url": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo",
     "rev": "1793d5c7912d1b20ad1df1ac59be9d7f1220e919",
     "sha256": "1zhxcrbglbjb6xfr8sfm4m2miabbkkb0a7543va3b5akrn6yk0cb",
     "fetchSubmodules": true