Merge remote-tracking branch 'origin/main' into 12.better-images

Signed-off-by: Benoit Donneaux <benoit@leastauthority.com>

.gitea/workflows/jekyll.yaml

@@ -8,9 +8,8 @@ on:
 env:
   _UID: 1000
   _GID: 1000
-  WEB_DOMAIN: tahoe-lafs.org
-  WEB_HOST: webforge.of.tahoe-lafs.org
-  WEB_USER: bot-www
+  WEB_DOMAIN: lafs.eval.latfa.net
+  WEB_USER: www
   WEB_DIR: /var/www
 jobs:
   jekyll:
@@ -19,7 +18,6 @@ jobs:
       - name: Check out repository
         id: checkout
         uses: actions/checkout@v4
-        github-server-url: 'https://forge.of.tahoe-lafs.org/'
       - name: Change file ownership
         id: file_ownership
         run: |
@@ -46,10 +44,10 @@ jobs:
       - name: Build Jekyll site
         id: build_site
         run: |
-          # Overwrite the baseurl for preview only
-          if [ "${{ forge.event_name }}" = 'pull_request' ]; then
-            echo "Overwriting baseurl for pull_request ${{ forge.event.pull_request.number }}"
-            sed -i -r -e 's/^baseurl:\s*"([^"]*)"/baseurl: "\1\/${{ forge.event.pull_request.number }}"/' _config.yml
+          # Overwrite the baseurl for previewonly
+          if [ "${{ gitea.event_name }}" = 'pull_request' ]; then
+            echo "Overwriting baseurl for pull_request ${{ gitea.event.pull_request.number }}"
+            sed -i -r -e 's/^baseurl:\s*"([^"]*)"/baseurl: "\1\/${{ gitea.event.pull_request.number }}"/' _config.yml
             grep "^baseurl:" _config.yml
           fi
           docker-compose run --rm -v "${JOB_CONTAINER_NAME}:/site" -w /site \
@@ -57,18 +55,17 @@ jobs:
       - name: Deploy Jekyll site
         id: deploy_site
         run: |
-          if [ "${{ forge.ref }}" = 'refs/heads/main' ]; then
-            WEB_ROOT="${WEB_DIR}/live"
-            WEB_VHOST="home.of.${WEB_DOMAIN}"
+          if [ "${{ gitea.ref }}" = 'refs/heads/main' ]; then
+            WEB_ROOT="${WEB_DIR}/site"
+            WEB_HOST="www.${WEB_DOMAIN}"
             WEB_CONTEXT='/'
           else
             WEB_ROOT="${WEB_DIR}/preview"
-            WEB_VHOST="preview.of.${WEB_DOMAIN}"
-            WEB_CONTEXT='/${{ forge.event.pull_request.number }}/'
+            WEB_HOST="preview.${WEB_DOMAIN}"
+            WEB_CONTEXT='/${{ gitea.event.pull_request.number }}/'
           fi
           # Save those variabes in the environment for the next steps
           echo "WEB_HOST=${WEB_HOST}" >> $GITHUB_ENV
-          echo "WEB_VHOST=${WEB_VHOST}" >> $GITHUB_ENV
           echo "WEB_CONTEXT=${WEB_CONTEXT}" >> $GITHUB_ENV
           # Prepare ssh key
           echo "${{ secrets.WWW_DEPLOY_KEY }}" > ~/.ssh/id_ed25519
@@ -76,23 +73,23 @@ jobs:
           # Synchronize the local and the remote site
           rsync -halvi --delete \
             -e "ssh -a -x -o StrictHostKeyChecking=no" \
-            ./_site/ "${WEB_USER}@${WEB_HOST}:${WEB_ROOT}${WEB_CONTEXT}"
+            ./_site/ "${WEB_USER}@${WEB_DOMAIN}:${WEB_ROOT}${WEB_CONTEXT}"
       - name: Comment pull request
         id: comment_pull_request
-        if: ${{ always() && forge.event_name == 'pull_request' }}
-        uses: https://github.com/exercism/pr-commenter-action@v1.5.1
+        if: ${{ always() && gitea.event_name == 'pull_request' }}
+        uses: exercism/pr-commenter-action@v1.5.1
         with:
           template-variables: |
             {
               "imageOutcome": "${{ steps.build_image.outcome }}",
               "buildOutcome": "${{ steps.build_site.outcome }}",
               "deployOutcome": "${{ steps.deploy_site.outcome }}",
-              "deployWebHost": "${{ env.WEB_VHOST }}",
+              "deployWebHost": "${{ env.WEB_HOST }}",
               "deployWebContext": "${{ env.WEB_CONTEXT }}",
-              "gitActor": "${{ forge.actor }}",
-              "gitEventName": "${{ forge.event_name }}",
-              "gitWorkflow": "${{ forge.workflow }}",
-              "gitRunNumber": "${{ forge.run_number }}",
-              "gitRunAttempt": "${{ forge.run_attempt }}"
+              "gitActor": "${{ gitea.actor }}",
+              "gitEventName": "${{ gitea.event_name }}",
+              "gitWorkflow": "${{ gitea.workflow }}",
+              "gitRunNumber": "${{ gitea.run_number }}",
+              "gitRunAttempt": "${{ gitea.run_attempt }}"
             }
-          config-file: ".forgejo/pr-commenter.yml"
+          config-file: ".gitea/pr-commenter.yml"

.gitea/workflows/jekyll_cleanup.yml

@@ -6,15 +6,15 @@ on:
     types: [ closed ]
 
 env:
-  WEB_HOST: webforge.of.tahoe-lafs.org
-  WEB_USER: bot-www
+  WEB_DOMAIN: lafs.eval.latfa.net
+  WEB_USER: www
   WEB_ROOT: /var/www/preview
-  WEB_CONTEXT: "/${{ forge.event.pull_request.number }}/"
+  WEB_CONTEXT: "/${{ gitea.event.pull_request.number }}/"
 jobs:
   jekyll_cleanup:
     runs-on: ubuntu-22.04
     permissions:
-      pull-requests: read
+      pull-requests: write
       actions: read
       contents: read
     steps:
@@ -32,4 +32,4 @@ jobs:
           chmod 600 ~/.ssh/id_ed25519
           # Delete preview context from the remote site
           echo -e "set sftp:connect-program ssh -a -x -o StrictHostKeyChecking=no; rm -r -f ${WEB_ROOT}${WEB_CONTEXT}\nbye" \
-          | lftp sftp://${WEB_USER}:unused@${WEB_HOST}
+          | lftp sftp://${WEB_USER}:unused@${WEB_DOMAIN}

README.md

@@ -1,23 +0,0 @@
-# Web landing page for the Tahoe-LAFS project
-
-The goal of this web page is to represent the Tahoe-LAFS project to the public.
-
-It gives guidance on getting started for end-users, developers building with Tahoe-LAFS and hackers interested working on Tahoe-LAFS itself alike.
-
-
-## Building
-
-This web page is built and deployed by CI.  A preview is also automaticaly genereated for PRs made from branches local to this repository (require push/write permission).
-
-If you want to pre-view your changes on your local machine before pushing commits, you might want to start a development server.
-
-Issuing this command on a system with Docker runs a web server on http://localhost:4000/ that re-builds and refresh the page automatically on source file change:
-
-```sh
-docker-compose up
-```
-
-## Contributing
-
-We welcome contributions!  Easiest is to open tickets or pull requests directly.  If unsure, join the IRC or ask on the Tahoe-LAFS developer mailing list.
-

docker-compose.yml

@@ -13,7 +13,6 @@ services:
     working_dir: /appdata
     ports:
       - "4000:4000"
-      - "35729:35729"
     stdin_open: true
     tty: true
     hostname: jekyll.local

docker/jekyll/Dockerfile

@@ -40,4 +40,4 @@ RUN echo "gem: --no-document --user-install --bindir /home/${user}/bin" >> /home
 ENV PATH=/home/${user}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 ENTRYPOINT ["jekyll"]
-CMD ["server", "--verbose", "--host", "0.0.0.0", "--incremental", "--livereload"]
+CMD ["server", "--verbose", "--host", "0.0.0.0", "--incremental"]

src/_data/navigation.yml

@@ -10,4 +10,4 @@ main:
   - title: "About"
     url: "#about"
   - title: "Fork me"
-    url: "https://forge.of.tahoe-lafs.org/tahoe-lafs/web-landing-page/"
+    url: "https://code.lafs.eval.latfa.net/tahoe-lafs/web-landing-page/"

src/_posts/2022-10-03-release-v1.18.0.md

@@ -1,12 +1,14 @@
 ---
 layout: single
-title:  "v1.20.0 is released"
-date:   2024-12-19 05:48:54 +0000
-excerpt: "ANNOUNCING Tahoe, the Least-Authority File Store, v1.20.0"
+title:  "v1.18.0 is released"
+date:   2022-10-03 16:17:57 +0000
+excerpt: "ANNOUNCING Tahoe, the Least-Authority File Store, v1.18.0"
 header:
   teaser: /assets/images/posts/release.jpg
 ---
-The Tahoe-LAFS team is pleased to announce version 1.20.0 of
+ANNOUNCING Tahoe, the Least-Authority File Store, v1.18.0
+
+The Tahoe-LAFS team is pleased to announce version 1.18.0 of
 Tahoe-LAFS, an extremely reliable decentralized storage
 system. Get it with "pip install tahoe-lafs", or download a
 tarball here:
@@ -21,22 +23,15 @@ unique security and fault-tolerance properties:
 
   [https://tahoe-lafs.readthedocs.org/en/latest/about.html][about]
 
-The previous stable release of Tahoe-LAFS was v1.19.0, released on
-January 18, 2024. Major new features and changes in this release:
+The previous stable release of Tahoe-LAFS was v1.17.1, released on
+January 7, 2022.
 
-Declarative build system based on "hatch".
-The ability to creat mutable directories with a given private-key.
-
-Pulled in fixes from CBOR, stopped using the C version of CBOR and
-fixed incompatibilities with attrs and cryptography libraries.
-
-Besides all this there have been dozens of other bug-fixes and
-improvements.
-
-Enjoy!
+This release drops support for Python 2 and for Python 3.6 and earlier.
+twistd.pid is no longer used (in favour of one with pid + process creation time).
+A collection of minor bugs and issues were also fixed.
 
 [Read the full announcement][more]
 
 [download]: https://tahoe-lafs.org/downloads
 [about]: https://tahoe-lafs.readthedocs.org/en/latest/about.html
-[more]: https://lists.tahoe-lafs.org/pipermail/tahoe-dev/2024-December/010111.html
+[more]: https://lists.tahoe-lafs.org/pipermail/tahoe-dev/2022-October/010043.html

src/_posts/2024-05-29-new-landing-page.md

@@ -1,7 +1,7 @@
 ---
 layout: single
 title:  "New landing page"
-date:   2025-08-13 18:23:00 +0200
+date:   2024-05-29 21:47:57 +0200
 excerpt: "The old Tahoe-LAFS landing page is gone!"
 header:
   teaser: /assets/images/posts/old-landing-page-teaser.png
@@ -9,12 +9,14 @@ gallery:
   - image_path: /assets/images/posts/old-landing-page.png
     alt: "original"
 ---
-We're happy to announce that the migration from the [trac][old] landing page (see below) to the [jekyll][new] one has been completed.
+We're happy to announce that the migration of the [original][old] landing page to this one has been completed.
 
 Help us to contribute to it using this [repository][repo].
 
+Goodbye Trac...
+
 {% include gallery %}
 
 [old]: https://tahoe-lafs.org/trac/tahoe-lafs/wiki/WikiStart
-[new]: https://home.of.tahoe-lafs.org/
-[repo]: https://forge.of.tahoe-lafs.org/tahoe-lafs/web-landing-page/
+[new]: https://www.lafs.eval.latfa.net/
+[repo]: https://code.lafs.eval.latfa.net/tahoe-lafs/web-landing-page/

src/_sass/_custom.scss

@@ -1,3 +1,7 @@
+body {
+  font-family: system-ui;
+}
+
 .page__hero--overlay {
   padding: 1em;
 }
@@ -48,14 +52,7 @@
   margin-bottom: unset;
 }
 
-.archive__item-teaser {
-  background-image: url('../images/icon_background.png');
-}
-
 .feature__item {
-  @media (max-width: 37.5em) {
-    width: 100%;
-  }
   background-color: #eee;
   margin-bottom: 1em;
   border-radius: 4px;
@@ -75,6 +72,7 @@
   height: 80px;
   width: auto;
   display: block;
+  margin-top: 10px;
   margin-left: auto;
   margin-right: auto;
 }
@@ -85,6 +83,11 @@
   border-radius: 20px;
 }
 
+.feature__item .btn {
+  background-color: #0075a2;
+  color: #fff;
+}
+
 .feature__item .btn:hover {
    background-color: #777;
    color: #fff;
@@ -112,9 +115,6 @@
 }
 
 .grid__item {
-  @media (max-width: 37.5em) {
-    width: 100%;
-  }
   background-color: #ccc;
   padding: 0.5em;
   border-radius: 4px;
@@ -142,13 +142,8 @@
   background-color: #fff;
 }
 
-#about .feature__wrapper .btn {
-  background-color: #0075a2;
-  color: #fff;
-}
-
-#about .archive__item-title {
-  margin-top: 0.5em;
+#about .feature__item .archive__item-title {
+  padding-top: 0.5em;
 }
 
 .feature__item--center {

src/index.html

@@ -1,5 +1,5 @@
 ---
-title: "Welcome to <i>The</i> Least-Authority File Store"
+title: "Welcome <i>The</i> Least-Authority File Store"
 layout: splash
 author_profile: false
 header:
@@ -19,26 +19,23 @@ documentation_list:
   - image_path: /assets/images/overview.svg
     alt: "overview"
     title: "Overview"
-    excerpt: >-
-      <center>
-      <a href="https://tahoe-lafs.readthedocs.io/en/latest/about-tahoe.html">One-page summary</a>
-      </center>
+    excerpt: '
+      This [one-page summary](https://tahoe-lafs.readthedocs.io/en/latest/about-tahoe.html) explains the unique properties of this system
+    '
   - image_path: /assets/images/manual.svg
     alt: "manual"
     title: "Manual"
-    excerpt: >-
-      <center>
-      <p><a href="https://tahoe-lafs.readthedocs.io/en/latest/Installation/install-tahoe.html">Installation Instructions</a></p>
-      <p><a href="http://tahoe-lafs.readthedocs.org/">Tahoe-LAFS Manual</a></p>
-      </center>
+    excerpt: '<ul>
+      <li><a href="https://tahoe-lafs.readthedocs.io/en/latest/Installation/install-tahoe.html">Installation Instructions</a></li>
+      <li><a href="http://tahoe-lafs.readthedocs.org/">Tahoe-LAFS Manual</a></li>
+    </ul>'
   - image_path: /assets/images/wiki.svg
     alt: "wiki"
     title: "Wiki"
-    excerpt: >-
-      <center>
-      <p><a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/Doc">Index of docs</a></p>
-      <p><a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/FAQ">Frequently Asked Questions</a></p>
-      </center>
+    excerpt: '<ul>
+      <li><a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/Doc">Index of docs</a></li>
+      <li><a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/FAQ">Frequently Asked Questions</a></li>
+    </ul>'
 contribute:
   - title: "Contribute"
     excerpt: ""
@@ -55,8 +52,8 @@ contribute_list:
     alt: "issues"
     title: "Issues"
     excerpt: '<ul>
-      <li>Visit the <a href="https://tahoe-lafs.org/trac/tahoe-lafs"><b>issue</b></a> tracker</li>
-      <!--<li>Register an <a href="https://forge.of.tahoe-lafs.org/user/sign_up"><b>account</b></a> to interact</li>-->
+      <li>Visit the <a href="https://code.lafs.eval.latfa.net/tahoe-lafs/trac/issues"><b>issue</b></a> tracker</li>
+      <li>Register an <a href="https://code.lafs.eval.latfa.net/user/sign_up"><b>account</b></a> to interact</li>
     </ul>'
   - image_path: /assets/images/code.svg
     alt: "code"
@@ -70,15 +67,27 @@ blog:
     excerpt: ""
 about:
   - title: "About us"
-    image_path: /assets/images/aboutus.png
-    alt: "aboutus"
-    excerpt: >-
-      Tahoe-LAFS is an open-source project supported by donations
-      and maintained by a group of hardy volunteers.
-      We are grateful for their energy, expertise, and support.
-      Check out some of the main contributors to this project!
+    excerpt: ""
+about_list:
+  - title: "Volunteers"
+    excerpt: "Tahoe-LAFS is an open-source project supported by donations and maintained by a group of hardy volunteers...<br/>"
     url: "https://tahoe-lafs.org/trac/tahoe-lafs/wiki/AboutUs"
-    btn_label: "Our Contributors"
+    btn_label: "Read More"
+    btn_class: "btn--primary"
+  - title: "Donation"
+    excerpt: 'You can donate to the Tahoe-LAFS project via BitCoin and PayPal.<br/><br/>
+    <a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/BitCoinPage" target="_blank">
+    <img src="assets/images/bitcoin.png"></a>
+    <a href="https://www.paypal.com/donate?cmd=_s-xclick&hosted_button_id=XQM2LB4UC8V2J" target="_blank">
+    <img src="assets/images/paypal.png"></a>'
+  - title: "Sponsorship"
+    excerpt: "Please contact *secorp at secorp dot net* if you would like to sponsor Tahoe-LAFS."
+  - title: "Least Authority"
+    excerpt: '<a href="https://leastauthority.com/community-matters/open-source-development/" target="_blank">Least Authority</a> sells service and support for LAFS as well as developing improvements for LAFS and contributing them back to the Free and Open Source project.'
+  - title: "Google"
+    excerpt: 'Google, Inc. sponsored Tahoe-LAFS through its <a href="https://www.google-melange.com/archive/gsoc/2010/orgs/tahoe_lafs" target="_blank">Google Summer of Code</a> program in 2010 and 2013.<br/>'
+  - title: "Atlas Networks"
+    excerpt: '<a href="https://atlasnet.com/" target="_blank">Atlas Networks</a> provides dedicated server hosting for scale and performance testing.<br/>'
 ---
 <div id="documentation">
 {% include feature_row id="documentation" type="center" %}
@@ -108,7 +117,8 @@ about:
   {% endfor %}
 </div>
 </div>
-<br/><br/><br/>
+
 <div id="about">
-{% include feature_row id="about" type="left" %}
+{% include feature_row id="about" type="center" %}
+{% include feature_row id="about_list" %}
 </div>