Compare commits
34 commits
Author | SHA1 | Date | |
---|---|---|---|
744777c990 | |||
2b6c47b365 | |||
b6d9ae0591 | |||
|
4b01336503 | ||
|
5c4394efd5 | ||
|
4868914966 | ||
1d158667a5 | |||
|
4af037f195 | ||
ece869efae | |||
|
f71419f0f5 | ||
|
4cdd60ac2a | ||
|
01bbbb6813 | ||
|
96c1857519 | ||
|
001c985e81 | ||
|
4298096d45 | ||
|
9fe4e96e9f | ||
|
b5bc1c260d | ||
|
e67e223a1d | ||
|
08971d72de | ||
|
0a59b61902 | ||
|
84e9b71303 | ||
|
6e851d7d5d | ||
|
022f8b6428 | ||
|
a8cb48a83f | ||
aca7ed10f3 | |||
|
0103180b05 | ||
|
34a05e9baf | ||
|
08c19c1a64 | ||
|
f30409e7a7 | ||
|
7cfce43b8c | ||
|
b654ef956f | ||
1181367a11 | |||
3fb2fd46cc | |||
ac55cd45e2 |
40 changed files with 789 additions and 21 deletions
1
.gitattributes
vendored
1
.gitattributes
vendored
|
@ -24,6 +24,7 @@
|
||||||
# Images
|
# Images
|
||||||
*.png filter=lfs diff=lfs merge=lfs -text
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
*.jpg filter=lfs diff=lfs merge=lfs -text
|
*.jpg filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jpeg filter=lfs diff=lfs merge=lfs -text
|
||||||
*.webp filter=lfs diff=lfs merge=lfs -text
|
*.webp filter=lfs diff=lfs merge=lfs -text
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -15,4 +15,4 @@ You need both nix and flakes enabled.
|
||||||
|
|
||||||
|
|
||||||
[1]: src/slides/example/Example.md
|
[1]: src/slides/example/Example.md
|
||||||
[2]: https://gitlab.skynet.ie/compsoc1/skynet/nixos#prep
|
[2]: https://forgejo.skynet.ie/Skynet/nixos#prep
|
|
@ -74,7 +74,7 @@ CREATE TABLE IF NOT EXISTS accounts_wolves (
|
||||||
```
|
```
|
||||||
This also makes it easier to do the migration when teh Wolves API releases.
|
This also makes it easier to do the migration when teh Wolves API releases.
|
||||||
|
|
||||||
[Patch that fixed it](https://gitlab.skynet.ie/compsoc1/skynet/ldap/backend/-/commit/9db8a238d2bf7be8bcfa86012b26180c041c13d1)
|
[Patch that fixed it](https://forgejo.skynet.ie/Skynet/ldap_backend/commit/9db8a238d2bf7be8bcfa86012b26180c041c13d1)
|
||||||
|
|
||||||
|
|
||||||
## Things to improve for the future.
|
## Things to improve for the future.
|
||||||
|
|
|
@ -162,12 +162,12 @@ Or say ye wanted to go wild and have an Ogham domain name?
|
||||||
|
|
||||||
``ᚁᚏᚓᚅᚇᚐᚅ.com`` for example (brendan in Ogham)
|
``ᚁᚏᚓᚅᚇᚐᚅ.com`` for example (brendan in Ogham)
|
||||||
|
|
||||||
[0]: https://gitlab.skynet.ie/compsoc1/compsoc/presentations/presentations/-/blob/ceb346fe8e8dfc553fff520de7864e96236e887a/src/slides/compsoc/1_domains-dns-oh-no.md#L163
|
[0]: https://forgejo.skynet.ie/Computer_Society/presentations_compsoc/src/commit/ceb346fe8e8dfc553fff520de7864e96236e887a/src/slides/compsoc/1_domains-dns-oh-no.md#L163
|
||||||
|
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
``ᚁᚏᚓᚅᚇᚐᚅ.com`` becomes ``xn--7ueiah2bis.com``
|
``ᚁᚏᚓᚅᚇᚐᚅ.com`` becomes ``xn--7ueiah2bis.com``
|
||||||
|
````
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
Magic!
|
Magic!
|
||||||
|
|
269
src/slides/compsoc/3_git.md
Normal file
269
src/slides/compsoc/3_git.md
Normal file
|
@ -0,0 +1,269 @@
|
||||||
|
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
title = "Git"
|
||||||
|
date = 2024-09-18
|
||||||
|
slides = true
|
||||||
|
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
|
||||||
|
# Git
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
The 4 Ws of Git
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
WHAT is Git?
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
WHO is Git made for?
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
WHY is Git used?
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
WHEN is Git used?
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Last but not least, HOW do we use Git?
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Let's start with the WHAT
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Git is tool that's used in the programming Industry.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Specifically to track project work done, and the changes to files we've made.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
The more correct term is Source Control.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
It is NOT a programming language.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Now we move onto the WHO.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Git is a tool made for (usually) us programmers to track the work we've done.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Programmer socks (not) included.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Now we need to ask the WHY.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Why would we need a tool like this?
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Why not use Google Drive instead?
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
I will find your IP address.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
In all honesty,
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
It's to help keep track of who did what.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
And to work on unique features...
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
without affecting the main area/branch (we'll return to this) of our work.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Now finally the WHEN.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
When DO we use git?
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Because Git keeps track of the changes we've made to files,
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
We can then use it to commit and stage these files,
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
and push them to a place where we can store them.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
This place is called a Repository.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
But, an interesting feature of git, is that it allows you to time-travel.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Meaning that if a project breaks, you can go back to before it broke.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Now I hear you in the audience asking...
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Why not use SVN?
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
The answer is simple.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![NAH](3_git/NAH.jpg)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
An actual answer is that Git is Distributed, and SVN in centralized.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Simply put, devs can store their changes locally on their machines,
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
where on SVN they're stored on a central system.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
With a central system you NEED to be connected at all times to work on it.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
You can work locally on git without having to be connected,
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
and then push once you're reconnected.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Back to git.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Let's start with the basics.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# Live demonstration time
|
||||||
|
|
||||||
|
Please get your laptop out
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
How to download git & git LFS
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
## Download
|
||||||
|
<<https://git-scm.com/downloads>>
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![img.png](3_git/git_download_button.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![img_1.png](3_git/git_installer.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![img_2.png](3_git/git_installer_notepad_as_default_editor.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![img_3.png](3_git/git_installer_rename_master_to_main.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![img_4.png](3_git/git_installer_checkout_unix.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![img_5.png](3_git/git_installer_default_rebase_pull.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
<<https://forgejo.skynet.ie/Skynet/deploy_user>>
|
||||||
|
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
Don't do this
|
||||||
|
![BAD](3_git/bad_message.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![img_6.png](3_git/forgejo_template_button.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![img_7.png](3_git/forgejo_template_repo_creation.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![img_8.png](3_git/forgejo_repo_link.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Setup SSH key (see Readme.md))
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![img_9.png](3_git/forgejo_repo_settings.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![img_10.png](3_git/forgejo_secrets_location.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![img_12.png](3_git/forgejo_add_secret.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
![img_11.png](3_git/forgejo_ssh_key_example.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
````bash
|
||||||
|
git init
|
||||||
|
git remote add origin <repo_url>
|
||||||
|
git pull origin <branch_name>
|
||||||
|
git add <file_name>
|
||||||
|
git commit -m "<commit_message>"
|
||||||
|
git push origin <branch_name>
|
||||||
|
````
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
``https://<username>.users.skynet.ie/``
|
BIN
src/slides/compsoc/3_git/NAH.jpg
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/NAH.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/bad_message.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/bad_message.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/forgejo_add_secret.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/forgejo_add_secret.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/forgejo_repo_link.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/forgejo_repo_link.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/forgejo_repo_settings.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/forgejo_repo_settings.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/forgejo_secrets_location.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/forgejo_secrets_location.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/forgejo_ssh_key_example.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/forgejo_ssh_key_example.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/forgejo_template_button.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/forgejo_template_button.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/forgejo_template_repo_creation.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/forgejo_template_repo_creation.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/git_download_button.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/git_download_button.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/git_installer.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/git_installer.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/git_installer_checkout_unix.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/git_installer_checkout_unix.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/git_installer_default_rebase_pull.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/git_installer_default_rebase_pull.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/git_installer_notepad_as_default_editor.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/git_installer_notepad_as_default_editor.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/3_git/git_installer_rename_master_to_main.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/3_git/git_installer_rename_master_to_main.png
(Stored with Git LFS)
Normal file
Binary file not shown.
|
@ -4,7 +4,7 @@ date = 2024-09-15
|
||||||
slides = true
|
slides = true
|
||||||
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
|
||||||
### Welcome Welcome Welcome
|
### Welcome, Welcome Welcome
|
||||||
|
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -111,7 +111,7 @@ Though we also send out emails often enough.
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
<<https://discord.skynet.ie>>
|
<<https://discord.skynet.ie>>
|
||||||
![Discord QR](4_intro/discord.png)
|
![Discord QR](4_intro/qr_discord.png)
|
||||||
|
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
BIN
src/slides/compsoc/4_intro/discord.png
(Stored with Git LFS)
BIN
src/slides/compsoc/4_intro/discord.png
(Stored with Git LFS)
Binary file not shown.
BIN
src/slides/compsoc/4_intro/qr_discord.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/4_intro/qr_discord.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/4_intro/qr_wolves.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/4_intro/qr_wolves.png
(Stored with Git LFS)
Normal file
Binary file not shown.
130
src/slides/compsoc/5_Propaganda.md
Normal file
130
src/slides/compsoc/5_Propaganda.md
Normal file
|
@ -0,0 +1,130 @@
|
||||||
|
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
title = "Why you should join Compsoc"
|
||||||
|
date = 2024-09-17
|
||||||
|
slides = true
|
||||||
|
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
|
||||||
|
## Why you should join UL Computer Society
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
## Hello 1st years!
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
(Or any other year, we arent picky)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
((Some of your lecturers are even members))
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
(((If you are ISE we are here to help you escape this building))
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
We are UL Computer Society and we are here to ~~kidnap~~ recruit you today!
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
As you might guess we really like computers.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Though we would rather say we are in teh business of networking.
|
||||||
|
|
||||||
|
------------------------------------------------------------------------
|
||||||
|
|
||||||
|
We do the usual networking with switches and cables
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
But we also do Social Networking (aided by free pizza every so often)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
On top of that we do intra-society networking (like Games Development)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Or if brave inter-society networking with other computer societies
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
## What else we do
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
We have a mix of Software, Social and Hardware events
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
And go to Tech Conferences like PyCon or SISTEM
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
We also provide a (long) list of services to our members
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
## Skynet
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
(the good kind)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
((We swear))
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
(((Though it is self updating.....)))
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Skynet is our (semi) enterprise grade computer cluster
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
It is ~32 years old now
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
100TB+ of data storage
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
It is also FOSS
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Can get hands on with the ``root`` team if ye want (?)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
## Meetups
|
||||||
|
We meet every Wendesday at 6pm in teh Courtyard room in Student Life
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
## Wolves
|
||||||
|
<<https://ulwolves.ie/society/computer>>
|
||||||
|
![Computer Soc - Ul Wolves ](./4_intro/qr_wolves.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
## Discord
|
||||||
|
<<https://discord.skynet.ie>>
|
||||||
|
![Computer Soc - Discord](./4_intro/qr_discord.png)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
## Any questions?
|
||||||
|
This presentation:
|
||||||
|
<<https://public.skynet.ie/slides/compsoc/5_Propaganda.html>>
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
//vanishes in a puff of smoke//
|
83
src/slides/compsoc/6_minecraft-onboarding.md
Normal file
83
src/slides/compsoc/6_minecraft-onboarding.md
Normal file
|
@ -0,0 +1,83 @@
|
||||||
|
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
title = "Using our Minecraft servers"
|
||||||
|
date = "2024-09-25"
|
||||||
|
slides = true
|
||||||
|
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
|
||||||
|
## Welcome (back) everyone!!
|
||||||
|
|
||||||
|
--------------------------------------------------------------------
|
||||||
|
|
||||||
|
we got a quite a bit of server power here at Skynet
|
||||||
|
|
||||||
|
<img src="6_minecraft-onboarding/skynet-server.jpg" alt="Computer Society definitely not evil servers" width="120px" height="160px"></img>
|
||||||
|
### so we decided to use some of that for evil (Minecraft servers)*
|
||||||
|
<p style="font-size: 10px"> *we are not liable for failing stuff bc you stayed up until 4am to finish building your castle </p>
|
||||||
|
|
||||||
|
-----------------------------------------------------------------------
|
||||||
|
|
||||||
|
### soooo, how do you get access to our Minecraft servers?
|
||||||
|
there are a few easy steps involved
|
||||||
|
|
||||||
|
---------------------------------------------------------------------
|
||||||
|
|
||||||
|
### first of all you have to be in the CompSoc discord server
|
||||||
|
link here: [discord.skynet.ie](https://discord.skynet.ie/)
|
||||||
|
|
||||||
|
or you can find it on the society's page on the UL Wolves website
|
||||||
|
|
||||||
|
-----------------------------------------------------------------------
|
||||||
|
|
||||||
|
### next you need to have your discord account linked to your ul wolves account
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------
|
||||||
|
|
||||||
|
### and finally!! you need to link your Minecraft account like this
|
||||||
|
|
||||||
|
<img src="6_minecraft-onboarding/link-minecraft.png" alt="Link Minecraft account" width="300px" height="23px"></img>
|
||||||
|
|
||||||
|
(you can use the ``#bot-commands`` channel to not spam everyone)
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------
|
||||||
|
|
||||||
|
## but what's the ip??
|
||||||
|
|
||||||
|
------------------------------------------------
|
||||||
|
|
||||||
|
### we actually got 2 servers you can play on!
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
## first one is a vanilla 1.20.4 server, but you can join from most versions past and future even though not all features might work
|
||||||
|
|
||||||
|
seriously! i usually play from 1.21 and it also worked when i joined from 1.8.9
|
||||||
|
|
||||||
|
the address of the server is **minecraft.compsoc.games.skynet.ie**
|
||||||
|
|
||||||
|
if you want to join from bedrock edition: ip is **193.1.99.91** and the port is **19132**
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
### for this server i made a modpack that enhances the multiplayer experience a bit nothing big AND you DON'T NEED to have it to play
|
||||||
|
|
||||||
|
you can find it on [Modrinth.com](https://www.modrinth.com) and search for [CompSoc Vanilla Enhanced](https://modrinth.com/modpack/compsoc-vanilla-enhanced) (or click the links here)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
## second server is using the Aged modpack version 2.2.2
|
||||||
|
|
||||||
|
will let you know if we update, check the discord server
|
||||||
|
|
||||||
|
the address of the server is **minecraft-aged.compsoc.games.skynet.ie**
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------
|
||||||
|
|
||||||
|
### you can find the modpack for this server by searching for "Aged" on [Modrinth.com](https://www.modrinth.com)
|
||||||
|
|
||||||
|
remember to download the right version of the modpack, which is currently 2.2.2!!
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
## That's it have fun!
|
||||||
|
|
||||||
|
you can find these slides on **[public.skynet.ie](https://public.skynet.ie)** > **slides** > **compsoc** > 6_minecraft_onboarding.html
|
BIN
src/slides/compsoc/6_minecraft-onboarding/link-minecraft.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/6_minecraft-onboarding/link-minecraft.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/6_minecraft-onboarding/skynet-server.jpg
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/6_minecraft-onboarding/skynet-server.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
82
src/slides/compsoc/7_virtualization.md
Normal file
82
src/slides/compsoc/7_virtualization.md
Normal file
|
@ -0,0 +1,82 @@
|
||||||
|
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
title = "Virtualization"
|
||||||
|
date = 2024-04-17
|
||||||
|
slides = true
|
||||||
|
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
|
||||||
|
# Virtual Machines (and more)
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
so what is a virtual machine???
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
basically you run another smaller computer in your computer
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
*insert inception joke here\*
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
### Why would you want this?
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
- You can run multiple OSes on one machine
|
||||||
|
- You can run software that might not be compatible with your main OS
|
||||||
|
- It's helpful for testing and setting up a new OS
|
||||||
|
- VMs are used **A LOT** in those big server rooms and professional environments
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
### How do I do this on my own laptop then?
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
there's a lot of *virtualization* software out there, but we'll be using VirtualBox today
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
It's free, and it's pretty easy to use
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
you can download it [here](https://www.virtualbox.org/wiki/Downloads)
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
if you already know all of this just wait we have more stuff after this
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
when you open VirtualBox, create a new VM like this:
|
||||||
|
<img src="7_virtualization/new-vm.png" alt="Create a new VM" width="400px" height="187px"></img>
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
then choose a name and select the image to use for the OS
|
||||||
|
<img src="7_virtualization/select-image.png" alt="Choose an image" width="351px" height="196px"></img>
|
||||||
|
I'll be using Ubuntu 24.04, if you want to use another linux distro you probably know how to do this already
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
now, select how much memory and CPU you want to allocate to the new VM
|
||||||
|
<img src="7_virtualization/memory-cpu.png" alt="Allocate memory and CPU" width="353px" height="196px"></img>
|
||||||
|
The defaults you get are fine for this demo
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
and finally, choose how much storage you want to give the VM
|
||||||
|
<img src="7_virtualization/storage.png" alt="Allocate storage" width="352px" height="196px"></img>
|
||||||
|
10GB is enough for now, you can use more if you want
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
### Click "Finish" and now you got your new VM!!
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
we still need to install the operating system but that's easy enough
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
*live demo in progress\*
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
### Now on to the next part (it gets better)
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
you probably saw how many resources it takes to run a VM
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
what if I want to only run a single app without all the overhead??
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
### Containers to the rescue!!
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
containers are kind of like VMs, but much lighter
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
instead of emulating an entire computer, they just run the OS
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
### Why use VMs then?
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
- VMs are more secure
|
||||||
|
- they're more isolated from the host system
|
||||||
|
- not limited to running the same OS as the host
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
### How do I use containers?
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
one of the most popular container platforms is Docker
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
rn we will use it on the VM we just created
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
the commands we will need to install Docker:
|
||||||
|
```
|
||||||
|
curl -fsSL https://get.docker.com -o get-docker.sh``
|
||||||
|
sudo sh get-docker.sh
|
||||||
|
```
|
||||||
|
-------------------------------------------------------------------------
|
BIN
src/slides/compsoc/7_virtualization/memory-cpu.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/7_virtualization/memory-cpu.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/7_virtualization/new-vm.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/7_virtualization/new-vm.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/7_virtualization/select-image.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/7_virtualization/select-image.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
src/slides/compsoc/7_virtualization/storage.png
(Stored with Git LFS)
Normal file
BIN
src/slides/compsoc/7_virtualization/storage.png
(Stored with Git LFS)
Normal file
Binary file not shown.
134
src/slides/compsoc/8_aoc.md
Normal file
134
src/slides/compsoc/8_aoc.md
Normal file
|
@ -0,0 +1,134 @@
|
||||||
|
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
title = "Advent of Code"
|
||||||
|
date = 2024-11-27
|
||||||
|
slides = true
|
||||||
|
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
|
||||||
|
# Advent of code
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Advent of Code is an annual programming event
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Its like an advent calendar
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
But instead of chocolate
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
You can byte into code problems
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Each day of advent gives you two problems
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
You get Gold Stars!
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐⭐
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Part one is the easy enough one
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Can brute force it if you really want
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Once ye got the part one complete the second one opens
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Brute forcing may take longer than the heat death of the universe
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
So ye have to get smarter
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Plenty of algos to be introduced to
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
If you find it easy there are many ways to amp up teh difficulty
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
You can compete to complete it fastest
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
(A classmate was in teh worldwide top 1000 last year)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
There are global and local leaderboards (we have one)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
You can do it in a new language (I use rust)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
You can create your own language for it (if ye are that insane)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Some do it in excel
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Or brainfuck
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Or by hand
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
You can add [Bad Apple][0] to it (2022 Day 10, make a TV)
|
||||||
|
|
||||||
|
[0]: https://www.youtube.com/watch?v=EevY4szGgQI
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
One downside is it hits us right at exam times
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Another is that the puzzles release at 6am
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Thankfully all past puzzles are available to do
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
So we tend to run a second one in January for those who are interested
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
<<https://adventofcode.com/>>
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Sign up with yer: ``[GitHub]`` ``[Google]`` ``[Twitter]`` ``[Reddit]`` Accounts
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
See Discord (<<https://discord.skynet.ie>>) for the daily posts on it.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
*Now get into doing two days worth of puzzles to get ye started*
|
||||||
|
|
|
@ -12,7 +12,7 @@ Skynet is the UL Computer Society's computer cluster.
|
||||||
|
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
Has a long history: <<https://2016.skynet.ie/history.html>>.
|
Has a long history: <<https://2009.skynet.ie/history.html>>.
|
||||||
|
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ Powered by NixOS.
|
||||||
|
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
Fully open source: <<https://gitlab.skynet.ie/compsoc1/skynet/nixos>>
|
Fully open source: <<https://forgejo.skynet.ie/Skynet/nixos>>
|
||||||
|
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ How hosts:
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
* Email
|
* Email
|
||||||
* Gitlab + CI/CD runners
|
* Forgejo + CI/CD runners
|
||||||
* Game Servers
|
* Game Servers
|
||||||
* Minecraft
|
* Minecraft
|
||||||
* ULFM
|
* ULFM
|
||||||
|
|
|
@ -283,7 +283,7 @@ As part of your Skynet account you have access to our Gitlab Server.
|
||||||
|
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
1. Go to <<https://gitlab.skynet.ie>>
|
1. Go to <<https://forgejo.skynet.ie>>
|
||||||
2. Login with ``username`` and ``password``
|
2. Login with ``username`` and ``password``
|
||||||
3. Done
|
3. Done
|
||||||
|
|
||||||
|
|
|
@ -134,7 +134,7 @@ Making it hard to get a good overview
|
||||||
|
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
Skynet 3.0 is fully source controlled on [gitlab.skynet.ie][4]
|
Skynet 3.0 is fully source controlled on [forgejo.skynet.ie][4]
|
||||||
|
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -163,4 +163,4 @@ Questions?
|
||||||
[1]: https://en.wikipedia.org/wiki/Unix_philosophy
|
[1]: https://en.wikipedia.org/wiki/Unix_philosophy
|
||||||
[2]: https://nix.dev/tutorials/first-steps/
|
[2]: https://nix.dev/tutorials/first-steps/
|
||||||
[3]: https://nixos.org/guides/nix-pills/#
|
[3]: https://nixos.org/guides/nix-pills/#
|
||||||
[4]: https://gitlab.skynet.ie/compsoc1/skynet/nixos
|
[4]: https://forgejo.skynet.ie/Skynet/nixos
|
|
@ -114,6 +114,6 @@ host 193.1.99.75
|
||||||
|
|
||||||
-------------------------------------------------------------------------
|
-------------------------------------------------------------------------
|
||||||
|
|
||||||
* <<https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/issues/21>>
|
* <<https://forgejo.skynet.ie/Skynet/nixos/issues/21>>
|
||||||
* <<https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/issues/33>>
|
* <<https://forgejo.skynet.ie/Skynet/nixos/issues/33>>
|
||||||
|
|
||||||
|
|
|
@ -135,8 +135,9 @@ In this example I would be able to send mail as ``this_is_a_real_email@skynet.ie
|
||||||
[//Use this time to explore the nixos repo to explain//][0]
|
[//Use this time to explore the nixos repo to explain//][0]
|
||||||
|
|
||||||
|
|
||||||
[0]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix?ref_type=heads
|
|
||||||
|
[0]: https://forgejo.skynet.ie/Skynet/nixos/src/commit/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix
|
||||||
[1]: https://www.youtube.com/watch?v=mrGfahzt-4Q
|
[1]: https://www.youtube.com/watch?v=mrGfahzt-4Q
|
||||||
[2]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix?ref_type=heads#L31-L91
|
[2]: https://forgejo.skynet.ie/Skynet/nixos/src/commit/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix#L31-L91
|
||||||
[3]: https://www.thunderbird.net/en-GB/
|
[3]: https://www.thunderbird.net/en-GB/
|
||||||
[4]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix?ref_type=heads#L314-L343
|
[4]: https://forgejo.skynet.ie/Skynet/nixos/src/commit/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix#L314-L343
|
|
@ -21,6 +21,8 @@
|
||||||
top: 50%;
|
top: 50%;
|
||||||
left: 50%;
|
left: 50%;
|
||||||
transform: translate(-50%, -50%) scale(2);
|
transform: translate(-50%, -50%) scale(2);
|
||||||
|
line-height: 2;
|
||||||
|
font-size: 20px;
|
||||||
}
|
}
|
||||||
ol, ul {
|
ol, ul {
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
|
|
Loading…
Reference in a new issue