From 538438b1001298de53bf9b543b3a8e383aa8b936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@debian.org>
Date: Thu, 7 Mar 2024 11:12:46 -0500
Subject: [PATCH] document wiki replication fix (Closes: tpo/tpa/team#41547)

---
 service/documentation.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/service/documentation.md b/service/documentation.md
index 4be142e4..7f24c4f5 100644
--- a/service/documentation.md
+++ b/service/documentation.md
@@ -199,7 +199,7 @@ Wiki and use the [repository mirror feature](https://gitlab.torproject.org/help/
 into a separate project.
 
  1. in the Wiki project, head for the **Settings: Access Tokens** page
-    and create a new token with `write_repository` access
+    and create a new Developer token with `write_repository` access
 
  2. optionally, create a new project for the wiki, for example called
     [`wiki-replica`](https://gitlab.torproject.org/tpo/tpa/wiki-replica/). you can also use the same project as the wiki
@@ -252,8 +252,14 @@ this](https://gitlab.com/gitlab-org/gitlab/-/issues/19842). It's also [not possi
 repositories either](https://gitlab.com/gitlab-org/gitlab/-/issues/20754), a compromise would be to [preview the wiki
 home page correctly in repositories](https://gitlab.com/gitlab-org/gitlab/-/issues/432344).
 
-Update: it seems this broken in some recent upgrade, see [issue
-41547](https://gitlab.torproject.org/tpo/tpa/team/-/issues/41547) for details.
+Note that a GitLab upgrade broke this ([issue 41547](https://gitlab.torproject.org/tpo/tpa/team/-/issues/41547)). This was
+fixed by allowing web hooks to talk to the GitLab server directly, in
+the Admin area. In Admin -> Settings -> Network -> Outbound requests:
+
+ * check `Allow requests to the local network from webhooks and integrations`
+ * check `Allow requests to the local network from system hooks`
+ * add `gitlab.torproject.org` to `Local IP addresses and domain names
+   that hooks and integrations can access`
 
 ## Pager playbook
 
-- 
GitLab