Skip to content

Commit c52b591

Browse files
authored
Merge branch 'master' into fullUrlImages
2 parents 049b66e + 7b485ba commit c52b591

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

csc-overrides/partials/announcement.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#}
77
{# import ".icons/material/coffee.svg" as icon #}
88
{# import ".icons/material/chat.svg" as icon #}
9-
{# import ".icons/material/information.svg" as icon #}
10-
{% import ".icons/material/alert.svg" as icon %}
9+
{% import ".icons/material/information.svg" as icon %}
10+
{# import ".icons/material/alert.svg" as icon #}
1111
{# import ".icons/material/wrench.svg" as icon #}
1212
{# import ".icons/material/rocket-launch.svg" as icon #}
1313
{# import ".icons/material/test-tube.svg" as icon #}
@@ -18,7 +18,7 @@
1818
<div class="announcement-icon">{{ icon }}</div>
1919
{# Put the announcement, in HTML, right under this comment! #}
2020
<p>
21-
Due to a technical issue, some files cannot currently be imported from SD Connect to SD Desktop using the Data Gateway app. <a href="{{ base_url | url }}/support/wn/data-new/#sd-workaround">See temporary workaround here</a>.
21+
Note: Starting from June 11, 2025, using the MyCSC portal will require multi-factor authentication (MFA). <a href="{{ base_url | url }}/accounts/mfa/">Read our MFA guide here</a>.
2222
</p>
2323
{# ...and right above _this_ comment. #}
2424
<div class="announcement-icon announcement-icon-end">{{ icon }}</div>

docs/support/faq/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
* [How to resize an instance or volume in Pouta?](how-to-resize-in-pouta.md)
7272
* [How to use cPouta for Remote Desktop](how-to-use-cpouta-for-remote-desktop.md)
7373
* [How to use cPouta GPU for rendering](how-to-use-cpouta-gpu-for-rendering.md)
74+
* [Is nested virtualization supported on Pouta?](is-nested-virtualization-supported.md)
7475
* [Is Pouta backed up?](is-pouta-backed-up.md)
7576
* [What does it cost to use Pouta?](what-does-it-cost-to-use-pouta.md)
7677
* [What are volumes? How do I use them?](what-are-volumes-and-how-to-use.md)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Is nested virtualization supported on Pouta?
2+
3+
No, for the time being nested virtualization is not enabled in Pouta. Nested virtualization disables live migrations, and at this moment we consider that Live migration is a much more useful feature for our user than nested virtualization.
4+
5+
!!! Info "Nested virtualization"
6+
Nested virtualization is a feature that allows you to run virtual machines (VMs) inside other VMs. This is useful for testing and development purposes
7+
8+
!!! Info "Live migration"
9+
Live migration is the process of moving a running virtual machine between different physical machines without rebooting or shuting down the virtual machine. There might be a short downtime during the migration, but the processes running on the virtual machine do not perceive this downtime.

scripts/report_changes.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/bash
22
set -e
33

4+
GH_BASE="https://github.com/CSCfi/csc-user-guide/blob/master"
5+
46
usage="Usage: $(basename "$0") [-h] [-u]
57
Print last update timestamp and most recent committer for each Docs page.
68
@@ -44,7 +46,7 @@ while read -r line ; do
4446
elif [[ "$line" && -z "${seen[$line]}" ]] ; then
4547
seen["$line"]="$date"
4648
fi
47-
done < <(git log --format="/%H %as %an" --name-only "$GIT_LOG_OPTS")
49+
done < <(git log --format="/%H %as %an" --name-only $GIT_LOG_OPTS)
4850

4951
echo "|Updated|Filename|Head line|"
5052
echo "|:-:|:-:|:-:|"
@@ -60,7 +62,7 @@ git ls-files "$path*.md" | while read -r f ; do
6062
echo "##### $f"
6163
fi
6264

63-
echo "|${seen[$f]}|$f|$head_line|"\
65+
echo "|${seen[$f]}|$GH_BASE/$f|$head_line|"\
6466
| iconv -f iso-8859-1 -t utf-8
6567
fi
6668
done | sort -r | grep "$name"

0 commit comments

Comments
 (0)