Merge branch 'update-whetstone-url' into 'develop'

Update whetstone hostname to private.storage.

See merge request privatestorage/PrivateStorageio!250

DEPLOYMENT-NOTES.rst

@@ -3,11 +3,11 @@ Deployment notes
 
 - 2021-12-20
 
-  `https://whetstone.privatestorage.io/privatestorage/privatestorageops/-/issues/399`_ requires moving the PaymentServer database on the ``payments`` host onto a new dedicated filesystem.
+  `https://whetstone.private.storage/privatestorage/privatestorageops/-/issues/399`_ requires moving the PaymentServer database on the ``payments`` host onto a new dedicated filesystem.
 
   Follow these steps *before* deploying this version of PrivateStorageio:
 
-  0. Deploy the `PrivateStorageOps change <https://whetstone.privatestorage.io/privatestorage/privatestorageops/-/merge_requests/169>`_ that creates a new dedicated volume.
+  0. Deploy the `PrivateStorageOps change <https://whetstone.private.storage/privatestorage/privatestorageops/-/merge_requests/169>`_ that creates a new dedicated volume.
 
   1. Put a disk label on the new dedicated volume ::
 
@@ -37,9 +37,9 @@ Deployment notes
 
 - 2021-10-12 The secret in ``private-keys/grafana-slack-url`` needs to be changed to remove the ``SLACKURL=`` prefix.
 
-- 2021-09-30 `Enable alerting <https://whetstone.privatestorage.io/privatestorage/PrivateStorageio/-/merge_requests/185>`_ needs a secret in ``private-keys/grafana-slack-url`` looking like the template in ``morph/grid/local/private-keys/grafana-slack-url`` and pointing to the secret API endpoint URL saved in `this 1Password entry <https://privatestorage.1password.com/vaults/7flqasy5hhhmlbtp5qozd3j4ga/allitems/cgznskz2oix2tyx5xyntwaos5i>`_ (or create a new secret URL at https://www.slack.com/apps/A0F7XDUAZ).
+- 2021-09-30 `Enable alerting <https://whetstone.private.storage/privatestorage/PrivateStorageio/-/merge_requests/185>`_ needs a secret in ``private-keys/grafana-slack-url`` looking like the template in ``morph/grid/local/private-keys/grafana-slack-url`` and pointing to the secret API endpoint URL saved in `this 1Password entry <https://privatestorage.1password.com/vaults/7flqasy5hhhmlbtp5qozd3j4ga/allitems/cgznskz2oix2tyx5xyntwaos5i>`_ (or create a new secret URL at https://www.slack.com/apps/A0F7XDUAZ).
 
-- 2021-09-07 `Manage access to payment metrics <https://whetstone.privatestorage.io/privatestorage/PrivateStorageio/-/merge_requests/146>`_ requires moving and chown'ing the PaymentServer database on the ``payments`` host::
+- 2021-09-07 `Manage access to payment metrics <https://whetstone.private.storage/privatestorage/PrivateStorageio/-/merge_requests/146>`_ requires moving and chown'ing the PaymentServer database on the ``payments`` host::
 
    mkdir /var/lib/zkapissuer
 

README.rst

 Project Hosting Moved
 =====================
 
-This project can now be found at https://whetstone.privatestorage.io/privatestorage/PrivateStorageio
+This project can now be found at https://whetstone.private.storage/privatestorage/PrivateStorageio
 
 PrivateStorageio
 ================

docs/dev/README.rst

@@ -28,7 +28,7 @@ The system tests boot QEMU VMs which prevents them from running on CI at this ti
 The build requires > 10 GB of disk space,
 and the VMs might be timing out on slow or busy machines.
 If you run into timeouts,
-try `raising the number of retries <https://whetstone.privatestorage.io/privatestorage/PrivateStorageio/-/blob/e8233d2/nixos/modules/tests/run-introducer.py#L55-62>`_.
+try `raising the number of retries <https://whetstone.private.storage/privatestorage/PrivateStorageio/-/blob/e8233d2/nixos/modules/tests/run-introducer.py#L55-62>`_.
 
 It is also possible go through the testing script interactively - useful for debugging::
 
@@ -36,7 +36,7 @@ It is also possible go through the testing script interactively - useful for deb
 
 This will give you a result symlink in the current directory.
 Inside that is bin/nixos-test-driver which gives you a kind of REPL for interacting with the VMs.
-The kind of `Python in this testScript <https://whetstone.privatestorage.io/privatestorage/PrivateStorageio/-/blob/78881a3/nixos/modules/tests/private-storage.nix#L180>`_ is what you can enter into this REPL.
+The kind of `Python in this testScript <https://whetstone.private.storage/privatestorage/PrivateStorageio/-/blob/78881a3/nixos/modules/tests/private-storage.nix#L180>`_ is what you can enter into this REPL.
 Consult the `official documentation on NixOS Tests <https://nixos.org/manual/nixos/stable/index.html#sec-nixos-tests>`_ for more information.
 
 Updatings Pins

morph/lib/base.nix

@@ -65,7 +65,7 @@
         assertion = config.nixpkgs.config == {};
         message = ''
           Since we set `nixpkgs.pkgs` via morph's `network.pkgs`, the value for `nixpkgs.config` is ignored.
-          See https://whetstone.privatestorage.io/privatestorage/PrivateStorageio/-/issues/85#note_15876 for details.
+          See https://whetstone.private.storage/privatestorage/PrivateStorageio/-/issues/85#note_15876 for details.
           '';
       }
     ];

morph/lib/bootstrap-configuration.nix

@@ -67,7 +67,7 @@ let
   # Stop!  I hope you're done when you get here.  If you have to modify
   # anything below this point the expression should probably be refactored and
   # another variable added controlling whatever new thing you need to control.
-  # Open an issue: https://whetstone.privatestorage.io/privatestorage/PrivateStorageio/-/issues/new?issue
+  # Open an issue: https://whetstone.private.storage/privatestorage/PrivateStorageio/-/issues/new?issue
 in
 # Define a function that ignores all its arguments.  We don't need any of them
 # for now.

nixos/modules/update-deployment

@@ -32,7 +32,7 @@ CHECKOUT="${HOME}/PrivateStorageio"
 
 # This is the address of the git remote where we can get the latest
 # PrivateStorageio.
-REPO="https://whetstone.privatestorage.io/privatestorage/PrivateStorageio.git"
+REPO="https://whetstone.private.storage/privatestorage/PrivateStorageio.git"
 
 if [ -e "${CHECKOUT}" ]; then
     # It exists already so just make sure it contains the latest changes from

nixos/pkgs/leasereport/repo.json

@@ -2,7 +2,7 @@
   "owner": "privatestorage",
   "repo": "LeaseReport",
   "branch": "main",
-  "domain": "whetstone.privatestorage.io",
+  "domain": "whetstone.private.storage",
   "rev": "3739ffde14e698f56118a444e6946edb736b6983",
   "outputHashAlgo": "sha512",
   "outputHash": "37b4hrhjghvza0bqvmngcdapqfjjjiv0gx90y0i4wvj72nf1xsh7g2kwpvjm4prpb5s7fxb50x971xfw4sqpwwsk2zdll4nbl5764ij"

nixos/pkgs/zkap-spending-service/repo.json

@@ -3,7 +3,7 @@
   "repo": "zkap-spending-service",
   "rev": "66fd395268b466d4c7bb0a740fb758a5acccd1c4",
   "branch": "main",
-  "domain": "whetstone.privatestorage.io",
+  "domain": "whetstone.private.storage",
   "outputHash": "1nryvsccncrka25kzrwqkif4x68ib0cs2vbw1ngfmzw86gjgqx01a7acgspmrpfs62p4q8zw0f2ynl8jr3ygyypjrl8v7w8g49y0y0y",
   "outputHashAlgo": "sha512"
 }

nixpkgs-2105.nix

 # This actually imports nixos-21.11 but we need to keep this file around so that
 # upgrades work, as the on-node deployment script expects this file in the checkout.
-# See https://whetstone.privatestorage.io/privatestorage/PrivateStorageio/-/merge_requests/222#note_18600
+# See https://whetstone.private.storage/privatestorage/PrivateStorageio/-/merge_requests/222#note_18600
 # This file can be removed once all nodes have been updated to point to the new file.
 
 import ./nixpkgs.nix