diff --git a/.gitattributes b/.gitattributes index 9f60208..dc7bb73 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,7 +24,6 @@ # Images *.png 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 diff --git a/README.md b/README.md index 491fbb3..e4541f6 100644 --- a/README.md +++ b/README.md @@ -15,4 +15,4 @@ You need both nix and flakes enabled. [1]: src/slides/example/Example.md -[2]: https://forgejo.skynet.ie/Skynet/nixos#prep \ No newline at end of file +[2]: https://gitlab.skynet.ie/compsoc1/skynet/nixos#prep \ No newline at end of file diff --git a/src/postmortem/2023-09-27_Signup-failures.md b/src/postmortem/2023-09-27_Signup-failures.md index 4aed9db..8ead7db 100644 --- a/src/postmortem/2023-09-27_Signup-failures.md +++ b/src/postmortem/2023-09-27_Signup-failures.md @@ -74,11 +74,11 @@ CREATE TABLE IF NOT EXISTS accounts_wolves ( ``` This also makes it easier to do the migration when teh Wolves API releases. -[Patch that fixed it](https://forgejo.skynet.ie/Skynet/ldap_backend/commit/9db8a238d2bf7be8bcfa86012b26180c041c13d1) +[Patch that fixed it](https://gitlab.skynet.ie/compsoc1/skynet/ldap/backend/-/commit/9db8a238d2bf7be8bcfa86012b26180c041c13d1) ## Things to improve for the future. - + * Verify/test it works before a big event. * If its new enough have a dev env on hand. * Its not //always// DNS (probally is though) diff --git a/src/slides/compsoc/1_domains-dns-oh-no.md b/src/slides/compsoc/1_domains-dns-oh-no.md index 15f7236..5888ff3 100644 --- a/src/slides/compsoc/1_domains-dns-oh-no.md +++ b/src/slides/compsoc/1_domains-dns-oh-no.md @@ -162,12 +162,12 @@ Or say ye wanted to go wild and have an Ogham domain name? ``ᚁᚏᚓᚅᚇᚐᚅ.com`` for example (brendan in Ogham) -[0]: https://forgejo.skynet.ie/Computer_Society/presentations_compsoc/src/commit/ceb346fe8e8dfc553fff520de7864e96236e887a/src/slides/compsoc/1_domains-dns-oh-no.md#L163 +[0]: https://gitlab.skynet.ie/compsoc1/compsoc/presentations/presentations/-/blob/ceb346fe8e8dfc553fff520de7864e96236e887a/src/slides/compsoc/1_domains-dns-oh-no.md#L163 ------------------------------------------------------------------------- ``ᚁᚏᚓᚅᚇᚐᚅ.com`` becomes ``xn--7ueiah2bis.com`` -```` + ------------------------------------------------------------------------- Magic! diff --git a/src/slides/compsoc/3_git.md b/src/slides/compsoc/3_git.md deleted file mode 100644 index d662dee..0000000 --- a/src/slides/compsoc/3_git.md +++ /dev/null @@ -1,269 +0,0 @@ -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -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 -<> - -------------------------------------------------------------------------- - -![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) - -------------------------------------------------------------------------- - -<> - - -------------------------------------------------------------------------- -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 -git pull origin -git add -git commit -m "" -git push origin -```` -------------------------------------------------------------------------- - -``https://.users.skynet.ie/`` \ No newline at end of file diff --git a/src/slides/compsoc/3_git/NAH.jpg b/src/slides/compsoc/3_git/NAH.jpg deleted file mode 100644 index 46a5931..0000000 --- a/src/slides/compsoc/3_git/NAH.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b93ccc50179e98170010e340bc6f44382e993e78fe6f46d06912da25acd4c43 -size 18232 diff --git a/src/slides/compsoc/3_git/bad_message.png b/src/slides/compsoc/3_git/bad_message.png deleted file mode 100644 index 8d1b2a0..0000000 --- a/src/slides/compsoc/3_git/bad_message.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca10627c4c15cac9718378ba7cc16b20b74a571a21e1c1658de8fe82bf71a7e8 -size 143553 diff --git a/src/slides/compsoc/3_git/forgejo_add_secret.png b/src/slides/compsoc/3_git/forgejo_add_secret.png deleted file mode 100644 index 90192ff..0000000 --- a/src/slides/compsoc/3_git/forgejo_add_secret.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11098766d2846bd3f96e4ca4fd0bde143de0e729aada9bfd2edbebcecb142ae6 -size 2832 diff --git a/src/slides/compsoc/3_git/forgejo_repo_link.png b/src/slides/compsoc/3_git/forgejo_repo_link.png deleted file mode 100644 index ec7092c..0000000 --- a/src/slides/compsoc/3_git/forgejo_repo_link.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3660f02d595cbeb89b0065a332142ce842e45278dc294a8e25f411b557c1c4da -size 8120 diff --git a/src/slides/compsoc/3_git/forgejo_repo_settings.png b/src/slides/compsoc/3_git/forgejo_repo_settings.png deleted file mode 100644 index 3546f1e..0000000 --- a/src/slides/compsoc/3_git/forgejo_repo_settings.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f18da7c01ac92591cf959576833ca9ed497d6eb1b97bd964f36f435d76e3281 -size 5165 diff --git a/src/slides/compsoc/3_git/forgejo_secrets_location.png b/src/slides/compsoc/3_git/forgejo_secrets_location.png deleted file mode 100644 index 51f7b8a..0000000 --- a/src/slides/compsoc/3_git/forgejo_secrets_location.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9341c7c436972b714a18660fdfac823e0c316f6b70dc4f49b1f76227b278e9b3 -size 10243 diff --git a/src/slides/compsoc/3_git/forgejo_ssh_key_example.png b/src/slides/compsoc/3_git/forgejo_ssh_key_example.png deleted file mode 100644 index 5337da1..0000000 --- a/src/slides/compsoc/3_git/forgejo_ssh_key_example.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e31c9482b2fd2c91bb8511d02259d8b93b867697b5c6fdf86a93871ffd79caf -size 20991 diff --git a/src/slides/compsoc/3_git/forgejo_template_button.png b/src/slides/compsoc/3_git/forgejo_template_button.png deleted file mode 100644 index 0976615..0000000 --- a/src/slides/compsoc/3_git/forgejo_template_button.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbfcc005d311e1e84b5a7ecbd8572f0384db6618041e89f3caa6457e5670fd6d -size 50537 diff --git a/src/slides/compsoc/3_git/forgejo_template_repo_creation.png b/src/slides/compsoc/3_git/forgejo_template_repo_creation.png deleted file mode 100644 index 87429a0..0000000 --- a/src/slides/compsoc/3_git/forgejo_template_repo_creation.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47dae1990bfd43afb40bbf08fa06fc7f3ac361c8dbb705c8f2ebd0668fb03fae -size 36306 diff --git a/src/slides/compsoc/3_git/git_download_button.png b/src/slides/compsoc/3_git/git_download_button.png deleted file mode 100644 index c42e917..0000000 --- a/src/slides/compsoc/3_git/git_download_button.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f129a2c0ffaab3d3347a613d7c6b081801b8fcf35f74c6e18e2a776389bc8020 -size 66338 diff --git a/src/slides/compsoc/3_git/git_installer.png b/src/slides/compsoc/3_git/git_installer.png deleted file mode 100644 index 075d1fb..0000000 --- a/src/slides/compsoc/3_git/git_installer.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cac6c961d163603314e590d2ac21012e54d0297d6a5c680a1278dd3fe9f3a83d -size 21709 diff --git a/src/slides/compsoc/3_git/git_installer_checkout_unix.png b/src/slides/compsoc/3_git/git_installer_checkout_unix.png deleted file mode 100644 index a800f3b..0000000 --- a/src/slides/compsoc/3_git/git_installer_checkout_unix.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a29a7010fe4f61daf8f11ccdab87f1866d00d1f9fb403e4e4879e17b8a60882 -size 24415 diff --git a/src/slides/compsoc/3_git/git_installer_default_rebase_pull.png b/src/slides/compsoc/3_git/git_installer_default_rebase_pull.png deleted file mode 100644 index f33babb..0000000 --- a/src/slides/compsoc/3_git/git_installer_default_rebase_pull.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f7ec846689414760e50d83c027cf0ca3d8d0b6bde7e6ed44e8bfb95d3e23999 -size 17633 diff --git a/src/slides/compsoc/3_git/git_installer_notepad_as_default_editor.png b/src/slides/compsoc/3_git/git_installer_notepad_as_default_editor.png deleted file mode 100644 index 1b6a50f..0000000 --- a/src/slides/compsoc/3_git/git_installer_notepad_as_default_editor.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ede2529a17922022246252dd9d7e93c8295a15ad53f92add4202037f2cc75ea4 -size 12213 diff --git a/src/slides/compsoc/3_git/git_installer_rename_master_to_main.png b/src/slides/compsoc/3_git/git_installer_rename_master_to_main.png deleted file mode 100644 index 7072736..0000000 --- a/src/slides/compsoc/3_git/git_installer_rename_master_to_main.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25da12821d1dca87684b38ed88a5e731386bcd5de0a650994f29339136af6aec -size 20301 diff --git a/src/slides/compsoc/4_Intro.md b/src/slides/compsoc/4_Intro.md index d5f14de..3d1df5c 100644 --- a/src/slides/compsoc/4_Intro.md +++ b/src/slides/compsoc/4_Intro.md @@ -4,7 +4,7 @@ date = 2024-09-15 slides = true +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -### Welcome, Welcome Welcome +### Welcome Welcome Welcome ------------------------------------------------------------------------- @@ -111,7 +111,7 @@ Though we also send out emails often enough. ------------------------------------------------------------------------- <> -![Discord QR](4_intro/qr_discord.png) +![Discord QR](4_intro/discord.png) ------------------------------------------------------------------------- diff --git a/src/slides/compsoc/4_intro/discord.png b/src/slides/compsoc/4_intro/discord.png new file mode 100644 index 0000000..b214fa4 --- /dev/null +++ b/src/slides/compsoc/4_intro/discord.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3be24ac877d6f52d7401e7e3516862ef4514a2e861d9c8ac67a0c8b832b056d1 +size 178559 diff --git a/src/slides/compsoc/4_intro/qr_discord.png b/src/slides/compsoc/4_intro/qr_discord.png deleted file mode 100644 index a42dd2d..0000000 --- a/src/slides/compsoc/4_intro/qr_discord.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b99ac4ff749e119a78006713740079cc23cc9cf9115c04ddf0d49877fa87889 -size 141908 diff --git a/src/slides/compsoc/4_intro/qr_wolves.png b/src/slides/compsoc/4_intro/qr_wolves.png deleted file mode 100644 index 119b809..0000000 --- a/src/slides/compsoc/4_intro/qr_wolves.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8cfb1666e5dd7cf5ae4c86deef1e5fcb5a07cee13791eebecfe433e268ae3ca6 -size 221678 diff --git a/src/slides/compsoc/5_Propaganda.md b/src/slides/compsoc/5_Propaganda.md deleted file mode 100644 index af1bfb1..0000000 --- a/src/slides/compsoc/5_Propaganda.md +++ /dev/null @@ -1,130 +0,0 @@ -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -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 -<> -![Computer Soc - Ul Wolves ](./4_intro/qr_wolves.png) - -------------------------------------------------------------------------- - -## Discord -<> -![Computer Soc - Discord](./4_intro/qr_discord.png) - -------------------------------------------------------------------------- - -## Any questions? -This presentation: -<> - -------------------------------------------------------------------------- - -//vanishes in a puff of smoke// \ No newline at end of file diff --git a/src/slides/compsoc/6_minecraft-onboarding.md b/src/slides/compsoc/6_minecraft-onboarding.md deleted file mode 100644 index adf6d3c..0000000 --- a/src/slides/compsoc/6_minecraft-onboarding.md +++ /dev/null @@ -1,83 +0,0 @@ -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -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 - -Computer Society definitely not evil servers -### so we decided to use some of that for evil (Minecraft servers)* -

*we are not liable for failing stuff bc you stayed up until 4am to finish building your castle

- ------------------------------------------------------------------------ - -### 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 - -Link Minecraft account - -(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 diff --git a/src/slides/compsoc/6_minecraft-onboarding/link-minecraft.png b/src/slides/compsoc/6_minecraft-onboarding/link-minecraft.png deleted file mode 100644 index 939bcfc..0000000 --- a/src/slides/compsoc/6_minecraft-onboarding/link-minecraft.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f31c0d5b6a8bf0facfe4b8ae7e6197440d5f9d5ae960badbfdd53a0f0bf029d6 -size 7506 diff --git a/src/slides/compsoc/6_minecraft-onboarding/skynet-server.jpg b/src/slides/compsoc/6_minecraft-onboarding/skynet-server.jpg deleted file mode 100644 index b3862ab..0000000 --- a/src/slides/compsoc/6_minecraft-onboarding/skynet-server.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b3e7700944f35b3108f090f146dd936876cf55c70bdb3fe365b5a45ffbd5ce7 -size 275013 diff --git a/src/slides/compsoc/7_virtualization.md b/src/slides/compsoc/7_virtualization.md deleted file mode 100644 index b212005..0000000 --- a/src/slides/compsoc/7_virtualization.md +++ /dev/null @@ -1,82 +0,0 @@ -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -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: -Create a new VM -------------------------------------------------------------------------- -then choose a name and select the image to use for the OS -Choose an image -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 -Allocate memory and CPU -The defaults you get are fine for this demo -------------------------------------------------------------------------- -and finally, choose how much storage you want to give the VM -Allocate storage -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 -``` -------------------------------------------------------------------------- diff --git a/src/slides/compsoc/7_virtualization/memory-cpu.png b/src/slides/compsoc/7_virtualization/memory-cpu.png deleted file mode 100644 index 31fd2bc..0000000 --- a/src/slides/compsoc/7_virtualization/memory-cpu.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76055d6b09bb19b375396f9df1000613f77836d733fd9ffd536a4f21cb1f1d33 -size 74140 diff --git a/src/slides/compsoc/7_virtualization/new-vm.png b/src/slides/compsoc/7_virtualization/new-vm.png deleted file mode 100644 index 174212a..0000000 --- a/src/slides/compsoc/7_virtualization/new-vm.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a421d0bfd34028c71676cab84d0825ece23054848aa0a656e28cb5fd5197fab -size 15208 diff --git a/src/slides/compsoc/7_virtualization/select-image.png b/src/slides/compsoc/7_virtualization/select-image.png deleted file mode 100644 index 0ca944c..0000000 --- a/src/slides/compsoc/7_virtualization/select-image.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58c35153ca573bc57738172faaa478af47f3225ab29068395868a9a946e3be77 -size 88820 diff --git a/src/slides/compsoc/7_virtualization/storage.png b/src/slides/compsoc/7_virtualization/storage.png deleted file mode 100644 index 0a64ba3..0000000 --- a/src/slides/compsoc/7_virtualization/storage.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:463fa1d29e9b5bd93983b8e6d1bba8f7e48c8ff80cc1cb4cbc9cec7e2d275f5f -size 77791 diff --git a/src/slides/compsoc/8_aoc.md b/src/slides/compsoc/8_aoc.md deleted file mode 100644 index 904a725..0000000 --- a/src/slides/compsoc/8_aoc.md +++ /dev/null @@ -1,134 +0,0 @@ -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -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 - -------------------------------------------------------------------------- - -<> - -------------------------------------------------------------------------- - -Sign up with yer: ``[GitHub]`` ``[Google]`` ``[Twitter]`` ``[Reddit]`` Accounts - -------------------------------------------------------------------------- - -See Discord (<>) for the daily posts on it. - -------------------------------------------------------------------------- - -*Now get into doing two days worth of puzzles to get ye started* - diff --git a/src/slides/compsoc/9_computer-concepts.pptx b/src/slides/compsoc/9_computer-concepts.pptx deleted file mode 100644 index 6b6e7c6..0000000 --- a/src/slides/compsoc/9_computer-concepts.pptx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56442b4ae0b3240c4e38a0587b083c48a03489713fae4ae8beb67ab2a751f684 -size 11999253 diff --git a/src/slides/skynet/0_Intro.md b/src/slides/skynet/0_Intro.md index 6407b46..4907d88 100644 --- a/src/slides/skynet/0_Intro.md +++ b/src/slides/skynet/0_Intro.md @@ -12,7 +12,7 @@ Skynet is the UL Computer Society's computer cluster. ------------------------------------------------------------------------- -Has a long history: <>. +Has a long history: <>. ------------------------------------------------------------------------- @@ -65,7 +65,7 @@ Powered by NixOS. ------------------------------------------------------------------------- -Fully open source: <> +Fully open source: <> ------------------------------------------------------------------------- @@ -86,7 +86,7 @@ How hosts: ------------------------------------------------------------------------- * Email -* Forgejo + CI/CD runners +* Gitlab + CI/CD runners * Game Servers * Minecraft * ULFM diff --git a/src/slides/skynet/1_setup.md b/src/slides/skynet/1_setup.md index 4b5ac9c..8998b08 100644 --- a/src/slides/skynet/1_setup.md +++ b/src/slides/skynet/1_setup.md @@ -283,7 +283,7 @@ As part of your Skynet account you have access to our Gitlab Server. ------------------------------------------------------------------------- -1. Go to <> +1. Go to <> 2. Login with ``username`` and ``password`` 3. Done diff --git a/src/slides/skynet/3_nix.md b/src/slides/skynet/3_nix.md index 6eb6dc0..d74b0ff 100644 --- a/src/slides/skynet/3_nix.md +++ b/src/slides/skynet/3_nix.md @@ -134,7 +134,7 @@ Making it hard to get a good overview ------------------------------------------------------------------------- -Skynet 3.0 is fully source controlled on [forgejo.skynet.ie][4] +Skynet 3.0 is fully source controlled on [gitlab.skynet.ie][4] ------------------------------------------------------------------------- @@ -163,4 +163,4 @@ Questions? [1]: https://en.wikipedia.org/wiki/Unix_philosophy [2]: https://nix.dev/tutorials/first-steps/ [3]: https://nixos.org/guides/nix-pills/# -[4]: https://forgejo.skynet.ie/Skynet/nixos \ No newline at end of file +[4]: https://gitlab.skynet.ie/compsoc1/skynet/nixos \ No newline at end of file diff --git a/src/slides/skynet/4_dns.md b/src/slides/skynet/4_dns.md index dca92d9..273df74 100644 --- a/src/slides/skynet/4_dns.md +++ b/src/slides/skynet/4_dns.md @@ -114,6 +114,6 @@ host 193.1.99.75 ------------------------------------------------------------------------- -* <> -* <> +* <> +* <> diff --git a/src/slides/skynet/9_email.md b/src/slides/skynet/9_email.md index c212d02..bf270ec 100644 --- a/src/slides/skynet/9_email.md +++ b/src/slides/skynet/9_email.md @@ -135,9 +135,8 @@ 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] - -[0]: https://forgejo.skynet.ie/Skynet/nixos/src/commit/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix +[0]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix?ref_type=heads [1]: https://www.youtube.com/watch?v=mrGfahzt-4Q -[2]: https://forgejo.skynet.ie/Skynet/nixos/src/commit/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix#L31-L91 +[2]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix?ref_type=heads#L31-L91 [3]: https://www.thunderbird.net/en-GB/ -[4]: https://forgejo.skynet.ie/Skynet/nixos/src/commit/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix#L314-L343 \ No newline at end of file +[4]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/26e715b2f62e406deee5e773ebcc3e3c3d200186/applications/email.nix?ref_type=heads#L314-L343 \ No newline at end of file diff --git a/src/templates/powerpoint.html b/src/templates/powerpoint.html index 69bfcf1..61edf61 100644 --- a/src/templates/powerpoint.html +++ b/src/templates/powerpoint.html @@ -21,8 +21,6 @@ top: 50%; left: 50%; transform: translate(-50%, -50%) scale(2); - line-height: 2; - font-size: 20px; } ol, ul { margin-top: 0;