From 85cd96ed8bffc97307400e80933548fbfbb353f9 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 9 Jun 2021 11:37:27 +0200
Subject: gollum: follow upstream

---
 krebs/2configs/wiki.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/2configs/wiki.nix')

diff --git a/krebs/2configs/wiki.nix b/krebs/2configs/wiki.nix
index e4f05a6e..c3d12618 100644
--- a/krebs/2configs/wiki.nix
+++ b/krebs/2configs/wiki.nix
@@ -27,7 +27,7 @@ let
 
 in
 {
-  krebs.gollum = {
+  services.gollum = {
     enable = true;
     extraConfig = ''
       Gollum::Hook.register(:post_commit, :hook_id) do |committer, sha1|
-- 
cgit v1.2.3


From 824a1e8d059cadf83cd70d4cc90e2b6406cb93bb Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 9 Jun 2021 11:37:56 +0200
Subject: wiki: fix ascii error

---
 krebs/2configs/wiki.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'krebs/2configs/wiki.nix')

diff --git a/krebs/2configs/wiki.nix b/krebs/2configs/wiki.nix
index c3d12618..7624c205 100644
--- a/krebs/2configs/wiki.nix
+++ b/krebs/2configs/wiki.nix
@@ -36,6 +36,8 @@ in
     '';
   };
 
+  systemd.services.gollum.environment.LC_ALL = "en_US.UTF-8";
+
   networking.firewall.allowedTCPPorts = [ 80 ];
   services.nginx = {
     enable = true;
-- 
cgit v1.2.3


From 2447bc7d8c496562f03e0cf71a3d90c62fae5764 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 9 Jun 2021 22:21:06 +0200
Subject: wiki: fix old references to krebs.gollum

---
 krebs/2configs/wiki.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs/2configs/wiki.nix')

diff --git a/krebs/2configs/wiki.nix b/krebs/2configs/wiki.nix
index 7624c205..9a18b8df 100644
--- a/krebs/2configs/wiki.nix
+++ b/krebs/2configs/wiki.nix
@@ -4,9 +4,9 @@ let
 
   setupGit = ''
     export PATH=${makeBinPath [ pkgs.git ]}
-    export GIT_SSH_COMMAND='${pkgs.openssh}/bin/ssh -i ${config.krebs.gollum.stateDir}/.ssh/id_ed25519'
+    export GIT_SSH_COMMAND='${pkgs.openssh}/bin/ssh -i ${config.services.gollum.stateDir}/.ssh/id_ed25519'
     repo='git@localhost:wiki'
-    cd ${config.krebs.gollum.stateDir}
+    cd ${config.services.gollum.stateDir}
     if ! url=$(git config remote.origin.url); then
       git remote add origin "$repo"
     elif test "$url" != "$repo"; then
@@ -89,7 +89,7 @@ in
   };
 
   krebs.secret.files.gollum = {
-    path = "${config.krebs.gollum.stateDir}/.ssh/id_ed25519";
+    path = "${config.services.gollum.stateDir}/.ssh/id_ed25519";
     owner = { name = "gollum"; };
     source-path = "${<secrets/gollum.id_ed25519>}";
   };
-- 
cgit v1.2.3