diff --git a/.forgejo/workflows/push.yaml b/.forgejo/workflows/push.yaml index 008a1e3..c01e644 100644 --- a/.forgejo/workflows/push.yaml +++ b/.forgejo/workflows/push.yaml @@ -1,13 +1,11 @@ name: On_Push on: - workflow_dispatch: push: branches: - 'main' paths: - flake.* - - slides/**/* - src/**/* - .forgejo/**/* diff --git a/.gitattributes b/.gitattributes index 9f60208..3da48a6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,8 +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 # Video diff --git a/.gitignore b/.gitignore index 4b93dba..471560b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,8 +14,6 @@ test.* /out /build /target -/slides/**/*.html -/slides/**/*.pdf # Dealing with BlueJ *.bluej 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/config.yaml b/config.yaml deleted file mode 100644 index bc01891..0000000 --- a/config.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -# yaml-language-server: $schema=https://raw.githubusercontent.com/mfontanini/presenterm/master/config-file-schema.json -defaults: - # override the terminal font size when in windows or when using sixel. - terminal_font_size: 20 - validate_overflows: always - - max_columns: 100 - # Valid values: left, center, right - max_columns_alignment: center - - max_rows: 30 - # Valid values: top, center, bottom - max_rows_alignment: top - -speaker_notes: - always_publish: true - -export: - pauses: new_slide - # works nicely at 1080p, then do a 250% zoom - dimensions: - rows: 30 - columns: 100 - -snippet: - exec: - # enable code snippet execution. Use at your own risk! - enable: true - custom: - # The keys should be the language identifier you'd use in a code block. - racket: - # The name of the file that will be created with your snippet's contents. - filename: "snippet.rkt" - - # A prefix that indicates a line that starts with it should not be visible but should be executed if the - # snippet is marked with `+exec`. - hidden_line_prefix: "/// " - - # A list of commands that will be ran one by one in the same directory as the snippet is in. - commands: - # run the racket program - - ["racket", "$pwd/snippet.rkt"] diff --git a/flake.lock b/flake.lock index bbcab93..a505ec1 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1723500950, - "narHash": "sha256-t1eApFGI+JzLIW2YToLlDV20n+Nevk1q4fZBYU1m93I=", + "lastModified": 1723391194, + "narHash": "sha256-04UThV4LZNRHg/+GbEl7M2ginWbm8FrQ5jBVmYcroNg=", "owner": "silver_rust", "repo": "bfom", - "rev": "7f339f28442758ecc3f1697e3f70d441973664b9", + "rev": "fffd69b6433a2d2fd359b92e3816ae9938b3e99c", "type": "gitlab" }, "original": { @@ -68,16 +68,15 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1715413075, + "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 3a8b1bc..c0dcd47 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ description = "Skynet Presentations"; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; utils.url = "github:numtide/flake-utils"; # nix flake lock --update-input bfom @@ -21,88 +20,30 @@ outputs = { self, nixpkgs, - utils, bfom, ... - }: utils.lib.eachDefaultSystem ( - system: let - pkgs = (import nixpkgs) { - inherit system; - }; + } @ inputs: let + pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs; + in { + # nix run + apps.x86_64-linux.default = { + type = "app"; + program = "${bfom.defaultPackage.x86_64-linux}/bin/cargo-bfom"; + }; - dependencies = with pkgs; [ - # For teh presentations themselves - presenterm + # `nix build` + packages.x86_64-linux.default = pkgs.stdenv.mkDerivation { + name = "slides.skynet.ie"; + src = self; + buildPhase = "${bfom.defaultPackage.x86_64-linux}/bin/cargo-bfom"; + installPhase = "mkdir -p $out; cp -R build/* $out"; + }; - # for exporting - (pkgs.python3.withPackages (python-pkgs: with python-pkgs; [ - # for exporting - weasyprint - ])) - # various languages to embed in it - ## Java - # zulu24 - ## C - # gcc - ## rust - # cargo - # rustc - ## lua - # lua - ## racket - # racket - ## go - # go - ]; - in rec { - # `nix develop` - devShell = pkgs.mkShell { - packages = dependencies; - PRESENTERM_CONFIG_FILE = "config.yaml"; - }; - - packages.default = pkgs.stdenv.mkDerivation { - name = "slides.skynet.ie"; - src = self; - nativeBuildInputs = dependencies; - buildInputs = dependencies; - buildPhase = '' - # first pass through to get teh old files - ${bfom.defaultPackage.x86_64-linux}/bin/cargo-bfom - - # then look into ./slides - export PRESENTERM_CONFIG_FILE=config.yaml - # recursively find each one then --export-html to ./build/slides/ - shopt -s globstar - for source in slides/**/*.md; do - echo $source - output="$(dirname "$source")/$(basename "$source" .md).html" - echo $output - presenterm --export-html "$source" - mkdir -p "build/$(dirname "$source")" - cp "$output" "build/$output" - done - shopt -u globstar - ''; - installPhase = "mkdir -p $out; cp -R build/* $out"; - }; - }); -# @ inputs: let -# pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs; -# in { -# # `nix build` -# packages.x86_64-linux.default = pkgs.stdenv.mkDerivation { -# name = "slides.skynet.ie"; -# src = self; -# buildPhase = "${bfom.defaultPackage.x86_64-linux}/bin/cargo-bfom"; -# installPhase = "mkdir -p $out; cp -R build/* $out"; -# }; -# -# devShells.x86_64-linux.default = pkgs.mkShell { -# name = "Skynet presentations env"; -# nativeBuildInputs = [ -# bfom.defaultPackage.x86_64-linux -# ]; -# }; -# }; + devShells.x86_64-linux.default = pkgs.mkShell { + name = "Skynet presentations env"; + nativeBuildInputs = [ + bfom.defaultPackage.x86_64-linux + ]; + }; + }; } diff --git a/slides/compsoc/2025-2025/intro_to_soc.md b/slides/compsoc/2025-2025/intro_to_soc.md deleted file mode 100644 index 42e18a4..0000000 --- a/slides/compsoc/2025-2025/intro_to_soc.md +++ /dev/null @@ -1,347 +0,0 @@ ---- -title: "Computer Society" -sub_title: "We live in the basement" -author: "Brendan Golden" -date: "2025-09-13" -theme: - name: catppuccin-latte ---- -Join Us -================================= - - - - - -## Discord -![image:width:100%](propaganda/discord.png) - - -## UL Wolves -![image:width:100%](propaganda/wolves.png) - - -Dont forget to use ``/wolves link`` to get teh member role on Discord - - -History -================================= - - -* We are old - * 1993-ish but its complicated -* Skynet was established in 1992 -* The Computer Society was founded around it in 1993 - * [History](https://2016.skynet.ie/history.html) -* Earliest copy of website is 1996 - * https://1996.skynet.ie/ -* Some C&S Rules were because of us - - - -Aims as a Society -================================= - -Our constitution spells out what we as a society want to be and what we represent. - -![img.png](intro_to_soc/aims_and_objectives.png) - -[Constitution](https://forgejo.skynet.ie/Computer_Society/open-goverance/releases/tag/constitution_latest) - - - - -What we do -================================= - -We do a wide variety of things - - -* 25+ unique events a year - * Mix of technical and Social - * Collabs with other Clubs/Socs -* Have a server room for Skynet -* We host our own services - * Websites - * Forgejo - Git - * Nextcloud - * Email - * DNS - * Discord Bots - * Game Servers - * Minecraft - * CSGO - * TF2 -* Weekly Training - * Skynet training - * Google Interview club -* Trips - * PyCon - * SISTEM - * EuroTrip - - - - -Events -================================= - - -* We have many events planned for just this semester -* A mix of technical, social and hardware -* And thats not even mentioning Skynet - -![Events](intro_to_soc/events.png) - -[Image Link](https://forgejo.skynet.ie/Computer_Society/open-goverance/src/branch/main/Events/2025-2026/planning/Semester-1.png) - -[Archive of events](https://forgejo.skynet.ie/Computer_Society/open-goverance/src/branch/main/Events) - - - - - -Websites we host -================================= - -* Main site - * https://skynet.ie -* Old copies of the main Site - * https://1996.skynet.ie - * https://2003.skynet.ie - * https://2006.skynet.ie - * https://2016.skynet.ie -* Other Clubs Socs - * https://www.outinul.ie -* For each user - * https://silver.users.skynet.ie - * https://milan.users.skynet.ie - * Very useful if ye need a site for a module - - - -Where we live -================================= - -We live in teh basement of the New Student Building - -(Insert link to vid about getting there) - - - - - -Friends - Games Dev -================================= - -For those who want to make games of all types. - - - - -### Wolves -![image:width:50%](intro_to_soc/gdev_wolves.png) - - -### Discord -![image:width:100%](intro_to_soc/gdev_discord.png) - - - - -Friends - IEEE -================================= -* IEEE Make cool Robots and Stuff -* (Lorcán) - -![image:width:100%](intro_to_soc/ieee.png) - - - -Skynet -================================= - - -* Skynet is currently a server cluster that we keep contained in our server room -* It is the core of our society, literally why it was created -* Some physical servers (insert picture?) -* Many virtual servers -* We have a ``/26`` ip address range -* Managed by a subcommittee called ``Root Team`` -* Create a Skynet account using the [Wiki](https://wiki.skynet.ie/tutorials/skynet/create_account/) - - - -Skynet - Root team -================================= - -* Subcommittee of Computer Society - * So Committee member, kinda -* Interested in server management/administration? -* Check out next weeks event for more info on joining - * Intro to Skynet + Intro to Git -* Bi-Weekly Training sessions - - - -SISTEM -================================= - -* Student Inter-Society Tech & Enterprise Meetup -* Tech Conference ran by students -* Hosted in UL Last year as well -* Looking for folks who are interested in helping to organise it -* Another subcommittee of Computer Society - - - -AGM - Roles - Explained -================================= - -### President - -* In charge of Society as a whole -* Delegates work, expected to step in when stuff goes wrong - -### Secretary - -* Minute taker in meetings -* Minutes committed/published via git - -### Treasurer - -* Manages our finances, deals with the online banking -* Leads the budget application - -### Public Relations (PRO) -* In charge of our public image/communication -* Leads a small team to this end - -### Health and Safety (HSO) - -* Ensures we stay safe in person and online -* Also in charge of equipment - - - -AGM - Roles - Explained -================================= - -### Vice/Assistant Roles -These roles assist the named role to learn teh ropes - -* Assistant Treasurer -* Assistant President -* Assistant HSO - -### Tech Officer - -* Assist/lead tech based events (hardware/software/etc) -* Work with Skynet team - -### Ordinary Committee Members (OCM) - -* For anything which does not fit into teh above -* Can create a "named" role for CV reasons - - - -AGM - Roles - Explained -================================= - -### First Year Rep - -* See if there is any feedback for what 1st years want/need - -### Assistant PRO's -For PRO there is a lot to manage, so best to split it up - -#### Events Officer - -* Room bookings -* Generally ensuring events go smoothly -* May include Pizza runs - -#### Social Media Officer - -* Instagram/Other Socials -* Discord Mod? - -#### Advertising Officer - -* Posters -* Sponsorship (with treasurer) - - - - -AGM - Prior Experience -================================= - -For Core Committee it is highly recommended that folks have prior (CompSoc) committee experience. -This is in a large part due to our GDPR requirements. -![Prior Experience](intro_to_soc/prior_experience.png) - - - - -AGM - Process -================================= - -1. Member's attendance is taken - * Can only vote if you are a member - * You can only be elected if you are a member -2. Each role is put up to see if there are any contenders -3. A single person can go for multiple roles -4. Each contender needs to be 1st and 2nd'd - * A member can put themselves forward - * A member can be put forward by another member -5. If there is only one contender then they automatically get teh role - * Assuming their are no detriments on their record that would disqualify them -6. If there are multiple contenders - 1. Each one will have a 2 minute hust - 2. They will then leave the room and votes will be tallied - 3. Once counting has been finished they will then be called back in - 4. The winner will be announced -7. Repeat until all roles have been done - - - -AGM - Election -================================= - - -* President -* Public Relations (PRO) -* Secretary -* Treasurer -* Health and Safety (HSO) -* Assistant PRO's - * Events Officer - * Social Media Officer - * Advertising Officer -* First Year Rep -* Tech Officer -* Assistant Treasurer -* Assistant President -* Assistant HSO -* Ordinary Committee Members (OCM) - - -Pizza time! -================================= - - -* The following Pizzas have been ordered from Dominos: - * 2 Plain Margaritas - * 2 Vegetarians - * 2 Texas BBQ - * 3 Pepperoni - * 3 Hawaiians -* We also have two **Gluten Free** Pizzas from the Terrace - * 1 Plain Margherita - * 1 Vegetarian -* Gluten Free Pizzas will be placed across the room, with a sign indicating it. -* If you've eaten pizzas with Gluten, please wash your hands before going for the Gluten-free ones - * This is to prevent cross-contamination. - \ No newline at end of file diff --git a/slides/compsoc/2025-2025/intro_to_soc/aims_and_objectives.png b/slides/compsoc/2025-2025/intro_to_soc/aims_and_objectives.png deleted file mode 100644 index 15dc869..0000000 --- a/slides/compsoc/2025-2025/intro_to_soc/aims_and_objectives.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19f0c048eaf943b7d91dcd2efa8887a365ed35c65e9c89bc31a34907d0935b1f -size 62468 diff --git a/slides/compsoc/2025-2025/intro_to_soc/events.png b/slides/compsoc/2025-2025/intro_to_soc/events.png deleted file mode 100644 index 26073ea..0000000 --- a/slides/compsoc/2025-2025/intro_to_soc/events.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18f8e4743e8f40eee67dc77f43139b1b2d3797ea39924bd4d484e321a74a36e4 -size 166141 diff --git a/slides/compsoc/2025-2025/intro_to_soc/gdev_discord.png b/slides/compsoc/2025-2025/intro_to_soc/gdev_discord.png deleted file mode 100644 index 3cd9bd8..0000000 --- a/slides/compsoc/2025-2025/intro_to_soc/gdev_discord.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ff512ea883247924e5f687410c71bfbdbf6be2fdee3f73cce6ccc451be2a1b9 -size 52479 diff --git a/slides/compsoc/2025-2025/intro_to_soc/gdev_wolves.png b/slides/compsoc/2025-2025/intro_to_soc/gdev_wolves.png deleted file mode 100644 index c4ea68a..0000000 --- a/slides/compsoc/2025-2025/intro_to_soc/gdev_wolves.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8687f97097b1105c7bcd32cbfdf606ef4943a849770b98ddb9ef1dcb9306066 -size 350103 diff --git a/slides/compsoc/2025-2025/intro_to_soc/ieee.png b/slides/compsoc/2025-2025/intro_to_soc/ieee.png deleted file mode 100644 index db2efb6..0000000 --- a/slides/compsoc/2025-2025/intro_to_soc/ieee.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6cb960422170b66e23f3a17dc188184e50ea66d9a08cae50ad7c0b6ee0615527 -size 120950 diff --git a/slides/compsoc/2025-2025/intro_to_soc/prior_experience.png b/slides/compsoc/2025-2025/intro_to_soc/prior_experience.png deleted file mode 100644 index bc848bd..0000000 --- a/slides/compsoc/2025-2025/intro_to_soc/prior_experience.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25d71a0c6118422068ddbec454132cf79dd60a57533ce43f6f4683df532d6461 -size 74945 diff --git a/slides/compsoc/2025-2025/propaganda.md b/slides/compsoc/2025-2025/propaganda.md deleted file mode 100644 index 876513e..0000000 --- a/slides/compsoc/2025-2025/propaganda.md +++ /dev/null @@ -1,60 +0,0 @@ ---- -title: "Computer Society" -sub_title: "Definitely not propaganda" -author: "Brendan Golden" -theme: - name: catppuccin-latte ---- - -About Us -================================= - - -* For anyone Interested in Computers - * All skill levels -* Mix of technical and Social -* Old Society, 30 years old -* Have a server room for Skynet -* We host our own services - * Forgejo - Git - * Nextcloud - * Email - * DNS - * Discord Bots - * Game Servers - * Minecraft - * CSGO - * TF2 -* 25+ unique events a year -* Weekly Training - * Skynet training - * Google Interview club -* Trips - * PyCon - * SISTEM - * EuroTrip - - - - -Join Us -================================= - - - - - -## Discord -![image:width:100%](propaganda/discord.png) - - -## UL Wolves -![image:width:100%](propaganda/wolves.png) - - - - - - -Questions? -================================= \ No newline at end of file diff --git a/slides/compsoc/2025-2025/propaganda/discord.png b/slides/compsoc/2025-2025/propaganda/discord.png deleted file mode 100644 index 025d1a2..0000000 --- a/slides/compsoc/2025-2025/propaganda/discord.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c81ed46f3f5837fff8f7fae502179d540b97638f33b12dc8c01c8c60e38eec1 -size 37137 diff --git a/slides/compsoc/2025-2025/propaganda/wolves.png b/slides/compsoc/2025-2025/propaganda/wolves.png deleted file mode 100644 index acc1a0c..0000000 --- a/slides/compsoc/2025-2025/propaganda/wolves.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af783b6471fcaa3f118b0243cccdcaef287312ea9f3bbf0cc1a8bf66f03e85f8 -size 47729 diff --git a/slides/council/2025-2026/Semester-1_week-03.md b/slides/council/2025-2026/Semester-1_week-03.md deleted file mode 100644 index 2f586a6..0000000 --- a/slides/council/2025-2026/Semester-1_week-03.md +++ /dev/null @@ -1,50 +0,0 @@ ---- -title: "Computer Society" -author: "Brendan Golden" -date: "2025-09-18" -theme: - name: catppuccin-latte ---- - - - -# Computer Society -## Discord Bot - - - -* Manages Discord Roles - * Automatically!!! -* Links with UL Wolves -* Fully GDPR compliant - - - -https://forgejo.skynet.ie/Skynet/discord-bot/src/branch/main/doc/Committee.md - -![](./misc/discord-bot-docs-committee.png) - - - - - - -# Computer Society -## Committee Discord server - - - -* Augments teh Chairperson Whatsapp - * More than ***just*** Chairperson/President -* Created with blessing of C&S -* For all Clubs/Socs Committees to join. - * Only Committee though - * Need to authenticate using ``/wolves link`` -* Does not rollover each year - -https://discord.gg/D6mbASJKxU - -![](./misc/committee-discord.png) - - - \ No newline at end of file diff --git a/slides/council/2025-2026/misc/committee-discord.png b/slides/council/2025-2026/misc/committee-discord.png deleted file mode 100644 index ec852f1..0000000 --- a/slides/council/2025-2026/misc/committee-discord.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d38d7e4d05d07bd16815af0d54ff997c56ea16547ed03bb4c84d8ec901f4b01 -size 26525 diff --git a/slides/council/2025-2026/misc/discord-bot-docs-committee.png b/slides/council/2025-2026/misc/discord-bot-docs-committee.png deleted file mode 100644 index 324955a..0000000 --- a/slides/council/2025-2026/misc/discord-bot-docs-committee.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7be557c08cb1cbabd36be8a48b4f7173229ac214749f4ee0771613c9c96fbea5 -size 36622 diff --git a/slides/skynet/01_intro.md b/slides/skynet/01_intro.md deleted file mode 100644 index 5540375..0000000 --- a/slides/skynet/01_intro.md +++ /dev/null @@ -1,87 +0,0 @@ ---- -title: "Skynet" -sub_title: "Introduction to Skynet" -author: "Brendan Golden" -theme: - name: catppuccin-latte ---- - -Skynet: Introduction -================================= - - - -* Skynet is the UL Computer Society's computer cluster. -* Has a long [history](https://2016.skynet.ie/history.html). -* Older than the Society. (1992 vs 1994) -* But alas good things always come to an end. -* Due to *A Series of Unfortunate Events* we lost internet in Jan 2023 -* Turns out Wordpress got Wordpress'd and we had a *smol* spam problem. -* ITD also wanted us to have all servers patched and up to date. - - - - -Skynet 3.0 -================================= - - - - -![Delving into Ruins](01_intro/0_intro_img1.png) - - -* Gave us a chance to do a full rebuild. -* Servers were delved Indiana Jones style. -* Backups were made. -* Returned Summer 2023. -* Powered by NixOS. -* [Fully open source](https://forgejo.skynet.ie/Skynet/nixos). -* Skynet now can compile and update itself. -* Be not Afraid -* Automation FTW! -* Be not Afraid - - - - -What is on Skynet -================================= - - - -* Email -* DNS -* Account Management -* Forgejo + CI/CD runners - * We *forge* software - * Git host -* Game Servers - * Minecraft - * TF2 - * CSGO -* Discord Bots - * Skynet - * Our Discord Role Manager - * T-800 - * Logging and monitoring -* Clubs & Societies - * Out in UL - * https://outinul.ie - * ULFM - * Now gone -* Websites - * Our own - * https://skynet.ie - * https://2016.skynet.ie - * https://2006.skynet.ie - * https://2003.skynet.ie - * https://1996.skynet.ie - * User sites (https://silver.users.skynet.ie) - - - - - -Always iterating, always improving. -================================= \ 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 index d662dee..32e3281 100644 --- a/src/slides/compsoc/3_git.md +++ b/src/slides/compsoc/3_git.md @@ -176,94 +176,43 @@ Let's start with the basics. ------------------------------------------------------------------------- -# Live demonstration time +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) +------------------------------------------------------------------------- + +Please do this +````git pull ```` ------------------------------------------------------------------------- -![img_6.png](3_git/forgejo_template_button.png) +````git init```` ------------------------------------------------------------------------- -![img_7.png](3_git/forgejo_template_repo_creation.png) +````git remote add origin ```` ------------------------------------------------------------------------- -![img_8.png](3_git/forgejo_repo_link.png) +````git add ```` ------------------------------------------------------------------------- -Setup SSH key (see Readme.md)) +````git commit -m ```` ------------------------------------------------------------------------- -![img_9.png](3_git/forgejo_repo_settings.png) +````git pull origin ```` ------------------------------------------------------------------------- -![img_10.png](3_git/forgejo_secrets_location.png) +````git push origin ```` ------------------------------------------------------------------------- - -![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/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 deleted file mode 100644 index d5f14de..0000000 --- a/src/slides/compsoc/4_Intro.md +++ /dev/null @@ -1,128 +0,0 @@ -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -title = "Welcome to Compsoc" -date = 2024-09-15 -slides = true -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -### Welcome, Welcome Welcome - -------------------------------------------------------------------------- - -//whispers to committee//: lock the door so they cant escape - -------------------------------------------------------------------------- - -Im joking, we wouldn't do that //watches as the door is welded shut// - -------------------------------------------------------------------------- - -#### About the Society - -------------------------------------------------------------------------- - -The Society is roughly 30 years old - -------------------------------------------------------------------------- - -This makes us one of teh oldest continuous societies in UL - -------------------------------------------------------------------------- - -Has changed dramatically over the years - -------------------------------------------------------------------------- - -#### What we Do - -------------------------------------------------------------------------- - -At our core we are folks who like any and all aspects of computers - -------------------------------------------------------------------------- - -From building them, to the software that runs on them to new tech - -------------------------------------------------------------------------- - -We have weekly meetings, Wednesdays 6-9 in the Courtyard Room - -------------------------------------------------------------------------- - -![Events](4_intro/events.webp) - -------------------------------------------------------------------------- - -These are a mix of technical, social and networking - -------------------------------------------------------------------------- - -We also do trips to conferences when we can, normally once per semester - -------------------------------------------------------------------------- - -Aside from our planned meetings we are also open to events organised by -our members. - -------------------------------------------------------------------------- - -So if you have any ideas let us know. -We try to be as member driven as possible. - -------------------------------------------------------------------------- - -We also provide services to other Clubs and Societies: - -* We provide web hosting -* Our Skynet bot is used for discord roles -* We manage teh inter-committee discord server - -------------------------------------------------------------------------- - -#### Skynet - -------------------------------------------------------------------------- - -Our computer cluster is called Skynet and is about 32 years old. - -------------------------------------------------------------------------- - -Yes, Skynet is older than teh Society - -------------------------------------------------------------------------- - -We solemnly swear that we are not (currently) aiming for world domination - -------------------------------------------------------------------------- - -You will hear more about it next week in our Skynet event - -------------------------------------------------------------------------- - -#### Socials - -------------------------------------------------------------------------- - -We are mostly active on Discord - -------------------------------------------------------------------------- - -Though we also send out emails often enough. - -------------------------------------------------------------------------- - -<> -![Discord QR](4_intro/qr_discord.png) - -------------------------------------------------------------------------- - -To get the ``member`` role (that grants access to a pile of channels) -You need to authenticate with the Skynet bot. - -------------------------------------------------------------------------- - -Use ``/link_wolves`` in the Bot channel -Wiki: <> - -------------------------------------------------------------------------- - -#### Pizza time? \ No newline at end of file diff --git a/src/slides/compsoc/4_intro/events.webp b/src/slides/compsoc/4_intro/events.webp deleted file mode 100644 index 135dbee..0000000 --- a/src/slides/compsoc/4_intro/events.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50bb11135757d4dc437b621c38adcafd9328904907723128762316d9245a0a0d -size 519500 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/slides/skynet/01_intro/0_intro_img1.png b/src/slides/skynet/0_intro_img1.png similarity index 100% rename from slides/skynet/01_intro/0_intro_img1.png rename to src/slides/skynet/0_intro_img1.png 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..914876c 100644 --- a/src/templates/powerpoint.html +++ b/src/templates/powerpoint.html @@ -20,9 +20,7 @@ position: absolute; top: 50%; left: 50%; - transform: translate(-50%, -50%) scale(2); - line-height: 2; - font-size: 20px; + transform: translate(-50%, -50%) scale(3); } ol, ul { margin-top: 0;