fix table, amend tf, fix upload-sarif version

Author: jamesgeddes

.github/workflows/analyse_workflows.yml

@@ -30,7 +30,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@v3.27.9
+        uses: github/codeql-action/upload-sarif@main
         with:
           sarif_file: results.sarif
           category: zizmor

.github/workflows/deploy.yml

@@ -82,6 +82,7 @@ jobs:
               full="https://efpb.org/assets/images/fulls/$img"
               echo "[![$img]($thumb)]($full)"
               echo ""
+              echo ""
             done
             echo "" 
             echo "Return to the [Main Gallery](https://efpb.org)" 

README.md

@@ -105,9 +105,7 @@ Images are stored in `assets/images/fulls/` and thumbnails are stored in `assets
 | Membership  | Action                                                                                                                                                                                                                           |
 |-------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Non-members | We will gladly accept any contributions to the site. Please fork the repository and submit a pull request with your changes. We will review and merge them as soon as possible.                                                  |
-|
 | Members     | Please [submit an issue](https://github.com/EppingForestPipeBand/EppingForestPipeBand.github.io/issues/new) to request an organisation invite. Once you have been invited, you will be able to push directly to the main branch. |
-|
 
 ## Code of Conduct
 

opentofu/data.tofu

@@ -1,3 +1,3 @@
-data "cloudflare_zone" "zone" {
+data "cloudflare_zone" "main" {
   name = var.domain
 }

opentofu/dns.tofu

@@ -2,9 +2,9 @@ locals {
   non_proxied_types = ["TXT", "MX"]
 
   mx_records = {
-    "mx.zoho.eu"  = "10"
-    "mx2.zoho.eu" = "20"
-    "mx3.zoho.eu" = "50"
+    "mx.zoho.com"  = "10"
+    "mx2.zoho.com" = "20"
+    "mx3.zoho.com" = "50"
   }
 
   dns_records = flatten(
@@ -36,7 +36,7 @@ locals {
 resource "cloudflare_record" "root" {
   for_each = { for record in local.dns_records : record.key => record }
 
-  zone_id = data.cloudflare_zone.zone.id
+  zone_id = data.cloudflare_zone.main.id
   name    = var.domain
   type    = each.value.type
   ttl     = 1
@@ -49,10 +49,15 @@ resource "cloudflare_record" "email" {
   for_each = local.mx_records
   name     = var.domain
   type     = "MX"
-  zone_id  = data.cloudflare_zone.zone.id
+  zone_id  = data.cloudflare_zone.main.id
   content  = each.key
   priority = each.value
   proxied  = false
 }
 
-# revert a record to 173.254.30.93
+resource "cloudflare_record" "dkim" {
+  name    = "zmail._domainkey"
+  type    = "TXT"
+  zone_id = data.cloudflare_zone.main.id
+  content = "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCFrH13L2fRlBHOu20jC0Bp7gYHWPG8sdXlU5SndG0FynyCJ80Kq//VrpsOFs2tGU5YsHsIXP1Kh4xBVYDssM6CtD5wiuFudunxVZXE42GIP3bA191mIbKSVk6W843uAl0TJ6IN8pTlMlRV/39jwMzpfWLvcX9+zfvmc+psNkhMRQIDAQAB"
+}

opentofu/github.tofu

@@ -27,10 +27,6 @@ resource "github_repository" "website" {
     "performance",
     "pipe-band",
     "pipe-band-music",
-    "scotland",
-    "scottish-heritage",
-    "scottish-tradition",
-    "traditional-music",
   ]
   vulnerability_alerts = true