merge the two web wikis

added Backlog label

assigned to @gaba

why here, and not in the documentation repo ?

I rather maintain the links on the documentation repo because they are linked elsewhere. the wiki here only has a couple of pages.

emmapeel commented:

why here, and not in the documentation repo ?

sorry, "here"? which repo are you refering to now?

I rather maintain the link on the documentation repo because they are linked elsewhere. the wiki here only has a couple of pages.

What's the documentation repo?

...

On 2022-06-09 07:29:53, emmapeel (@emmapeel) wrote:

-- Antoine Beaupré torproject.org system administration

The documentation repo is the one you can see at https://gitlab.torproject.org/tpo/web/wiki/-/wikis/home

'here' is on the Web Team wiki

and there is also more web documentation on the tpa wiki: https://gitlab.torproject.org/tpo/tpa/team/-/wikis/howto/lektor

i'm fine with moving that documentation elsewhere, for the record, but we'd probably need to keep that page with a stub pointing at the new location to avoid breaking incoming links.

...

On 2022-06-09 09:18:05, emmapeel (@emmapeel) wrote:

emmapeel commented:

and there is also more web documentation on the tpa wiki: https://gitlab.torproject.org/tpo/tpa/team/-/wikis/howto/lektor

-- Antoine Beaupré torproject.org system administration

The documentation repo is the one you can see at https://gitlab.torproject.org/tpo/web/wiki/-/wikis/home

'here' is on the Web Team wiki

so i guess in that case my answer is that it's standard for teams to have a project named team where their main wiki lives. there's usually not a separate gitlab project for the wiki specifically, exactly because it leads to this sort of confusion.

Yes. I think we should keep it that way until we have a better solution for the wikis. We have main documentation from each team in the /team project in the group.

added Q3 label

added Doing label

removed Backlog label

@gus @kez are you using the repository https://gitlab.torproject.org/tpo/web/wiki for anything?

I started copying the documentation in tpo/web/wiki to tpo/web/team/documentation when I saw this message in the wiki repo

"Please use this wiki documentation as a basis for other Lektor sites, as community, support, tb-manual, styleguide, template, etc."

If we still can move the documentation then I will archive this repo but I will wait for your confirmation that you are not using it for anything else @kez @gus

I'm not using it. But who created that repo was @emmapeel, so she may have some opinions about it.

I'm also not using it.

This repo was originally on each web project, and we decided to have only one version.

I am using it, in the sense that i have linked it everywhere, but i guess 'it is the system' and I accept the merge.

I think preserving those links is important. We could put in redirects to the new pages, or at the very least update the old wiki pages to point to the new wiki pages

I'd love to see if we can do that, in the general case. We have not, AFAIK, made such redirections so far and it seems imperative we are able to do so in the future to deal with such problems.

...

On 2022-09-27 07:10:47, kezzle (@kez) wrote:

I think preserving those links is important. We could put in redirects to the new pages, or at the very least update the old wiki pages to point to the new wiki pages

-- Antoine Beaupré torproject.org system administration

uh. This issue seems to be blocked by the decision of what to do with the links. We may have a new wiki coming and in that case, we can keep this issue in the freezer.

removed Q3 label

added Blocked Icebox labels

removed Doing label

unassigned @gaba

I have been looking at the documentation we have already to figure out where to put the new MacOS local development environment docs, and before I found this issue I was very confused that pages seemed duplicated between the tpo/web/wiki and tpo/web/team project wikis.

So while we wait for GitLab people to remove their heads from their asses and realize that the lack of wiki page redirection is an embarrassing oversight, I added a notice on top of all the pages on tpo/web/wiki to point to the tpo/web/team wiki.

I wonder if it would be worth trying to hijack routes in nginx to fix up redirects ourselves. I suspect GitLab will never find their way out of that figurative hole, so we'll have to cross that bridge anyways...

Maybe something for a separate ticket? I'd be happy to take a dive...

...

On 2022-11-22 16:14:45, Jérôme Charaoui (@lavamind) wrote:

So while we wait for GitLab people to remove their heads from their asses and realize that the lack of wiki page redirection is an embarrassing oversight, I added a notice on top of all the pages on tpo/web/wiki to point to the tpo/web/team wiki.

-- Antoine Beaupré torproject.org system administration

Well in this case specifically, I'm not sure the redirects are really worth it. These old pages are way out of date, full of broken links and likely have not been tested since they were written...

What I would like is for us to restructure the web team wiki using the same layout as the tpa wiki, with howto, doc, services (or websites), policy, roadmap sections, and maybe others. Web-specific pages in the TPA wiki, like the lektor page would be moved over to that wiki.

I'm happy to work on that if we're in agreement.

Honestly, at this point, I wonder if we should not just fold the web wiki inside the TPA one. If we're going to do major refactoring, why not just merge in a single wiki?

...

On 2022-11-22 16:31:38, Jérôme Charaoui (@lavamind) wrote:

Jérôme Charaoui commented on a discussion: #39 (comment 2856346)

Well in this case specifically, I'm not sure the redirects are really worth it. These old pages are way out of date, full of broken links and likely have not been tested since they were written...

What I would like is for us to restructure the web team wiki using the same layout as the tpa wiki, with howto, doc, services (or websites), policy, roadmap sections, and maybe others. Web-specific pages in the TPA wiki, like the lektor page would be moved over to that wiki.

I'm happy to work on that if we're in agreement.

-- Antoine Beaupré torproject.org system administration

I'd be fine with that option, although it would run counter (at least in appearance) to the notion that "the Web team is something separate from TPA" that we seem to be holding onto for reasons that are not fully clear to me.

I think the only reason things are that way are my incapacity at managing both aspects at once, not any deliberate policy decision.

...

On 2022-11-22 17:40:53, Jérôme Charaoui (@lavamind) wrote:

I'd be fine with that option, although it would run counter (at least in appearance) to the notion that "the Web team is something separate from TPA" that we seem to be holding onto for reasons that are not fully clear to me.

-- Antoine Beaupré torproject.org system administration

This issue seems to be blocked by the decision of what to do with the links. We may have a new wiki coming and in that case, we can keep this issue in the freezer.

I'd like to reopen this. Let's fix the wiki duplication at the very least, it's a mess.

I'd say let the links be broken, it's better than having the current ambiguity. I would also say move the wiki to tpo/web/team. We could have a wiki-replica like we have in tpo/tpa/wiki-replica if we really need a separate (git) project.

who wants to pick this up? @kez? @lavamind? otherwise i'll just pick that up myself in a few weeks.

bonus points for hacking at nginx to actually provide a system-level redirection, I think we're going to need that eventually anyway.

i can't take this now, but i'll assign it to myself if i get cycles.

added Backlog label and removed Blocked Icebox labels

mentioned in issue tpo#343 (closed)

mentioned in issue tpo/tpa/team#41119 (closed)

assigned to @anarcat

added Next label and removed Backlog label

This issue has been waiting for information two weeks or more. It needs attention. Please take care of this before the end of 2023-06-09. ~"Needs Information" tickets will be moved to the Icebox after that point.

(Any ticket left in Needs Review, Needs Information, Next, or Doing without activity for 14 days gets such notifications. Make a comment describing the current state of this ticket and remove the Stale label to fix this.)

added Stale label

removed Stale label

This issue has been waiting for information two weeks or more. It needs attention. Please take care of this before the end of 2023-06-27. ~"Needs Information" tickets will be moved to the Icebox after that point.

(Any ticket left in Needs Review, Needs Information, Next, or Doing without activity for 14 days gets such notifications. Make a comment describing the current state of this ticket and remove the Stale label to fix this.)

added Stale label

added Doing label and removed Next label

removed Stale label

I'd like to reopen this. Let's fix the wiki duplication at the very least, it's a mess.

I'd say let the links be broken, it's better than having the current ambiguity. I would also say move the wiki to tpo/web/team. We could have a wiki-replica like we have in tpo/tpa/wiki-replica if we really need a separate (git) project.

this is actually mostly done. @lavamind already added warnings on each page and archived the project. not sure there is much else to do here other than destroying the repository.

i'll look at redirections now.

turns out this is pretty simple, but it needs to be done in two places because of the onion service:

  # redirect duplicate wiki to main one
  location /tpo/web/wiki/-/wikis/ {
    return 301 https://gitlab.torproject.org/tpo/web/team/-/wikis/;
  }

That's it. We could also rewrite individual pages that way, but that would be cumbersome. We could more easily add a bunch of rewrites with a map, see:

https://nginx.org/en/docs/http/ngx_http_map_module.html

example:

https://scribe.rip/@gauravswaroop/nginx-bulk-url-redirect-with-map-47c2cd6ad50a

but for now, this is good enough for this specific ticket.

closed

mentioned in commit tpo/tpa/wiki-replica@a823f81e

merge the two web wikis

Designs

Child items ...

Activity