From 50d59f41df0eaaabd9ff9b5c437ae807f2d89460 Mon Sep 17 00:00:00 2001 From: Bussi Andrea Date: Mon, 11 Apr 2022 00:20:40 +0200 Subject: [PATCH] Fix links still pointing to old documentation site. As mentioned in a comment on issue #4. --- modules/developer_guide/pages/security_policy.adoc | 2 +- modules/sysadmin_guide/pages/anitya.adoc | 4 ++-- modules/sysadmin_guide/pages/ansible.adoc | 3 +-- modules/sysadmin_guide/pages/hotness.adoc | 4 ++-- modules/sysadmin_guide/pages/index.adoc | 5 ++--- modules/sysadmin_guide/pages/requestforresources.adoc | 4 ++-- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/modules/developer_guide/pages/security_policy.adoc b/modules/developer_guide/pages/security_policy.adoc index 358b414..bf44545 100644 --- a/modules/developer_guide/pages/security_policy.adoc +++ b/modules/developer_guide/pages/security_policy.adoc @@ -30,7 +30,7 @@ runs MAY be exempted from this check. The application MUST use OpenID Connect to authenticate users. The application MUST use an -https://fedora-infra-docs.readthedocs.io/en/latest/dev-guide/auth.html#libraries[approved +xref:developer_guide:auth.adoc#_libraries[approved authentication library]. If the application supports an API, it SHOULD accept OpenID Connect Bearer tokens, which MUST be verified by the approved authentication library. The application MUST NOT accept any diff --git a/modules/sysadmin_guide/pages/anitya.adoc b/modules/sysadmin_guide/pages/anitya.adoc index 65e8814..1ec3c6b 100644 --- a/modules/sysadmin_guide/pages/anitya.adoc +++ b/modules/sysadmin_guide/pages/anitya.adoc @@ -86,9 +86,9 @@ Anitya on production. ==== Configuration To deploy the new configuration, you need -https://fedora-infra-docs.readthedocs.io/en/latest/sysadmin-guide/sops/sshaccess.html[ssh +xref:sshaccess.adoc[ssh access] to batcave01.iad2.fedoraproject.org and -https://fedora-infra-docs.readthedocs.io/en/latest/sysadmin-guide/sops/ansible.html[permissions +xref:ansible.adoc[permissions to run the Ansible playbook]. All the following commands should be run from batcave01. diff --git a/modules/sysadmin_guide/pages/ansible.adoc b/modules/sysadmin_guide/pages/ansible.adoc index 7b9a719..5fad7a1 100644 --- a/modules/sysadmin_guide/pages/ansible.adoc +++ b/modules/sysadmin_guide/pages/ansible.adoc @@ -235,8 +235,7 @@ Templates use the jinja2 syntax. == rdiff-backups -see: -https://fedora-infra-docs.readthedocs.io/en/latest/sysadmin-guide/sops/rdiff-backup.html +See: xref:rdiff-backup.adoc[] == Additional Reading/Resources diff --git a/modules/sysadmin_guide/pages/hotness.adoc b/modules/sysadmin_guide/pages/hotness.adoc index 1bfbce5..96c1492 100644 --- a/modules/sysadmin_guide/pages/hotness.adoc +++ b/modules/sysadmin_guide/pages/hotness.adoc @@ -66,9 +66,9 @@ the-new-hotness on production. ==== Configuration To deploy the new configuration, you need -https://fedora-infra-docs.readthedocs.io/en/latest/sysadmin-guide/sops/sshaccess.html[ssh +xref:sshaccess.adoc[ssh access] to _batcave01.iad2.fedoraproject.org_ and -https://fedora-infra-docs.readthedocs.io/en/latest/sysadmin-guide/sops/ansible.html[permissions +xref:ansible.adoc[permissions to run the Ansible playbook]. All the following commands should be run from batcave01. diff --git a/modules/sysadmin_guide/pages/index.adoc b/modules/sysadmin_guide/pages/index.adoc index 8cba07e..41665d0 100644 --- a/modules/sysadmin_guide/pages/index.adoc +++ b/modules/sysadmin_guide/pages/index.adoc @@ -5,7 +5,7 @@ Welcome to The Fedora Infrastructure system administration guide. == Getting Started If you haven't already, you should complete the general -https://fedora-infra-docs.readthedocs.io/en/latest/index.html#getting-started[Getting Started] guide. +xref:developer_guide:getting-started.adoc[Getting Started] guide. Once you've completed that, you're ready to get involved in the https://accounts.fedoraproject.org/group/fi-apprentice/[Fedora @@ -68,5 +68,4 @@ infrastructure ticket you are working on. It will then be reviewed. Below is a table of contents containing all the standard operating procedures for Fedora Infrastructure applications. For information on how to write a new standard operating procedure, consult the guide on -https://fedora-infra-docs.readthedocs.io/en/latest/dev-guide/sops.html#develop-sops[Developing -Standard Operating Procedures]. +xref:developer_guide:sops.adoc[Developing Standard Operating Procedures]. diff --git a/modules/sysadmin_guide/pages/requestforresources.adoc b/modules/sysadmin_guide/pages/requestforresources.adoc index abfd744..bddf1f2 100644 --- a/modules/sysadmin_guide/pages/requestforresources.adoc +++ b/modules/sysadmin_guide/pages/requestforresources.adoc @@ -90,7 +90,7 @@ infrastucture list explaining the testing done and inviting comment. Also, the security officer should be informed that a new service will need a review in the near future. In the request for the security audit, please add the results of self-evaluation of the -https://fedora-infra-docs.readthedocs.io/en/latest/dev-guide/security_policy.html[Application +xref:developer_guide:security_policy.adoc[Application Security Policy]. Any deviations from the policy _must_ be noted in the request for audit. @@ -105,7 +105,7 @@ the resource would be best deployed should be determined. SOP? A troubleshooting SOP? Any other tasks that might need to be done to the instance when those who know it well are not available? * MUST perform self-evaluation of the -https://fedora-infra-docs.readthedocs.io/en/latest/dev-guide/security_policy.html[Application +xref:developer_guide:security_policy.adoc[Application Security Policy]. * MUST tag in the security officer in the ticket so an audit can be scheduled, including the results of the Security Policy evaluation.