Merge branch 'master' into dependabot/bundler/rack-2.2.6.2

Author: bastischubert

.github/workflows/website.yml

@@ -0,0 +1,41 @@
+name: Build FOSDEM site
+
+on:
+  push:
+    branches:
+      - master
+      - gha
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Copy test penta/pretalx export
+        run: |
+          mv sample/export .
+      - name: Ensure pdf_grid is set to false in config.yaml
+        run: |
+          sed -i '/^pdf_grid/d' config.yaml
+          echo "pdf_grid: false" >> config.yaml
+
+
+      - name: Run nanoc build in docker
+        uses: docker://ghcr.io/johanvdw/fosdem-website
+        with:
+          entrypoint: /bin/sh
+          args: -c "bundle install && nanoc"
+
+      # Step 5: Upload the 'output' directory as an artifact
+      - name: Upload output directory
+        uses: actions/upload-artifact@v4
+        with:
+          name: nanoc-output
+          path: output
+

Dockerfile

@@ -1,26 +1,24 @@
-FROM ruby:2.7
+FROM docker.io/library/ruby:2.7
 MAINTAINER ryan@slatehorse.com
 
+# Set encoding to prevent nanoc exploding
+ENV LANG=C.UTF-8
+ENV APP_DIR=/usr/src/app
+WORKDIR $APP_DIR
+
 # Install other dependencies
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
       pngcrush \
       imagemagick \
       krb5-user
 
 # Copy the Gemfile in and bundle, so we have the dependencies cached
-ADD Gemfile .
-ADD Gemfile.lock .
+COPY Gemfile Gemfile.lock $APP_DIR
 RUN gem install bundler:1.17.3 && bundle install
 
-# Set encoding to prevent nanoc exploding
-ENV LANG=C.UTF-8
-ENV APP_DIR=/usr/src/app
-
-# Copy the rest of the app in
-ADD . $APP_DIR
-
 # Port 3000 is used for `nanoc view`
 EXPOSE 3000
-WORKDIR $APP_DIR
 ENTRYPOINT ["bundle", "exec"]
-CMD ['nanoc', 'view']
+
+LABEL "org.opencontainers.image.source"="https://github.com/FOSDEM/website"
+CMD ["nanoc", "view"]

Gemfile.lock

@@ -29,7 +29,7 @@ GEM
     minitest (5.16.3)
     nanoc (3.8.0)
       cri (~> 2.3)
-    nokogiri (1.13.8)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
@@ -45,7 +45,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.6.0)
+    racc (1.6.1)
     rack (2.2.6.2)
     rainbow (3.1.1)
     rainpress (1.0.1)

README.md

@@ -7,6 +7,8 @@ of those will be an inspiration or of help.
 
 # Getting started
 
+Building the website can be done either using containers or by doing a manual install. The manual install is a bit fragile and may be hard to install on modern systems. Pull requests to support a more recent environment are very much welcome!
+
 ## Prerequisites
 
 - Ruby 2.4 or newer
@@ -16,7 +18,7 @@ of those will be an inspiration or of help.
   1. An export of the FOSDEM pentabarf system; or
   2. Credentials to connect to the FOSDEM pentabarf database
 
-### Debian 9 with rbenv
+### Debian 9-12 with rbenv
 
 Assuming you are running Debian or a derivative thereof, your system will need
 to have the following packages installed:
@@ -72,26 +74,24 @@ initialisation file for your shell.
 
 A site build consists of two steps:
 
-1. Export the data from the FOSDEM Pentabarf database
+1. Export the data from the FOSDEM Pretalx database
 2. Generate the static site using the exported data
 
-### Exporting from FOSDEM Pentabarf
+### Exporting from FOSDEM Pretalx
 
-To generate the schedule data from Pentabarf, you will first need to obtain a
-Kerberos ticket for a principal with access to the Pentabarf database. Next,
-you will be able to run the update command.
+The schedule data is fetched as a large yaml file and the resources/thumbnails.
+The best way is to clone these from the nanoc server (`nanoc update -y` should be repaired)
 
 ```bash
-kinit yourprincipal@FOSDEM.ORG
-nanoc update -y
+rsync nanoc@nanoc.fosdem.org:/srv/nanoc/website/export/ export -aP --delete-after
 ```
 
-If you do not have access to the Pentabarf database, you can copy the `export/`
+If you do not have access to the pretalx site or for, you can copy the `export/`
 folder in the `sample/` directory to the root and go from there.
 
 ### Generating the site
 
-> This section assumes you have an exported data from pentabarf already. If you
+> This section assumes you have an exported data from pretalx already. If you
 > haven't please see the section above first.
 
 ```bash
@@ -101,25 +101,32 @@ nanoc
 The site will be generated in `/output`. To view the website, you can use the
 `view` command and optionally specify a port to listen on:
 
-```
+```bash
 nanoc view -p 1234
-
 ```
-Don't forget to add the year when you check out the site, eg http://localhost:1234/2022 .
 
+Don't forget to add the year when you check out the site, eg http://localhost:1234/2024 .
 
 ### Running with Docker
 
-Rather than installing all dependencies on you machine, it is also possible to use a docker container with all specific versions.
+Rather than installing all dependencies on you machine, it is also possible to use a docker container with all specific versions. You can either build a container yourself, or pull the one that is used in github actions.
 
+To build yourself:
 ```bash
 docker build -t fosdem/website .
+```
+
+Using the published image:
+```bash
+docker pull ghcr.io/johanvdw/fosdem-website
+docker tag fosdem/website ghcr.io/johanvdw/fosdem-website
+```
 
 # Export from Pentabarf
-docker run --rm -it -v $(pwd):/usr/src/app fosdem/website kinit <username>@FOSDEM.ORG && nanoc update -y
+docker run --rm -it -v $(pwd):/usr/src/app:z fosdem/website kinit <username>@FOSDEM.ORG && nanoc update -y
 # Generate the site
-docker run --rm -v $(pwd):/usr/src/app fosdem/website nanoc
+docker run --rm -v $(pwd):/usr/src/app:z fosdem/website nanoc
 
 # Preview the site (at http://localhost:3000/2018)
-docker run --rm -v $(pwd):/usr/src/app -p 3000:3000 fosdem/website nanoc view
+docker run --rm -v $(pwd):/usr/src/app:z -p 3000:3000 fosdem/website nanoc view
 ```

Rules

@@ -245,13 +245,20 @@ compile '*' do
     # http://ruby-doc.org/stdlib-1.9.3/libdoc/erb/rdoc/ERB.html
     filter :erb
 
-    # only run the chain of filters when it's not an .xml or .erb or .ics file
-    unless ['xml', 'erb', 'ics'].include? item[:extension] then
+    # only run the chain of filters when it's not an .xml or .erb or .ics or .json file
+    unless ['xml', 'erb', 'ics', 'json'].include? item[:extension] then
 
       # don't process content that is generated from Pentabarf, or content
       # pages that have "kind: internal" in their metadata
       unless item.identifier =~ %r{^/schedule/.+} or item[:kind] == 'internal'
 
+        # run the custom news filter (lib/filters/news_filter.rb) on
+        # content/news/* -- it removes "---MORE---" lines and removes
+        # from the beginning of the content until "---FULL---" lines
+        # (analog to the make_headlines function from lib/helpers/news.rb
+        # which does the "opposite" (kindof) to generate headline items)
+        filter :news if news?(item)
+
         # convert .md and .markdown files to HTML using the
         # kramdown processor
         filter :kramdown if ['markdown', 'md'].include? item[:extension]
@@ -265,13 +272,6 @@ compile '*' do
         # metadata, but without adding the license footer
         filter :interview, { :nolicense => true } if item[:filter] == 'qa'
 
-        # run the custom news filter (lib/filters/news_filter.rb) on
-        # content/news/* -- it removes "---MORE---" lines and removes
-        # from the beginning of the content until "---FULL---" lines
-        # (analog to the make_headlines function from lib/helpers/news.rb
-        # which does the "opposite" (kindof) to generate headline items)
-        filter :news if news?(item)
-
         filter :toc if item[:toc] == true
         filter :semantic if item[:semantic] == true
 
@@ -331,6 +331,10 @@ route '/404/' do
   "/404.html"
 end
 
+route '/.well-known/assetlinks/' do
+  "/.well-known/assetlinks.json"
+end
+
 # send this one into oblivion, its compiled content is included in
 # layouts/default.html, but is not to be rendered as a file of its
 # own into output

config.yaml

@@ -34,7 +34,7 @@ pdf_grid: true
 # A list of file extensions that nanoc will consider to be textual rather than
 # binary. If an item with an extension not in this list is found,  the file
 # will be considered as binary.
-text_extensions: [ 'css', 'erb', 'haml', 'htm', 'html', 'js', 'less', 'markdown', 'md', 'php', 'rb', 'sass', 'scss', 'txt', 'xhtml', 'xml', 'coffee', 'ics' ]
+text_extensions: [ 'css', 'erb', 'haml', 'htm', 'html', 'js', 'less', 'markdown', 'md', 'php', 'rb', 'sass', 'scss', 'txt', 'xhtml', 'xml', 'coffee', 'ics' , 'json' ]
 
 # The path to the directory where all generated files will be written to. This
 # can be an absolute path starting with a slash, but it can also be path
@@ -114,6 +114,9 @@ data_sources:
     # it will become “/about.html/” instead.
     allow_periods_in_identifiers: false
 
+    extra_files:
+      - ".well-known/**/*"
+
   -
     type: schedule
 
@@ -151,7 +154,7 @@ search:
   command: "./service/searcher/solrize"
 
 pentabarf:
-  conference_id: FOSDEM23
+  conference_id: FOSDEM26
   username: nanoc
   database: pentabarf
   host:     pgsql.fosdem.org
@@ -173,9 +176,14 @@ pentabarf:
     width: 200
     height: 200
 
+pretalx:
+  conference_slug: fosdem-2026
+  host: https://pretalx.fosdem.org
+  meta_export_file: export/pentabarf.yaml
+
 keysigning:
-  submission_deadline: 2023-01-22
-  homework_due: 2023-04-30
+  submission_deadline: 2026-01-22
+  homework_due: 2026-04-30
   # Change these when the submission window opens/closes.
   submission_notyet: true
   submission_closed: false
@@ -197,8 +205,8 @@ news:
   news_page_items: 6
 
 virtual: false
-go_live: false
-matrix_works: false
+go_live: true
+matrix_works: true
 
 # Use this to build the site as it will appear at a specific time
 # Example: "2021-02-06 14:15:00.000000000 +0100"

content/.well-known/assetlinks.json

@@ -0,0 +1,33 @@
+[
+    {
+        "relation":
+        [
+            "delegate_permission/common.handle_all_urls"
+        ],
+        "target":
+        {
+            "namespace": "android_app",
+            "package_name": "info.metadude.android.fosdem.schedule",
+            "sha256_cert_fingerprints":
+            [
+                "89:4C:4F:D6:CB:AB:E4:C9:F9:2A:43:A8:25:E7:45:25:0A:17:7D:A0:1A:D0:30:1E:DD:22:3C:03:22:C7:C0:03",
+                "FF:A0:BD:6F:43:2A:A8:B4:43:00:24:87:BC:73:27:70:7F:A4:E6:71:FC:8E:F4:51:59:C5:B6:AD:8B:9D:0F:E6"
+            ]
+        }
+    },
+    {
+        "relation":
+        [
+            "delegate_permission/common.handle_all_urls"
+        ],
+        "target":
+        {
+            "namespace": "android_app",
+            "package_name": "info.metadude.android.fosdem.schedule.debug",
+            "sha256_cert_fingerprints":
+            [
+                "D8:E7:B5:B1:50:BB:1E:39:58:A8:AA:E9:95:09:92:68:74:DC:C5:03:79:E5:9C:FD:CC:9A:1B:43:4F:D0:F9:F6"
+            ]
+        }
+    }
+]