Skip to content

Commit 907f2d8

Browse files
authored
Merge pull request #404 from TU-Delft-DCC/develop
Merge `develop` into `main`
2 parents 0d5c77d + efdee4b commit 907f2d8

File tree

12 files changed

+170
-182
lines changed

12 files changed

+170
-182
lines changed

_quarto.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -300,17 +300,17 @@ website:
300300
- section: "Remote servers"
301301
href: docs/infrastructure/remote_servers.md
302302
contents:
303-
- text: Server request form
304-
href: docs/infrastructure/VPS_request.md
303+
- text: Request VPS
304+
href: docs/infrastructure/vps_request.md
305305
- text: Server connection
306-
href: docs/infrastructure/VPS_SSH.md
306+
href: docs/infrastructure/vps_ssh.md
307307
- text: Data transfer
308308
href: docs/infrastructure/moving_data.md
309-
- text: Web servers
310-
href: docs/infrastructure/web_servers.md
311-
contents:
312-
- text: SSL certificates
313-
href: docs/infrastructure/VPS_SSL_Certs.md
309+
- section: "Web servers"
310+
href: docs/infrastructure/web_servers.md
311+
contents:
312+
- text: SSL certificates
313+
href: docs/infrastructure/ssl_certificates.md
314314
- text: <br>
315315
- text: ---
316316
- href: listings.qmd

docs/data/data_storage/project_drive_mounting.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ categories:
4949
*Project drive* storage can be mounted and made accessible in your TU Delft Virtual Private Server (VPS).
5050

5151
### Prerequisites
52-
- A TU Delft [VPS](../../infrastructure/VPS_request.md)
52+
- A TU Delft [VPS](../../infrastructure/vps_request.md)
5353
- A TU Delft [*Project Data Storage* drive](./project_drive_request.md)
5454

5555
### Steps
@@ -85,7 +85,7 @@ Content within *webdata* is under password protection. Typing your username and
8585
:::
8686

8787
#### **Step 2. Connect to your TU Delft VPS via SSH**
88-
Follow instructions in the TU Delft ICT email from initial server setup or follow our guide to [configure via SSH](../../infrastructure/VPS_SSH.md).
88+
Follow instructions in the TU Delft ICT email from initial server setup or follow our guide to [configure via SSH](../../infrastructure/vps_ssh.md).
8989

9090
#### **Step 3. Create a new directory as the mounting point**
9191
The convention is to create mounting points in the folder `/media`. Navigate to the directory and create a new folder with:

docs/data/data_storage/project_drive_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ TU Delft network drives are automatically mounted on TU Delft-managed computers
5454

5555
On macOS and Linux, there are a few additional steps needed to access *Project Drives*. The instructions can be found [here](https://filelist.tudelft.nl/Calendar/2024/08%20August/Project%20storage%20instructions.pdf). *(Last updated: August 2024)*
5656

57-
It can also be accessed through [webdata.tudelft.nl](https://webdata.tudelft.nl/) using a WebDAV web link [staff-umbrella](https://webdata.tudelft.nl/staff-umbrella). To mount on a TU Delft Virtual Private Server, first follow the instructions [here](/docs/infrastructure/VPS_request.md), and then the instructions in the next guide [Mount *Project Drive* on server](project_drive_mounting.md).
57+
It can also be accessed through [webdata.tudelft.nl](https://webdata.tudelft.nl/) using a WebDAV web link [staff-umbrella](https://webdata.tudelft.nl/staff-umbrella). To mount on a TU Delft Virtual Private Server, first follow the instructions [here](/docs/infrastructure/vps_request.md), and then the instructions in the next guide [Mount *Project Drive* on server](project_drive_mounting.md).
5858

5959
:::{.callout-note appearance="simple" icon="false"}
6060
## {{< fa info-circle >}} Reminder

docs/infrastructure/VPS_SSL_Certs.md

Lines changed: 0 additions & 160 deletions
This file was deleted.

docs/infrastructure/moving_data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ scp -i <path-to-custom-private-ssh-key> -o "ProxyJump <bastion-username>@linux-b
125125

126126
### Transferring files using SSH tunneling
127127

128-
If [SSH tunneling](VPS_SSH.md) has been configured correctly for the remote host, you can copy files to and from a remote host as follows:
128+
If [SSH tunneling](vps_ssh.md) has been configured correctly for the remote host, you can copy files to and from a remote host as follows:
129129

130130
```bash
131131
# Copy TO remote host

docs/infrastructure/remote_servers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ date: 2025-08-29
77

88
# We use this key to indicate the last modified date [manual entry, use YYYY-MM-DD]
99
# Uncomment and populate the next line accordingly
10-
date-modified: 2025-09-19
10+
date-modified: 2025-12-02
1111

1212
# Do not modify
1313
lang: en
@@ -17,7 +17,7 @@ language:
1717

1818
# Title of the document [manual entry]
1919
# Uncomment and populate the next line accordingly
20-
title: Servers
20+
title: Remote Servers
2121

2222
# Brief overview of the document (will be used in listings) [manual entry]
2323
# Uncomment and populate the next line and uncomment "hide-description: true".
@@ -64,7 +64,7 @@ All servers are a physical computer sitting somewhere. However, there is a commo
6464

6565
In most cases, a virtual server is the most suitable option. However, a physical server may be necessary when it is intended for specific use cases (e.g., laboratory equipment, sensor data acquisition, image processing).
6666

67-
TU Delft offers its employees the use of physical or virtual servers, these servers are referred as faculty managed servers which are therefore *private* to the university network by default. *Virtual Private Servers* (VPS) can be requested as described in the next guide [*Request a VPS*](VPS_request.md), whereas physical server placement follow a different procedure for which we strongly encourage you to consult your FIM.
67+
TU Delft offers its employees the use of physical or virtual servers, these servers are referred as faculty managed servers which are therefore *private* to the university network by default. *Virtual Private Servers* (VPS) can be requested as described in the next guide [*Request a VPS*](vps_request.md), whereas physical server placement follow a different procedure for which we strongly encourage you to consult your FIM.
6868

6969
#### **Relevant considerations**
7070

0 commit comments

Comments
 (0)