From f2f368ac24e256d7e39a3cb461e405bb69895cd0 Mon Sep 17 00:00:00 2001 From: Rob Hooper Date: Mon, 31 Jul 2023 16:29:26 +0100 Subject: [PATCH 1/4] docs: new prometheus config path --- docs/deploy/delete_server.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deploy/delete_server.rst b/docs/deploy/delete_server.rst index 737795dd..ba691dbc 100644 --- a/docs/deploy/delete_server.rst +++ b/docs/deploy/delete_server.rst @@ -6,7 +6,7 @@ A server is deleted either when a service is moving to a new server (:doc:`creat As with other deployment tasks, do the :ref:`setup tasks` before (and the :ref:`cleanup tasks` after) the steps below. #. If appropriate, notify relevant users of the change -#. Remove the server from ``salt/prometheus/server/files/config/conf-prometheus.yml`` +#. Remove the server from ``salt/prometheus/files/conf-prometheus.yml`` #. :doc:`Deploy` the Prometheus service #. Shutdown the server via the :ref:`host`'s interface #. Remove all occurrences of the server's FQDN and IP address from this repository From 8bf11ac784ea9f87688a83ecfc240458d532ca62 Mon Sep 17 00:00:00 2001 From: Rob Hooper Date: Mon, 31 Jul 2023 16:29:47 +0100 Subject: [PATCH 2/4] docs: Securely erase server disk process --- docs/deploy/delete_server.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/deploy/delete_server.rst b/docs/deploy/delete_server.rst index ba691dbc..2905db50 100644 --- a/docs/deploy/delete_server.rst +++ b/docs/deploy/delete_server.rst @@ -24,5 +24,13 @@ If the service is being retired: #. Remove its `managed passwords `__, if appropriate Finally: +#. Securely erase server disks + #. Request an *Rescue* system via the :ref:`host`'s interface and connect as ``root``. + #. Open a session in :ref:`tmux` + #. Securely remove data, for example wiping the /dev/sda device: + + .. code-block:: bash + + shred -z -n 1 -v /dev/sda #. Cancel the server via the host's interface From 7362586be75423db9e9b4d1f62d86b88e4fc120d Mon Sep 17 00:00:00 2001 From: Rob Hooper Date: Mon, 31 Jul 2023 16:31:42 +0100 Subject: [PATCH 3/4] docs: Fix list formatting --- docs/deploy/delete_server.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/deploy/delete_server.rst b/docs/deploy/delete_server.rst index 2905db50..44db969c 100644 --- a/docs/deploy/delete_server.rst +++ b/docs/deploy/delete_server.rst @@ -24,7 +24,9 @@ If the service is being retired: #. Remove its `managed passwords `__, if appropriate Finally: + #. Securely erase server disks + #. Request an *Rescue* system via the :ref:`host`'s interface and connect as ``root``. #. Open a session in :ref:`tmux` #. Securely remove data, for example wiping the /dev/sda device: From 296a10fa6fa962c0cf2a748dc51ecbb085ac6c21 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Thu, 3 Aug 2023 15:50:18 -0400 Subject: [PATCH 4/4] docs(deploy/delete_server): Copy-edit --- docs/deploy/delete_server.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/deploy/delete_server.rst b/docs/deploy/delete_server.rst index 44db969c..a92f08db 100644 --- a/docs/deploy/delete_server.rst +++ b/docs/deploy/delete_server.rst @@ -25,11 +25,11 @@ If the service is being retired: Finally: -#. Securely erase server disks +#. Securely erase data: - #. Request an *Rescue* system via the :ref:`host`'s interface and connect as ``root``. - #. Open a session in :ref:`tmux` - #. Securely remove data, for example wiping the /dev/sda device: + #. Request a *Rescue* system via the :ref:`host`'s interface and connect as ``root`` + #. Connect to the server, and open a session in :ref:`tmux` + #. Securely erase data from the relevant device(s), for example: .. code-block:: bash