From e5703f798260807f259476b3a26b14017116d6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 1 Apr 2024 15:24:51 +0200 Subject: [PATCH 1/4] targets/admins: switch to tofu --- targets/admins/apply.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/admins/apply.sh b/targets/admins/apply.sh index bc0f93f..8b0c601 100755 --- a/targets/admins/apply.sh +++ b/targets/admins/apply.sh @@ -2,6 +2,6 @@ set -euo pipefail rm -f .terraform.lock.hcl -terraform init -backend-config="password=$GITLAB_TOKEN" -backend-config="username=$GITLAB_USER" -terraform apply +tofu init -backend-config="password=$GITLAB_TOKEN" -backend-config="username=$GITLAB_USER" +tofu apply From f9796c93a2fddba68096e92fde796008fd04b95f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 1 Apr 2024 15:25:52 +0200 Subject: [PATCH 2/4] deploy key of lassulus --- targets/nixos-wiki.nixos.org/nixos-vars.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/nixos-wiki.nixos.org/nixos-vars.json b/targets/nixos-wiki.nixos.org/nixos-vars.json index 0184bc0..f1645bf 100644 --- a/targets/nixos-wiki.nixos.org/nixos-vars.json +++ b/targets/nixos-wiki.nixos.org/nixos-vars.json @@ -1 +1 @@ -{"ipv6_address":"2a01:4f9:c012:8178::1","ssh_keys":["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine","ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDMBW7rTtfZL9wtrpCVgariKdpN60/VeAzXkh9w3MwbO julien@enigma"]} \ No newline at end of file +{"ipv6_address":"2a01:4f9:c012:8178::1","ssh_keys":["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine","ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDMBW7rTtfZL9wtrpCVgariKdpN60/VeAzXkh9w3MwbO julien@enigma","ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIb3uuMqE/xSJ7WL/XpJ6QOj4aSmh0Ga+GtmJl3CDvljGuIeGCKh7YAoqZAi051k5j6ZWowDrcWYHIOU+h0eZCesgCf+CvunlXeUz6XShVMjyZo87f2JPs2Hpb+u/ieLx4wGQvo/Zw89pOly/vqpaX9ZwyIR+U81IAVrHIhqmrTitp+2FwggtaY4FtD6WIyf1hPtrrDecX8iDhnHHuGhATr8etMLwdwQ2kIBx5BBgCoiuW7wXnLUBBVYeO3II957XP/yU82c+DjSVJtejODmRAM/3rk+B7pdF5ShRVVFyB6JJR+Qd1g8iSH+2QXLUy3NM2LN5u5p2oTjUOzoEPWZo7lykZzmIWd/5hjTW9YiHC+A8xsCxQqs87D9HK9hLA6udZ6CGkq4hG/6wFwNjSMnv30IcHZzx6IBihNGbrisrJhLxEiKWpMKYgeemhIirefXA6UxVfiwHg3gJ8BlEBsj0tl/HVARifR2y336YINEn8AsHGhwrPTBFOnBTmfA/VnP1NlWHzXCfVimP6YVvdoGCCnAwvFuJ+ZuxmZ3UzBb2TenZZOzwzV0sUzZk0D1CaSBFJUU3oZNOkDIM6z5lIZgzsyKwb38S8Vs3HYE+Dqpkfsl4yeU5ldc6DwrlVwuSIa4vVus4eWD3gDGFrx98yaqOx17pc4CC9KXk/2TjtJY5xmQ== lass@yubikey"]} \ No newline at end of file From 08f321c379dca8ae0ca7df1a45c20d8c729d7011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 1 Apr 2024 16:19:48 +0200 Subject: [PATCH 3/4] nixos-wiki: fix mobile reponsiveness --- modules/nixos-wiki/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos-wiki/default.nix b/modules/nixos-wiki/default.nix index 1c1aa73..508d3e5 100644 --- a/modules/nixos-wiki/default.nix +++ b/modules/nixos-wiki/default.nix @@ -55,6 +55,7 @@ in hash = "sha256-hr/DLyL6IzQs67eA46RdmuVlfCiAbq+eZCRLfjLxUpc="; }; # Github login extensions.ConfirmEdit = null; # Combat SPAM with a simple Captcha + extensions.MobileFrontend = null; # Responsive skin #extensions.StopForumSpam = pkgs.fetchzip { # url = "https://github.com/NixOS/nixos-wiki-infra/releases/download/StopForumSpam-REL1_41-73c94fb/StopForumSpam-REL1_41-861c37b.tar.gz"; # hash = "sha256-/7gfBiKA9CliEPjXjcHrYKp4JMayXwtixlZFvnA5D2E="; From 16a202088abd21000b44eb44362b9e34fe6bdd44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 1 Apr 2024 16:28:26 +0200 Subject: [PATCH 4/4] make mobile frontend responsive --- modules/nixos-wiki/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/nixos-wiki/default.nix b/modules/nixos-wiki/default.nix index 508d3e5..96b25e6 100644 --- a/modules/nixos-wiki/default.nix +++ b/modules/nixos-wiki/default.nix @@ -55,7 +55,12 @@ in hash = "sha256-hr/DLyL6IzQs67eA46RdmuVlfCiAbq+eZCRLfjLxUpc="; }; # Github login extensions.ConfirmEdit = null; # Combat SPAM with a simple Captcha - extensions.MobileFrontend = null; # Responsive skin + # https://www.mediawiki.org/wiki/Extension:MobileFrontend/ + extensions.MobileFrontend = pkgs.fetchzip { + url = "https://github.com/NixOS/nixos-wiki-infra/releases/download/MobileFrontend-REL1_41-6dbf6c2.tar.gz/MobileFrontend-REL1_41-6dbf6c2.tar.gz"; + hash = "sha256-LsKPlVId7DzbkS7xc+fSYBiasq4AofCjCfbBaN/eSE8="; + }; # Responsive skin + #extensions.StopForumSpam = pkgs.fetchzip { # url = "https://github.com/NixOS/nixos-wiki-infra/releases/download/StopForumSpam-REL1_41-73c94fb/StopForumSpam-REL1_41-861c37b.tar.gz"; # hash = "sha256-/7gfBiKA9CliEPjXjcHrYKp4JMayXwtixlZFvnA5D2E=";