From dd5d69002a671c32a7580ebf68e942b869f22e5f Mon Sep 17 00:00:00 2001 From: hut Date: Sat, 28 Jan 2023 23:38:06 +0100 Subject: [PATCH 1/3] Revert "Add banner to announce that some services are down" This reverts commit 68fd37a3fa3e3170ef02170fa137ce331cfb57ec. --- _includes/layouts/homepage.tsx | 5 ----- _includes/styles/page.scss | 28 ---------------------------- 2 files changed, 33 deletions(-) diff --git a/_includes/layouts/homepage.tsx b/_includes/layouts/homepage.tsx index 090228c..30c004e 100644 --- a/_includes/layouts/homepage.tsx +++ b/_includes/layouts/homepage.tsx @@ -24,11 +24,6 @@ export default ({
-
-
- ⚠️ A few of our services are currently down due to an incident in one of our datacenters. We hope to bring them back up soon. -
-
{links.map(({ href, title, openInNewTab }) => Date: Sun, 29 Jan 2023 17:14:55 +0100 Subject: [PATCH 2/3] Bump flake.lock --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index f2fa416..eb503ef 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1663445644, - "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "lastModified": 1671489820, + "narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=", "owner": "numtide", "repo": "devshell", - "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "rev": "5aa3a8039c68b4bf869327446590f4cdf90bb634", "type": "github" }, "original": { @@ -25,11 +25,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665449268, - "narHash": "sha256-cw4xrQIAZUyJGj58Dp5VLICI0rscd+uap83afiFzlcA=", + "lastModified": 1674641431, + "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "285e77efe87df64105ec14b204de6636fb0a7a27", + "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", "type": "github" }, "original": { @@ -75,11 +75,11 @@ ] }, "locked": { - "lastModified": 1665580466, - "narHash": "sha256-q8kVIE3XaOSCVl7oqkaKs2LDEbBcZRIzlnSG8PIKRQ0=", + "lastModified": 1669581047, + "narHash": "sha256-qs2VUUCCkWlc+5KvP/Vh2ToLKMkCjAws47bVT6rilG8=", "ref": "main", - "rev": "70d759b6d8b5e076bee6a28255614ab3d75f6763", - "revCount": 49, + "rev": "341aa68b667a8fb9b77f8af319b7439e82c78793", + "revCount": 53, "type": "git", "url": "https://git.greenbaum.cloud/dev/tritonshell" }, From 12a24477b4b7d8847fcf841a95880e9fb03201b2 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sun, 29 Jan 2023 17:15:16 +0100 Subject: [PATCH 3/3] Deploy website to flora-6 Bump deno to 1.29.4 --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index a1b4cd2..139e169 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ steps: events: - push - pull_request - image: denoland/deno:alpine-1.26.2 + image: denoland/deno:alpine-1.29.4 commands: - deno task build @@ -20,14 +20,14 @@ steps: - main image: appleboy/drone-scp settings: - host: pub.solar - port: 2020 + host: flora-6.pub.solar + port: 22 username: from_secret: ps_ssh_user key: from_secret: ps_ssh_key source: - ./_site/* - target: /srv/pub.solar/ + target: /srv/www/pub.solar/ overwrite: true strip_components: 1