Update information, layout and bump zola version

.github/workflows/deploy.yml

@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@master
     - name: Install Zola
       run: |
-        wget -O zola.deb https://github.com/barnumbirr/zola-debian/releases/download/v0.17.2-1/zola_0.17.2-1_amd64_bullseye.deb
+        wget -O zola.deb https://github.com/pkghaus/zola-debian/releases/download/v0.22.1-1/zola_0.22.1-1_amd64_trixie.deb
         sudo dpkg -i zola.deb
     - name: Check Zola links
       run: |

.github/workflows/pull-request.yml

@@ -11,7 +11,7 @@ jobs:
         - uses: actions/checkout@master
         - name: Install Zola
           run: |
-            wget -O zola.deb https://github.com/barnumbirr/zola-debian/releases/download/v0.17.2-1/zola_0.17.2-1_amd64_bullseye.deb
+            wget -O zola.deb https://github.com/pkghaus/zola-debian/releases/download/v0.22.1-1/zola_0.22.1-1_amd64_trixie.deb
             sudo dpkg -i zola.deb
         - name: Check Zola links
           run: |

config.toml

@@ -8,22 +8,23 @@ default_language = "no"
 compile_sass = true
 build_search_index = false
 
-generate_feed = true
-feed_filename = "rss.xml"
+generate_feeds = true
+feed_filenames = ["rss.xml"]
 
 minify_html = true
 
 taxonomies = [{ name = "categories", feed = false }]
 
+generate_sitemap = true
+
 [markdown]
-highlight_code = true
 
 external_links_target_blank = true
 
 [translations]
 bli_medlem = "Bli medlem"
 ressurser = "Ressurser"
-kontakt = "Kontakt"
+profiler = "Profiler"
 kontakt_oss = "Kontakt oss"
 generell_kontakt = "Generell kontakt"
 kundesupport = "Kundesupport"
@@ -61,7 +62,7 @@ title = "friByte"
 [languages.en.translations]
 bli_medlem = "Become a member"
 ressurser = "Resources"
-kontakt = "Contact"
+profiler = "Profiles"
 kontakt_oss = "Contact us"
 generell_kontakt = "General"
 kundesupport = "Customer support"
@@ -110,6 +111,8 @@ social_media = [
   { name = "LinkedIn", url = "https://linkedin.com/company/fribyte" },
   { name = "Twitter", url = "https://twitter.com/fribyte" },
   { name = "Instagram", url = "https://www.instagram.com/fribyteno/" },
+  { name = "BlueSky", url = "https://bsky.app/profile/fribyte.no"}
+
 ]
 
 email_general = "post@fribyte.no"

content/bli-medlem.en.md

@@ -6,56 +6,93 @@ description = "Do you want to become a member of friByte? Have a look here!"
 
 ## How do I become a member?
 
-If you believe that friByte is a good fit for you, or that you are a good fit for friByte, just send a short application to [bli-medlem@fribyte.no](mailto:bli-medlem@fribyte.no). Tell us a little bit about who you are, your abilities and why you want to become a member. If you are still wondering what being a member is like, you may find the answer below. If not, don't hesitate to ask!
+If you believe that friByte is the right fit for you, or that you are the right fit for friByte, just send a short application to [bli-medlem@fribyte.no](mailto:bli-medlem@fribyte.no). Tell us a little about who you are, what you can do, and why you want to become a member. If you are still wondering what it is like to be a member of friByte, you may find the answer below, and if not, just ask!
 
 ## What is friByte?
 
-friByte is an independent student organization which performs secure and stabile IT services for other student organizations in Bergen. We are a volunteer organization, known for our great parties and rich learning environment! We have frequent meetings (around 1-2 times per month) to evaluate how things are going, do volunteer work, and socialize.
+friByte is an independent student organization that delivers secure and stable IT services to student organizations in Bergen. We are a volunteer organization known for our great parties and rich learning environment! We meet regularly, around 3–4 times a month, to check in on how things are going, take part in volunteer work, and socialize a bit.
 
-Most of our active members are students, and this implies that we keep a loose internal profile. Our founding document reflects this; The general assembly is required to be an excursion with a subsequent party! A lot of effort is put into sustaining social interactions, not just screen time.
+Most of our active members are students, and this means we keep a loose internal profile. Our founding document reflects this; the general assembly is required to be an excursion with a subsequent party! A lot of effort goes into maintaining the social environment, not just time in front of a screen.
 
 ## Which duties do I have as a member of friByte?
 
-We require you to:
+- Show up in crisis situations (server downtime, power outages, etc.)
+- Show up for volunteer work (maintenance, setting up new systems and services, etc.)
+- Take part, and have a project or ten
 
-- Attend crisis situations (server crashes, power failures, etc.)
-- Attend volunteer events (maintainance work, setup of new systems and services, etc.)
-- Partake in the organization, work on a project (or ten)
+## How much free time does it take?
 
-## How much free time do I need to spend?
-
-The members decide themselves, but we try to have around 2 meeting each week. The members decide how long they can stay during the meetings and if they have time to meet up. This can vary depending on what needs to be done, but of course studies are always a priority. We try to avoid a ton of working/meetings around the exam periods.
+The members largely decide this themselves, but we usually try to have 2 volunteer sessions a week, around 2–3 hours each. Members decide for themselves how long they stay and whether they have time to show up. This can vary depending on what needs to be done, and studies of course take priority. We try to avoid a lot of work around exam periods.
 
 ## What systems do we use?
 
-We mainly use Linux-based operating systems for servers. On work stations we use distros we are comfortable with. This can be anything from Ubuntu to Arch. When it comes to server distros we primarily use Ubuntu, Debian and OpenBSD. There are no rules on which distros our members choose. (As long as they work :D)
-
+We mainly use Linux-based operating systems for servers. On workstations we use distros we are comfortable with. This can be anything from Ubuntu to Arch. When it comes to server distros we primarily use Ubuntu, Debian and OpenBSD. There are no requirements on which distros our members choose. (As long as they work :D)
 
 ## What do our members study?
 
-At the time of writing, we mainly have students from the faculty of mathematics and natural sciences at UiB, but we also have some from the faculty of social sciences. They study everything from Computer Technology to Cognitive Science to Economics. There is also no requirement that you have to study at UiB, or that you have to study something technological. Any student in higher education in Bergen can become a member!
+The most common, and most natural, fields of study among our members are informatics or information science at UiB, information technology or computer engineering at HVL, or cybersecurity at Kristiania University College. There is no requirement that you study at a specific institution, or that you study something technological. Any student from a higher education institution in Bergen can become a member!
+
+These are the study programs we see as most relevant:
+
+**University of Bergen**
+
+- Computer Technology
+- Bioinformatics
+- Computer Security
+- Informatics-Mathematics-Economics
+- Information Technology and Economics
+- Information Science
+- Geoscience and Informatics
+- Integrated Master's in Quantum Technology
+
+**Western Norway University of Applied Sciences**
+
+- Information Technology
+- Computer Engineering
+
+**Kristiania University College**
+
+- Cybersecurity
+- Information Technology
+
+**Noroff**
+
+- Cyber Security
+- Applied Data Science
+- Digital Assurance and Security Management
+- Networks and IT Security
+- Backend Development
+- Frontend Development
+
+*It is also recommended that you are at least a second-year student, but this is not a requirement*
 
-## What do I need to know before I apply?
+## What do our members need to know before applying?
 
-There are no knowledge requirements to apply! Although you are well on track if any of these apply to you:
+There are no prior-knowledge requirements to apply! A very good starting point is to:
 
-- Basic knowledge of Linux (UNIX-systems) and/or networks
-- Basic knowledge of Git
-- Ability to delve into using new systems
-- Interest in working with computers
-- A wish to learn new things
+- Have experience with Linux, networks and/or virtualization
+- Be comfortable working in the terminal
+- Have an interest in hardware and technology
+- Have experience with Git
+- Be able to work independently
+- Have curiosity for the subject and a willingness to learn
 
-## What do our members know after having been here for a while?
+## What can our members do after having been with us for a while?
 
-- Setting up networks
-- Administrating Linux-servers
-- Git, the version control tool
-- Deeper understanding in at least one of the following areas:
-  - Web programming
-  - Web design
-  - Web development
-  - System administration
-  - Server operation
-  - Networks
+- Configure firewalls and networks between machines
+- Navigate the terminal on Linux and OpenBSD
+- Configure and manage virtual machines
+- Administer and configure DNS for various domains
+- Set up physical machines as part of a server farm
+- Experience with tools such as:
+  - SSH
+  - Git
+  - Tailscale
+  - Vim/NeoVim/Nano
+  - Tmux
+  - NFS
+  - Ansible
+  - ProxMox
+  - SQL
 
 {{ buttons(english=true, send_soknad=true) }}

content/bli-medlem.md

@@ -22,37 +22,77 @@ De fleste av våre aktive medlemmer er studenter og dette medfører at vi har en
 
 ## Hvor mye fritid går med?
 
-Det bestemmer medlemmene i stor grad selv, men vi prøver som regel å ha 2 dugnader i uka. Medlemmene bestemmer selv hvor lenge de blir på dugnadene og om de har tid til å møte opp. Dette kan variere avhengig av hva som må gjøres og studier tar selvfølgelig prioritet. Det forsøkes å unngå mye jobbing rundt eksamensperioder.
+Det bestemmer medlemmene i stor grad selv, men vi prøver som regel å ha 2 dugnader i uka på rundt 2-3 timer hver. Medlemmene bestemmer selv hvor lenge de blir på dugnadene og om de har tid til å møte opp. Dette kan variere avhengig av hva som må gjøres og studier tar selvfølgelig prioritet. Det forsøkes å unngå mye jobbing rundt eksamensperioder.
 
 ## Hvilke systemer bruker vi?
 
 Vi bruker hovedsakelig Linux-baserte OS-er til servere. På arbeidsstasjoner brukes distroer vi er komfortable med. Dette kan være alt fra Ubuntu til Arch. Når det gjelder server-distroer bruker vi primært Ubuntu, Debian og OpenBSD. Det legges ingen føringer på hvilke distroer våre medlemmer velger. (Så sant det fungerer :D)
 
 ## Hva studerer medlemmene våre?
 
-I skrivende stund så er det hovedsakelig studenter fra Matematisk-Naturvitenskapelig fakultet ved UiB, men også noen fra Samfunnsvitenskapelig. De studerer alt fra Datateknologi til Kognitiv Vitenskap til Samfunnsøkonomi. Vi har også studenter fra Høgskolen på Vestlandet, som studerer blant annet Informasjonsteknologi og Dataingeniør. Det er dog intet krav at man må studere ved UiB/HVL, eller at man må studere noe teknologisk. Hvilken som helst student fra en høyere utdanningsinstitusjon i Bergen kan bli medlem!
+De vanligste, og mest naturlige, studieretningene blant medlemmene våre er informatikk eller informasjonsvitenskap ved UiB, informasjonsteknologi eller dataingeniør ved HVL, eller cybersikkerhet ved Høyskolen Kristiania. Det er dog intet krav at man må studere ved en spesifikk institusjon, eller at man må studere noe teknologisk. Hvilken som helst student fra en høyere utdanningsinstitusjon i Bergen kan bli medlem! 
+
+Men disse studielinjene er de vi ser på som mest relevante:
+
+**Universitetet i Bergen**
+
+- Datateknologi
+- Bioinformatikk
+- Datasikkerhet
+- Informatikk-matematikk-økonomi
+- Informasjonsteknologi og økonomi
+- Informasjonsvitenskap
+- Geofag og informatikk
+- Sivilingeniør kvanteteknologi
+
+**Høyskolen på Vestlandet**
+
+- Informasjonsteknologi
+- Dataingeniør
+
+**Høyskolen Kristiania**
+
+- Cybersikkerhet
+- Informasjonsteknologi
+
+**Noroff**
+
+- Cyber security
+- Applied Data Science
+- Digital Assurance and Security Management
+- Nettverk og IT-sikkerhet
+- Backend-utvikling
+- Frontend-utvikling
+
+*Det er også anbefalt at en minimum er 2. årsstudent, men ikke et krav*
 
 ## Hva må medlemmene våre kunne før man søker?
 
-Det er ingen krav om forkunnskaper for å kunne søke! Men et veldig godt utgangspunkt er å enten:
+Det er ingen krav om forkunnskaper for å kunne søke! Men et veldig godt utgangspunkt er å:
 
-- Ha grunnleggende kunnskap om Linux (UNIX-systemer) og/eller nettverk
-- Kunne grunnleggende Git
-- Kunne sette seg inn i bruk av nye systemer
-- Like å jobbe med datamaskiner
-- Ønske å lære nye ting
+- Ha erfaring med Linux, nettverk og/eller virtualisering
+- Være komfortabel med å jobbe i terminalen
+- Ha en interesse for maskinvare og teknologi
+- Ha erfaring med Git
+- Kunne jobbe selvstendig
+- Ha en nysgjerrighet for faget og villighet til å lære
 
 ## Hva kan medlemmene våre etter å ha vært med en stund?
 
-- Rigge opp nettverk
-- Administrere Linux-servere
-- Versjonskontroll-verktøyet Git
-- Fordype seg i minst ett av følgende områder
-  - Nettprogrammering
-  - Nett-formgiving
-  - Nett-utvikling
-  - System-administrasjon
-  - Serverdrift
-  - Nettverk
+- Konfigurere brannmur og nettverk mellom maskiner
+- Navigere i terminalen på Linux og OpenBSD
+- Konfigurere og håndtere virtuelle maskiner
+- Administrere og konfigurere DNS for ulike domener
+- Rigge opp fysiske maskiner som del av en serverpark
+- Erfaring med verktøy som: 
+  - SSH
+  - Git
+  - Tailscale 
+  - Vim/NeoVim/Nano
+  - Tmux
+  - NFS
+  - Ansible
+  - ProxMox
+  - SQL
 
 {{ buttons(send_soknad=true) }}

content/om.en.md

@@ -59,7 +59,7 @@ Similar organizations can be found in our list of [sister organizations](/en/sos
   software.
 
 We also focus on operating as many IT solutions as possible for various student
-organizations. See [our clients](/en/our_clients) for an overview of the student
+organizations. See [our clients](/en/klienter) for an overview of the student
 organizations we assist.
 
 ## Where are we located?

templates/base/footer.html

@@ -48,9 +48,8 @@ <h2 class="footer__heading">{{ trans(key="stoettet_av", lang=lang) }}</h2>
     </style>
   </div>
   <div class="footer--contact">
-    <h2 class="footer__heading">{{ trans(key="kontakt", lang=lang) }}</h2>
+    <h2 class="footer__heading">{{ trans(key="profiler", lang=lang) }}</h2>
     <ul class="footer--list">
-      <li>Org.nr. 984 397 569</li>
       {% if config.extra.social_media %}
       {% for link in config.extra.social_media %}
       <li>
@@ -61,6 +60,7 @@ <h2 class="footer__heading">{{ trans(key="kontakt", lang=lang) }}</h2>
     </ul>
   </div>
   <div class="footer--copyright-developed-by">
+    <span>Org.nr. 984 397 569</span>
     <span class="footer--copyright">
       &copy; friByte {{ now() | date(format="%Y") }}
     </span>

templates/index.html

@@ -67,19 +67,39 @@ <h2>Kontakt</h2>
         tilbakemeldinger på tjenestene vi leverer. Vi setter pris på all konstruktiv kritikk. :)
       </p>
     </section>
-    <section class="urgent-help">
-      <h2>Trenger du umiddelbar hjelp?</h2>
-      {% set nestleder = load_data(path="content/kontakt/members.json") | filter(attribute="position", value="nestleder")%}
+
+    <section class="latest-news">
+      <h2>Siste nytt</h2>
+      <ul>
+        {% for post in news.pages | slice(end=5) | sort(attribute="date") | reverse %}
+        <li>
+          <a href="{{ get_url(path=post.path) }}">
+            {{ post.title }} ({{ post.date | date(format="%Y-%m-%d") }})
+          </a>
+        </li>
+        {% endfor %}
+      </ul>
+      <a href="{{ get_url(path="@/nyheter/_index.md") }}" class="btn primary">Flere nyheter...</a>
+    </section>
+
+  {% elif lang == 'en' %}    
+    <section class="contact">
+      <h2>Contact</h2>
+      <p>
+        If you are a student organization looking to enter into an agreement with us, please contact us directly at
+        <a href="mailto:{{ config.extra.email_general }}">{{ config.extra.email_general }}</a>.
+      </p>
       <p>
-        Skulle det oppstå akutte problemer ved tjenestene vi leverer, kan du kontakte vår nestleder
-        {{ nestleder[0].name }}, {% if nestleder[0].phone %}via telefon <a href="tel:{{ nestleder[0].phone }}">{{
-          nestleder[0].phone }}</a>{% else %}via e-post <a href="mailto:{{ nestleder[0].email }}">{{ nestleder[0].email }}{%
-          endif %}</a>.
+        Please contact us if you have any questions. You can find a list of members and contact information on
+        <a href="/en/kontakt">Contact us</a>, and more information about the organization friByte on <a href="/en/om">About us</a>.
+      </p>
+      <p>
+        We try to be easily accessible and respond quickly to all inquiries. Please also contact us if you have any feedback on the services we deliver. We appreciate all constructive criticism. :)
       </p>
     </section>
 
     <section class="latest-news">
-      <h2>Siste nytt</h2>
+      <h2>Latest news</h2>
       <ul>
         {% for post in news.pages | slice(end=5) | sort(attribute="date") | reverse %}
         <li>
@@ -89,7 +109,10 @@ <h2>Siste nytt</h2>
         </li>
         {% endfor %}
       </ul>
-      <a href="{{ get_url(path="@/nyheter/_index.md") }}" class="btn primary">Flere nyheter...</a>
+      <a href="{{ get_url(path="@/nyheter/_index.md") }}" class="btn primary">More news...</a>
     </section>
+
   {% endif %}
+
+
 {% endblock content %}