follow service page renames authored by anarcat's avatar anarcat
...@@ -238,12 +238,12 @@ deploy it to a third-party provider. ...@@ -238,12 +238,12 @@ deploy it to a third-party provider.
## Design and architecture ## Design and architecture
The status site is part of the [static mirror system](howto/static-component) and is built The status site is part of the [static mirror system](service/static-component) and is built
with [cstate](https://github.com/cstate/cstate/), which is a theme for the [Hugo](https://gohugo.io/) static site with [cstate](https://github.com/cstate/cstate/), which is a theme for the [Hugo](https://gohugo.io/) static site
generator. The site is managed in a git repository on the [GitLab](howto/gitlab) generator. The site is managed in a git repository on the [GitLab](service/gitlab)
server and uses [GitLab CI](service/ci) to get built. The server and uses [GitLab CI](service/ci) to get built. The
[static-gitlab-shim service](service/static-gitlab-shim) propagates the builds to the [static [static-gitlab-shim service](service/static-gitlab-shim) propagates the builds to the [static
mirror system](howto/static-component) for high availability. mirror system](service/static-component) for high availability.
See the [static-gitlab-shim service design document](service/static-gitlab-shim#design) for more See the [static-gitlab-shim service design document](service/static-gitlab-shim#design) for more
information. information.
...@@ -272,8 +272,8 @@ in Golang and its templating language. ...@@ -272,8 +272,8 @@ in Golang and its templating language.
## Related services ## Related services
* [static mirror system](howto/static-component) * [static mirror system](service/static-component)
* [GitLab](howto/gitlab) * [GitLab](service/gitlab)
* [GitLab CI](service/ci) * [GitLab CI](service/ci)
* [static-gitlab-shim service](service/static-gitlab-shim) * [static-gitlab-shim service](service/static-gitlab-shim)
...@@ -320,7 +320,7 @@ request. ...@@ -320,7 +320,7 @@ request.
## Logs ## Logs
There are no logs or metrics specific to this service, see the [static There are no logs or metrics specific to this service, see the [static
site service](howto/static-component) for details. site service](service/static-component) for details.
A history of deployments and past version of the code is of course A history of deployments and past version of the code is of course
available in the Git repository history and the GitLab job logs. available in the Git repository history and the GitLab job logs.
...@@ -328,7 +328,7 @@ available in the Git repository history and the GitLab job logs. ...@@ -328,7 +328,7 @@ available in the Git repository history and the GitLab job logs.
## Backups ## Backups
Does not need special backups: backed up as part of the regular [static Does not need special backups: backed up as part of the regular [static
site](howto/static-component) and [git](howto/gitolite) services. site](service/static-component) and [git](service/gitolite) services.
## Other documentation ## Other documentation
...@@ -549,24 +549,24 @@ is still available. ...@@ -549,24 +549,24 @@ is still available.
### Jenkins jobs ### Jenkins jobs
The site used to be built with Jenkins jobs, from a git repository on The site used to be built with Jenkins jobs, from a git repository on
the [git](howto/gitolite) server. This was setup this way because that is how every the [git](service/gitolite) server. This was setup this way because that is how every
other static website was built back then. other static website was built back then.
This involved: This involved:
* a new [static component](howto/static-component) owned by `torwww` (in the * a new [static component](service/static-component) owned by `torwww` (in the
`tor-puppet.git` repository) `tor-puppet.git` repository)
* a new [build script](https://gitlab.torproject.org/tpo/tpa/jenkins-tools/-/blob/e1a8a98b6e73bf10d2c2d89975014a334f388c21/slaves/linux/hugo-website-status) in the [jenkins/tools.git](https://gitlab.torproject.org/tpo/tpa/jenkins-tools/) repository * a new [build script](https://gitlab.torproject.org/tpo/tpa/jenkins-tools/-/blob/e1a8a98b6e73bf10d2c2d89975014a334f388c21/slaves/linux/hugo-website-status) in the [jenkins/tools.git](https://gitlab.torproject.org/tpo/tpa/jenkins-tools/) repository
* a new [build job](https://gitlab.torproject.org/tpo/tpa/jenkins-jobs/-/commit/170fd9879ff0da65670aaa36c20e63c0db1ed039) in the [jenkins/jobs.git](https://gitlab.torproject.org/tpo/tpa/jenkins-jobs/) repository * a new [build job](https://gitlab.torproject.org/tpo/tpa/jenkins-jobs/-/commit/170fd9879ff0da65670aaa36c20e63c0db1ed039) in the [jenkins/jobs.git](https://gitlab.torproject.org/tpo/tpa/jenkins-jobs/) repository
* a [new entry](https://gitlab.torproject.org/tpo/tpa/static-builds/-/commit/b2344aa1d68f4f065764c6f23d14494020b81f86) in the [ssh wrapper](https://gitlab.torproject.org/tpo/tpa/static-builds/-/blob/b2344aa1d68f4f065764c6f23d14494020b81f86/ssh-wrap) in the * a [new entry](https://gitlab.torproject.org/tpo/tpa/static-builds/-/commit/b2344aa1d68f4f065764c6f23d14494020b81f86) in the [ssh wrapper](https://gitlab.torproject.org/tpo/tpa/static-builds/-/blob/b2344aa1d68f4f065764c6f23d14494020b81f86/ssh-wrap) in the
[admin/static-builds.git](https://gitlab.torproject.org/tpo/tpa/static-builds/) repository [admin/static-builds.git](https://gitlab.torproject.org/tpo/tpa/static-builds/) repository
* a new [gitolite](howto/gitolite) repository with hooks to ping the Jenkins server and * a new [gitolite](service/gitolite) repository with hooks to ping the Jenkins server and
mirror to GitLab mirror to GitLab
We also considered using GitLab CI for deployment but (a) GitLab pages We also considered using GitLab CI for deployment but (a) GitLab pages
was not yet setup and (b) it didn't integrate well with the static was not yet setup and (b) it didn't integrate well with the static
mirror system for now. See [the broader discussion of the static site mirror system for now. See [the broader discussion of the static site
system improvements](howto/static-component#proposed-solution). system improvements](service/static-component#proposed-solution).
Both issues have now been fixed thanks to the [static-gitlab-shim Both issues have now been fixed thanks to the [static-gitlab-shim
service](service/static-gitlab-shim). service](service/static-gitlab-shim).