From df1525fbbc2ea13b84a1ff83a097668ff3eab272 Mon Sep 17 00:00:00 2001 From: James Shiffer Date: Thu, 2 May 2024 15:30:42 -0700 Subject: [PATCH 1/4] Fix MediaWiki links --- content/about.md | 2 +- content/wiki/emails.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/about.md b/content/about.md index c9cef7d..9e8b94e 100644 --- a/content/about.md +++ b/content/about.md @@ -19,7 +19,7 @@ users' freedom with Linux and other Free/Open Source Software (FOSS). ## Visit us [**Join our Discord server**](https://discord.gg/EmGKCa48R6) -If you want help installing Linux or just want to eat and hang out, come to installfest! The [LUG Lounge](https://linux.ucla.edu/wiki/index.php/Lounge), at **Boelter Hall 2763**, is a meeting/study/hangout place for the group and facilitates a lot its activities. Feel free to stop by and meet other Linux users (as well as people in ACM and UPE)! +If you want help installing Linux or just want to eat and hang out, come to installfest! The [LUG Lounge](https://linux.ucla.edu/mediawiki/index.php?title=Visit_Us), at **Boelter Hall 2763**, is a meeting/study/hangout place for the group and facilitates a lot its activities. Feel free to stop by and meet other Linux users (as well as people in ACM and UPE)! There is a makerspace on the floor below us, where you can go and 3D print diff --git a/content/wiki/emails.md b/content/wiki/emails.md index 48d22c6..979cff1 100644 --- a/content/wiki/emails.md +++ b/content/wiki/emails.md @@ -4,7 +4,7 @@ title: Email Account Guide **IMPORTANT: PLEASE CHOOSE A STRONG PASSWORD FOR YOUR EMAIL ACCOUNT** -[![img](https://linux.ucla.edu/wiki/images/thumb/3/34/Image.png/300px-Image.png)](https://linux.ucla.edu/wiki/index.php/File:Image.png) +[![img](https://linux.ucla.edu/mediawiki/images/thumb/3/34/Image.png/300px-Image.png)](https://linux.ucla.edu/mediawiki/index.php/File:Image.png) Some hacking attempts on our email server @@ -20,7 +20,7 @@ Server Name: mail.linux.ucla.edu Port: 587 -[![img](https://linux.ucla.edu/wiki/images/thumb/9/9b/Hackerman.png/300px-Hackerman.png)](https://linux.ucla.edu/wiki/index.php/File:Hackerman.png) +[![img](https://linux.ucla.edu/mediawiki/images/thumb/9/9b/Hackerman.png/300px-Hackerman.png)](https://linux.ucla.edu/mediawiki/index.php/File:Hackerman.png) Look at all the hackers getting banned for too many failed login attempts! -- 2.39.5 From f08c7ef606d594b9dcd79de4dc19fbb10d331466 Mon Sep 17 00:00:00 2001 From: James Shiffer Date: Fri, 3 May 2024 22:41:24 -0700 Subject: [PATCH 2/4] Organize installfest info, articles --- content/about.md | 4 ++-- content/directory.md | 5 ++--- content/events/installfest-f22.md | 4 ++-- content/events/{installfest.md => installfest-s24.md} | 7 ++++--- content/posts.md | 10 ---------- content/{ => wiki}/constitution.md | 0 content/{ => wiki}/description.md | 0 content/{ => wiki}/rules.md | 0 hugo.toml | 2 +- layouts/partials/now.html | 6 +++++- 10 files changed, 16 insertions(+), 22 deletions(-) rename content/events/{installfest.md => installfest-s24.md} (88%) delete mode 100644 content/posts.md rename content/{ => wiki}/constitution.md (100%) rename content/{ => wiki}/description.md (100%) rename content/{ => wiki}/rules.md (100%) diff --git a/content/about.md b/content/about.md index 9e8b94e..4d768c4 100644 --- a/content/about.md +++ b/content/about.md @@ -9,11 +9,11 @@ users' freedom with Linux and other Free/Open Source Software (FOSS). ## Activities -1. **[Linux installfests](/events/installfest)**: on the 2nd Friday of every quarter. +1. **[Linux installfests](/tags/installfests)**: on the 2nd Friday of every quarter. 1. **Linux Help & Advice**: in office hours and Discord. +1. **[Services](/services)**: hosting FOSS on our servers for everyone's use. 1. **Tech Talks**. 1. **[Edit-a-thons](https://en.wikipedia.org/wiki/Edit-a-thon)**: Bi-quarterly group editing events aimed to contribute to free knowledge on Wikipedia, and other Linux Wikis. -1. **Mirrors**: to give students quick access to Linux Distros and Software. ## Visit us diff --git a/content/directory.md b/content/directory.md index 2bb8de5..60008fb 100644 --- a/content/directory.md +++ b/content/directory.md @@ -7,7 +7,7 @@ Some of our internal websites: website you're viewing right now! - [cgit](https://linux.ucla.edu/git): a more minimalist git server. - [Booru](https://booru.linux.ucla.edu): imageboard -- [Orwell](https://orwell.linux.ucla.edu) +- [Orwell](https://orwell.linux.ucla.edu): server room security camera Here's a list of member-run websites: - [Dylon](https://linux.ucla.edu/dylon) @@ -20,9 +20,8 @@ Here's a list of member-run websites: - [IDKYTM](https://linux.ucla.edu/idkytm.html) - [Holy Hell!](https://linux.ucla.edu/holyhell.html) - [Crafting for Cancer](https://linux.ucla.edu/craftingforcancer) -- [Installfests](/events/installfest) - [Taylor Swift Guessing Game](https://linux.ucla.edu/tswift) Here's a list of test websites: - [Arch User](https://linux.ucla.edu/archuser) -- [Alpine](https://linux.ucla.edu/alpine/index.html) +- [Alpine](https://linux.ucla.edu/alpine) diff --git a/content/events/installfest-f22.md b/content/events/installfest-f22.md index e038515..9352263 100644 --- a/content/events/installfest-f22.md +++ b/content/events/installfest-f22.md @@ -1,7 +1,7 @@ --- title: "2022 Fall Installfest" date: 2022-10-03 -tags: [events] +tags: [events, installfests] author: LUG Board --- @@ -12,7 +12,7 @@ Installfest! Please fill out the RSVP form. * Date: 2022-10-07 Friday * Time: 18:00-21:00 -* Location: Mong Auditorium in Engineering 6 +* Location: Cohen Multipurpose Room (Engineering VI 134) * RSVP: link ## General Info diff --git a/content/events/installfest.md b/content/events/installfest-s24.md similarity index 88% rename from content/events/installfest.md rename to content/events/installfest-s24.md index 03fea4e..79f3179 100644 --- a/content/events/installfest.md +++ b/content/events/installfest-s24.md @@ -1,7 +1,7 @@ --- title: "Spring 2024 Installfest" date: 2024-04-03 -tags: [events] +tags: [events, installfests] author: LUG Board --- @@ -11,8 +11,9 @@ The Linux Users Group (LUG) at UCLA invites you to attend the quarterly Linux In * Date: 2024-04-12, Friday * Time: 6-9 PM -* Location: Engineering IV (exact room TBD) -* RSVP: [link](https://docs.google.com/forms/d/e/1FAIpQLSfnZdiENvHqAs4xtx6kEqtkstL4GVClOlzo-Gq_wiswHkGQtQ/viewform?usp=sf_link) +* Location: Maxwell Conference Room, Engineering IV Floor 5 +* RSVP: link + ## General Info LUG hosts a quarterly installfest on Friday of 2nd week. Attendees will be diff --git a/content/posts.md b/content/posts.md deleted file mode 100644 index e259920..0000000 --- a/content/posts.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: Articles ---- - -- [Club Description](/description) -- [Club Constitution](/constitution) -- [Email Account Guide](/emails) -- [Rules](/rules) -- [UCLA VPN Guide](/ucla-vpn) -- [Eduroam WiFi Guide](/eduroam) diff --git a/content/constitution.md b/content/wiki/constitution.md similarity index 100% rename from content/constitution.md rename to content/wiki/constitution.md diff --git a/content/description.md b/content/wiki/description.md similarity index 100% rename from content/description.md rename to content/wiki/description.md diff --git a/content/rules.md b/content/wiki/rules.md similarity index 100% rename from content/rules.md rename to content/wiki/rules.md diff --git a/hugo.toml b/hugo.toml index b456ede..3b85b7e 100644 --- a/hugo.toml +++ b/hugo.toml @@ -33,7 +33,7 @@ weight = 1 [[menu.main]] name = "Articles" -url = "/posts" +url = "/wiki" weight = 2 [[menu.main]] diff --git a/layouts/partials/now.html b/layouts/partials/now.html index b330e07..1a4ffa9 100644 --- a/layouts/partials/now.html +++ b/layouts/partials/now.html @@ -13,5 +13,9 @@ }
    -
  1. April 12, 2024: SPRING 2024 INSTALLFEST, 6-9 PM in Engineering IV
    2. +
  2. + + Week 7 (TBD): E-Waste Meetup + +
-- 2.39.5 From 76c1062a7d588dd12c6489c28278f7db3f55b12a Mon Sep 17 00:00:00 2001 From: James Shiffer Date: Fri, 3 May 2024 22:41:46 -0700 Subject: [PATCH 3/4] Add info about FOSS services --- content/services.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 content/services.md diff --git a/content/services.md b/content/services.md new file mode 100644 index 0000000..74c8c0f --- /dev/null +++ b/content/services.md @@ -0,0 +1,20 @@ +--- +title: Services +date: 2024-05-02 +--- + +Our club hosts various open source web services for the public to use: + +- [Invidious](https://yt.linux.ucla.edu): Privacy-respecting YouTube frontend with no ads + +- [SearXNG](https://searx.linux.ucla.edu): Search engine aggregator with no tracking or ads + +- [Jitsi Meet](https://meet.linux.ucla.edu): Video conferencing platform + +- [Mumble](mumble://linux.ucla.edu): Voice chat platform + +- [SuperTuxKart](https://supertuxkart.net): Racing video game server, connect to `linux.ucla.edu` + +- **XMPP**: coming soon! + +- **Mirrors**: coming soon! -- 2.39.5 From ca1e9d3088dfe330e552b7dfd29d2042c0b458f3 Mon Sep 17 00:00:00 2001 From: James Shiffer Date: Fri, 3 May 2024 22:46:31 -0700 Subject: [PATCH 4/4] Update navbar, news page --- content/news.md | 1 + hugo.toml | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/content/news.md b/content/news.md index b4dcad5..8e4e69a 100644 --- a/content/news.md +++ b/content/news.md @@ -2,6 +2,7 @@ title: News --- +- 2024-05-03: Added the [Services](/services) page. - 2024-04-03: Site updates. Gitea moved to https://git.linux.ucla.edu. - 2023-12-20: Wow I have not written anything in a while. The booru site has been moved to a seperate subdomain and we have a Gitea with the website source code. If you want to suggest any changes please submit a pull request! - 2022-10-03: Github account for LUG has been created. Website is moved to Hugo. diff --git a/hugo.toml b/hugo.toml index 3b85b7e..83199c5 100644 --- a/hugo.toml +++ b/hugo.toml @@ -41,25 +41,30 @@ name = "Directory" url = "/directory" weight = 3 +[[menu.main]] +name = "Services" +url = "/Services" +weight = 4 + [[menu.main]] name = "Membership" url = "/membership" -weight = 4 +weight = 5 [[menu.main]] name = "News" url = "/news" -weight = 5 +weight = 6 [[menu.main]] name = "Photos" url = "/zenphoto" -weight = 6 +weight = 7 [[menu.main]] name = "Switch to Linux 🐧" url = "/linux" -weight = 7 +weight = 8 [[params.social]] name = "Discord" -- 2.39.5