follow service page renames authored by anarcat's avatar anarcat
...@@ -21,8 +21,8 @@ TODO: link to documentation on how to build Lektor sites in GitLab CI. ...@@ -21,8 +21,8 @@ TODO: link to documentation on how to build Lektor sites in GitLab CI.
A convenient way to preview website builds and ensure builds are working A convenient way to preview website builds and ensure builds are working
correctly in GitLab CI is to deploy to GitLab Pages. See the correctly in GitLab CI is to deploy to GitLab Pages. See the
instructions on [publishing GitLab pages](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/howto/gitlab/#publishing-gitlab-pages) instructions on [publishing GitLab pages](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/service/gitlab/#publishing-gitlab-pages)
within the [GitLab documentation](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/howto/gitlab/). within the [GitLab documentation](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/service/gitlab/).
When the build stage is verified to work correctly, include the When the build stage is verified to work correctly, include the
`static-shim-deploy.yml` template in `.gitlab-ci.yml` with a snippet `static-shim-deploy.yml` template in `.gitlab-ci.yml` with a snippet
...@@ -200,7 +200,7 @@ the static shim, but the deploy will still fail because the ...@@ -200,7 +200,7 @@ the static shim, but the deploy will still fail because the
static-component configuration does not match and the static-component configuration does not match and the
`static-update-component` step will fail. `static-update-component` step will fail.
To fix this, the [static-component](howto/static-component) entry should be added (or To fix this, the [static-component](service/static-component) entry should be added (or
modified, if it already exists, in modified, if it already exists, in
`modules/staticsync/data/common.yaml`) to point to the shim. This, for `modules/staticsync/data/common.yaml`) to point to the shim. This, for
example, is how research is configured right now: example, is how research is configured right now:
...@@ -237,8 +237,8 @@ previous static source: ...@@ -237,8 +237,8 @@ previous static source:
ssh staticiforme.torproject.org rm -rf /srv/research.torproject.org/ ssh staticiforme.torproject.org rm -rf /srv/research.torproject.org/
Typically, you will also want to [archive the git repository](howto/gitolite#archiving-a-repository) if Typically, you will also want to [archive the git repository](service/gitolite#archiving-a-repository) if
it hasn't already been [migrated to GitLab](howto/gitlab#how-to-migrate-a-git-repository-from-legacy-to-gitlab). it hasn't already been [migrated to GitLab](service/gitlab#how-to-migrate-a-git-repository-from-legacy-to-gitlab).
## Building a Hugo site ## Building a Hugo site
...@@ -383,7 +383,7 @@ This is how to convert a given website from Jenkins to GitLab CI: ...@@ -383,7 +383,7 @@ This is how to convert a given website from Jenkins to GitLab CI:
* [ ] [deploy the SSH key and static site in Puppet](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/service/static-shim#adding-a-new-static-site-shim-in-puppet) * [ ] [deploy the SSH key and static site in Puppet](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/service/static-shim#adding-a-new-static-site-shim-in-puppet)
* [ ] run the deploy-static job, make sure the site still works and * [ ] run the deploy-static job, make sure the site still works and
was deployed properly (`curl -sI https://example.torproject.org/ | grep -i Last-Modified`) was deployed properly (`curl -sI https://example.torproject.org/ | grep -i Last-Modified`)
* [ ] [archive the repo on gitolite](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/howto/gitlab/#how-to-migrate-a-git-repository-from-legacy-to-gitlab) * [ ] [archive the repo on gitolite](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/service/gitlab/#how-to-migrate-a-git-repository-from-legacy-to-gitlab)
* [ ] remove the old site on staticiforme * [ ] remove the old site on staticiforme
* [ ] [fully retire the Jenkins jobs](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/service/jenkins#removing-a-job) * [ ] [fully retire the Jenkins jobs](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/service/jenkins#removing-a-job)
* [ ] notify users about the migration * [ ] notify users about the migration
...@@ -578,7 +578,7 @@ projects can override: ...@@ -578,7 +578,7 @@ projects can override:
* `SUBDIR`: (optional) Directory containing the build artifacts, by * `SUBDIR`: (optional) Directory containing the build artifacts, by
default this is set to `public/`. default this is set to `public/`.
[static mirror system]: howto/static-component [static mirror system]: service/static-component
[Web group]: https://gitlab.torproject.org/tpo/web [Web group]: https://gitlab.torproject.org/tpo/web
### Storage ### Storage
... ...
......