Restructure the repo for consistency

Signed-off-by: Michael Winters <fedora@mwinters.net>

modules/ROOT/nav.adoc

@@ -1,22 +1,22 @@
-* xref:overview.adoc[Fedora Infrastructure]
-** xref:day_to_day_fedora.adoc[Working with Fedora Infrastructure]
-** xref:join.adoc[Join the team]
-*** xref:gettingstarted.adoc[Getting Started with Infrastructure]
-*** xref:apprentice.adoc[Infrastructure Apprentice Progam]
-** xref:map_critical_services.adoc[Map of critical services]
-** xref:services.adoc[List of our services]
-*** xref:services.adoc#_accounts[Account management]
-*** xref:services.adoc#_community[Community apps]
-*** xref:services.adoc#_content_documentation[Content & documentation]
-*** xref:services.adoc#_coordination[Coordination]
-*** xref:services.adoc#_packaging[Packager tools]
-*** xref:services.adoc#_qa[QA tools]
-*** xref:services.adoc#_misc[Miscellaneous]
+* xref:infra-overview.adoc[Fedora Infrastructure]
+
+** xref:day_to_day_fedora.adoc[Working with us]
 *** xref:sle.adoc[SLE]
-**** xref:sle_services.adoc[SLE of the services]
-** xref:communishift.adoc[Communishift]
-** xref:developer_guide:index.adoc[Developer Guide]
-*** xref:developer_guide:getting-started.adoc[Getting Started]
+
+** xref:join_guide:index.adoc[Join the team!]
+*** xref:sysadmin_guide:orientation.adoc[Orientation for Sysadmin Guide]
+*** xref:join_guide:apprentice.adoc[Infrastructure Apprentice Program]
+
+** xref:sysadmin_guide:index.adoc[Infrastructure Reference]
+*** xref:sysadmin_guide:index.adoc#_standard_operating_procedures[Standard Operating Procedures]
+*** xref:sysadmin_guide:index.adoc#_howtos[HOWTOs]
+*** xref:sle_services.adoc[SLE of the services]
+*** xref:map_critical_services.adoc[Map of critical services]
+*** xref:services.adoc[List of our services]
+*** xref:communishift.adoc[Communishift]
+
+** xref:developer_guide:index.adoc[Application Development Guide]
+*** xref:developer_guide:getting-started.adoc[Getting Started With Development]
 *** xref:developer_guide:dev-environment.adoc[Development Environment]
 *** xref:developer_guide:documentation.adoc[Documentation]
 *** xref:developer_guide:code-style.adoc[Code Style]
@@ -30,11 +30,11 @@
 *** xref:developer_guide:source_control.adoc[Source Control]
 *** xref:developer_guide:openshift.adoc[Openshift]
 *** xref:developer_guide:security_policy.adoc[Fedora Infrastructure Application Security Policy]
-** xref:sysadmin_guide:index.adoc[Sysadmin Guide]
-*** xref:sysadmin_guide:orientation.adoc[Orientation for Sysadmin Guide]
-*** xref:sysadmin_guide:index.adoc#_standard_operating_procedures[Standard Operation Procedures]
-*** xref:sysadmin_guide:index.adoc#_howtos[HOWTOs]
+
+
+
 * xref:release_guide:index.adoc[Release Engineering]
+
 ** xref:release_guide:philosophy.adoc[Philosophy]
 ** xref:release_guide:release_process.adoc[Release Process]
 *** xref:release_guide:sop_mass_rebuild.adoc[Mass Rebuild]
@@ -54,6 +54,7 @@
 *** xref:release_guide:sop_post-release_cleanup.adoc[Post-Release Cleanup]
 *** xref:release_guide:sop_release_eol.adoc[End Of Life]
 *** xref:release_guide:sop_epel_minor_eol.adoc[EPEL Minor Version End of Life]
+
 ** xref:releng_misc_guide:index.adoc[Miscellaneous SOPs]
 *** xref:releng_misc_guide:sop_unretire.adoc[Unretire a Package]
 *** xref:releng_misc_guide:sop_package_blocking.adoc[Block a Package]

modules/ROOT/pages/day_to_day_fedora.adoc

@@ -80,7 +80,20 @@ Meetings are held on https://chat.fedoraproject.org/[Matrix], regular meetings i
 
 === Regular meeting
 
-This meeting is held every *Thursday* at *15:00 UTC*.
+This meeting is held every *Thursday* at *08:00 US Pacific Time*. You can use the following shell snippet to convert this to your local time:
+
+[source,bash]
+----
+pdx2local() {
+    local PDX_TIME="${1:-now}"
+    local EPOCH=$(TZ=America/Los_Angeles date -d "$PDX_TIME" +%s)
+    date -d @$EPOCH +"%Y-%m-%d %H:%M:%S %Z"
+}
+
+pdx2local now
+pdx2local "September 23, 2025 08:00"
+----
+
 Meetings will typically be an hour in length but can end earlier if discussions related to agenda items end early.
 
 If you have an item for the agenda, please join the meeting and let us know at the start. We will call on you once we reach that point in the discussion.
@@ -93,9 +106,9 @@ This meeting can be a *maximally* 30 minutes long and the infrastructure team us
 === Meeting logs
 
 Every meeting is logged by our friend meetbot, you can search through the logs on https://meetbot.fedoraproject.org/.
-  
+
   * search for *_infrastructure_* for regular meeting logs
-  
+
   * search for *_fedora infrastructure ops daily standup_* for the standup meeting logs
 
 == Decommissioned: "Oncall" Role in Our Team

modules/ROOT/pages/index.adoc

@@ -1,11 +1,19 @@
 :experimental:
 = Fedora Infrastructure and Release Engineering
 
-Fedora infrastructure and Release Engineering are the teams of dedicated volunteers and
-professionals maintaining the servers and some of the services used to build
-Fedora as well as enable its community.
+The Fedora Infrastructure team and Release Engineering team are composed of
+dedicated volunteers and professionals who maintain the servers and services used
+to build Fedora and enable its community. We're located all over the globe and
+communicate primarily by Matrix and e-mail.
+
+There are several different areas of work which fall under the term "Fedora
+Infrastructure". For details about our team structure, see: <<team_structure>>.
+
+To contact us about work tickets or production issues, see:
+xref:day_to_day_fedora.adoc[Working with us].
+
+For all other contact, see: xref:infra-overview.adoc[Fedora Infrastructure Overview].
 
-We're located all over the globe and communicate primarily by Matrix and e-mail.
 
 == Officers
 
@@ -40,43 +48,41 @@ Council. This basically means that we'll try to do whatever we can to fill needs
 and fix things but if we refuse for whatever reason, the final decision can be
 made by the Fedora Project Council. Such decisions, however, are rare.
 
-== "Mainers"
 
-The https://accounts.fedoraproject.org/group/sysadmin-main/[sysadmin-main]
-group has ‘root’ access to nearly everything. They can assist with any request
-regarding Fedora infrastructure.
+== Team Structure [[team_structure]]
+"Fedora Infrastructure" is an umbrella term which covers three primary work
+areas:
 
-People are added to this group after being nominated by an existing member and
-approved by consensus. This nomination usually takes place after the person has
-been around in the community for some time doing good work in general and also
-have completed some larger ‘project’ in fedora infrastructure showing that they
-can manage a complex deployment.  They have proven their dedication,
-trustworthiness, and ability.
+* "Fedora Infrastructure" -- the term.  (You are here.)
+** "Fedora Infrastructure" -- the team
+*** "Applications and Web Development" -- used to be their own team but now under "Fedora
+    Infrastructure" team.
+** "Release Engineering"
 
-== Communicating
+=== "Fedora Infrastructure" team (Core Infrastructure)
+This group runs servers, tends to databases, and generally keeps hardware humming.  This
+is also the primary contact point for any production issues with Fedora applications
+(Fedocal, FMN, etc).
 
-The Infrastructure Team coordinates their activities using a variety of tools.
-Our primary methods of communication are weekly matrix meetings, the Matrix room
-#admin:fedoraproject.org and the discussion.fedoraproject.org with the #infra-team tag.
+This team was previously called "Fedora Infrastructure" before everyone became one big
+happy family, and it's still called that, so it's slightly confusing!
 
-Application development efforts take place in the #apps:fedoraproject.org Matrix room,
-and system administration related efforts take place in the #noc:fedoraproject.org
-Matrix channel.
+To contact this team with a request or questions, see: xref:day_to_day_fedora.adoc[Working
+with us].
 
-=== Meetings
+For information about contributing to this work, see xref:join_guide:index.adoc[Join
+the Team] for an orientation and instructions, and the
+xref:sysadmin_guide:index.adoc[Sysadmin Reference] for general documentation.
 
-We also hold weekly meetings in #meeting-3:fedoraproject.org each Thursday at 16:00 UTC.
-See the UTC Howto for instructions to convert UTC to your local time.
+=== Applications and Websites
+Fedora creates and runs many different applications to support our operations and solve
+our unique problems.  In the past, the application developers lived under a separate team
+but now this is technically all under the core Infrastructure team.
 
-See the meetings page for details and historical archives.
+For orientation around our application development practices, see the
+xref:developer_guide:index.adoc[Application Developer Guide].
 
-=== Mailing list
+=== Release Engineering (aka "Releng")
+This team is responsible for producing new releases of Fedora Linux.
 
-The mailing list of the Fedora Infrastructure Project is:
-https://lists.fedoraproject.org/admin/lists/infrastructure@lists.fedoraproject.org/
-
-The archives are available at:
-https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedoraproject.org/
-
-We are in the process of moving much of the discussion that used to take place
-there over to discussion.fedoraproject.org with the #infra-team tag.
+For more details, see: xref:release_guide:index.adoc[Release Engineering]

modules/ROOT/pages/infra-overview.adoc

@@ -0,0 +1,55 @@
+= Overview of Fedora Infrastructure
+
+== "Mainers"
+
+The https://accounts.fedoraproject.org/group/sysadmin-main/[sysadmin-main]
+group has ‘root’ access to nearly everything. They can assist with any request
+regarding Fedora infrastructure.
+
+People are added to this group after being nominated by an existing member and
+approved by consensus. This nomination usually takes place after the person has
+been around in the community for some time doing good work in general and also
+have completed some larger project in Fedora infrastructure showing that they
+can manage a complex deployment.  They have proven their dedication,
+trustworthiness, and ability.
+
+== Communicating
+
+The Infrastructure Team coordinates their activities using a variety of tools.
+Our primary methods of communication are weekly matrix meetings, the Matrix room
+#admin:fedoraproject.org and the discussion.fedoraproject.org with the
+#infrastructure-team tag.
+
+Application development efforts take place in the #apps:fedoraproject.org Matrix room,
+and system administration related efforts take place in the #noc:fedoraproject.org
+Matrix channel.
+
+=== Meetings
+
+We also hold weekly meetings in `#meeting:fedoraproject.org` each Thursday at
+USA Pacific Time. You can run this shell snippet to convert to your local time:
+
+[source,bash]
+----
+pdx2local() {
+    local PDX_TIME="${1:-now}"
+    local EPOCH=$(TZ=America/Los_Angeles date -d "$PDX_TIME" +%s)
+    date -d @$EPOCH +"%Y-%m-%d %H:%M:%S %Z"
+}
+
+pdx2local now
+pdx2local "September 23, 2025 08:00"
+----
+
+See the meetings page for details and historical archives.
+
+=== Mailing list
+
+The mailing list of the Fedora Infrastructure Project is:
+https://lists.fedoraproject.org/admin/lists/infrastructure@lists.fedoraproject.org/
+
+The archives are available at:
+https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedoraproject.org/
+
+We are in the process of moving much of the discussion that used to take place
+there over to discussion.fedoraproject.org with the #infrastructure-team tag.

modules/ROOT/pages/join.adoc

@@ -1,12 +0,0 @@
-= Join the Fedora Infrastructure
-
-Fedora is known for creating and using new technologies. The Infrastructure
-team helps build many of these new technologies and uses many of them on a
-regular basis. We are always interested in discussing these technologies
-from an academic and theoretical perspective.
-
-If you're ready to work with the Fedora Infrastructure team we're looking
-for smart, dedicated system administrators and developers to help maintain
-our systems and write code. The Fedora Infrastructure team is a perfect way
-to give back to the community! So what are you waiting for? Take a look at
-our https://fedoraproject.org/wiki/Infrastructure/GettingStarted[Getting Started Page]!

modules/ROOT/pages/overview.adoc

@@ -1,20 +0,0 @@
-= Overview of the Fedora Infrastructure
-
-== Architecture
-
-* xref:map_critical_services.adoc[Map of critical services]
-* xref:services.adoc[List of our services]
-
-== Tooling
-
-Most of the tooling we use in Fedora infrastructure is described in
-xref:developer_guide:index.adoc[Developer Guide]. Above that we also use Ansible
-to maintain our https://forge.fedoraproject.org/infra/ansible[ansible repository].
-
-== Good Practices
-
-See xref:developer_guide:index.adoc[Developer Guide] for good practices regarding development work
-for Fedora Infrastructure.
-
-And see xref:sysadmin_guide:index.adoc[Sysadmin Guide] for good practices regarding sysadmin work
-for Fedora Infrastructure.

modules/ROOT/pages/sle_services.adoc

@@ -1,6 +1,6 @@
 :experimental:
 :toc:
-= Services SLE
+= Services SLEs (Service Level Expectations)
 
 Here is the list of our services per SLE level. For memory these levels are
 presented in our xref:sle.adoc[SLE Documentation].

modules/howtos/pages/add_external_hardware_to_vpn.adoc

@@ -23,10 +23,9 @@ Don't forget to update the serial before saving.
 . When the above edits are done follow the instructions in the DNS sysadmin sop
 about signing and pushing new dns chnages.
 
-. <<infra:sysadmin_guide:dns.adoc#>>
+. <<infra:sysadmin_sops:dns.adoc#>>
 
 . Finally in the Fedora Infra Ansible repo add a new file
 **roles/openvpn/server/files/ccd/*<server_name>*** with the new 192.168.*.* address.
 View one of the existing files in the repo for a sample of formatting.
 This change will be run when the server is provisioned.
-

modules/howtos/pages/fix_robosignatory.adoc

@@ -28,7 +28,7 @@ systemd-tty-ask-password-agent
 ----
 
 . Check the status of the signing-vault
-.. Log into `sign-vault01.{stg}.rdu3.fedoraproject.org`
+.. Log into `sign-vault01.\{stg}.rdu3.fedoraproject.org`
 .. Check the status of sigul server:
 +
 ----

modules/join_guide/pages/index.adoc

@@ -1,122 +1,120 @@
-= Getting Started with Infrastructure
-
-== Help Wanted!
-
-We're always looking for dedicated and energetic people to join the fun
-times in the Fedora Infrastructure team. What fun stuff will you do to
-support and grow the Fedora community?
-
-* You will help design and implement highly available and fault-tolerant
-systems
-* Fix system issues for grateful Fedora developers
-* Maintain the servers that make the Fedora Project possible
-* Create and maintain custom tools and applications to automate systems
-maintenance
-* Create and maintain tools and applications to enhance and grow the
-Fedora community
-
-The skills you should possess or be willing to learn to do this work
-include:
-
-* Being polite
-* Being patient
-* How to help fellow hackers
-* How to write systems administration scripts
-* How to write web applications
-** We primarily use Python, SQL, and associated technologies
-** Other equivalent technologies are welcome
-** We can especially use skills in this area or folks that are willing
-to learn
-* How the Fedora Project works "behind the scenes"
-
-It would be great if
-
-* You have previous systems admin experience
-* Have access to your own testing machines
-** Our resources are limited, especially for testing!
-* Work in other areas of Fedora like packaging or documentation
-
-== Getting Started
-
-See below for a list of steps or head down to the xref:gettingstarted.adoc#_quickstart[Quick
-Start] section if you just want to submit a single change or fix.
-
-== First steps
-
-* First you will need to read through and understand
-link:https://docs.fedoraproject.org/en-US/fedora-join/contribute/successful-contributor/[how to be a successful contributor].
-* Next you will need to create a link:https://docs.fedoraproject.org/en-US/fedora-accounts/user/[Fedora Account]:
-** This account will be used for just about everything you do as a
-member of the Fedora Community
-** You will need it to sign the link:https://fedoraproject.org/wiki/Legal:Fedora_Project_Contributor_Agreement[FPCA]
-which is required to contribute to the Fedora Community
-** You will need it to login to various systems associated with the Infrastructure Group
-** You will need it to upload code changes, make changes to this wiki and etc.
-* After you have created your account and signed the FPCA, you should then subscribe to the
-link:https://lists.fedoraproject.org/admin/lists/infrastructure.lists.fedoraproject.org/[Fedora Infrastructure Mailing List]
-and you should check the link:https://discussion.fedoraproject.org/tags/c/project/7/infrastructure-team[Infrastructure tag at Fedora Discussion].
-** This is the mailing list you will use to send your introduction email to the Fedora
-Infrastructure Team as well as communicate with other team members on a regular basis.
-** When you are ready to send a [introduction to the group](mailto:infrastructure@lists.fedoraproject.org),
-** your subject should be 'Meeting Agenda Item: Introduction _Your Name_'.
-The message body should include:
-*** Your Matrix handle
-**** link:https://fedoramagazine.org/join-the-conversation/[Fedora's Matrix instance at chat.fedoraproject.org]
-*** What skills you have to offer and which you would like to learn. This can include...
-**** Programming languages you are familiar with or have used
-**** Systems administration skills, certifications, and technologies you have or have used (or wish to learn)
-**** Any associations you have (e.g. local hackerspace/makerspace, Linux User Groups, employer, etc.)
-** What you want to learn
-*** What you would like to work on and quite possibly which link:https://forge.fedoraproject.org/infra/tickets/issues[outstanding issues] you would like to help resolve
-** Any initial questions you have for the team
-*** Look at the link:https://docs.fedoraproject.org/en-US/infra/sysadmin_guide/[Fedora Infrastructure Best Practices] document
-*** Be patient, as sometimes folks are busy and might not reply to your email quickly. You may get a faster response on Matrix.
-*** join the #admin:fedoraproject.org channel on matrix and attend the next matrix meeting.
-*** Watch link:http://fedoramagazine.org/?p=642[some videos] intended to introduce new contributors to
-the team.
-
-== What is next?
-
-After you've completed the steps outlined in the xref:gettingstarted.adoc#_first_steps[First steps
-section] you should:
-
-* Regularly attend the link:https://fedoraproject.org/wiki/Infrastructure/Meetings[Weekly Meetings]
-on Matrix and be sure to introduce yourself the first time you attend. There is a section at the
-start of the meeting where you can give a short introduction of yourself to the rest of the team.
-* Take some time to learn about the link:[services]https://docs.fedoraproject.org/en-US/infra/map_critical_services/
-the Fedora Infrastructure Group develops, deploys and maintains.
-* Ask about joining the xref:apprentice.adoc[Fedora Infrastructure Apprentice] (fi-apprentice) group.
-* Read up on link:https://docs.fedoraproject.org/en-US/infra/sysadmin_guide/#_standard_operating_procedures[SOPs]
-you find interesting. These are a good point of reference for hosts related to an app. They give an overview
-of how things work for that app.
-* Idle in matrix and chime in with questions or offers to help when you see an interesting problem being discussed.
-
-If you don't have the time to be involved on a regular basis at this point, please feel free to watch over
-things and report bugs and RFEs as you see fit. Showing interest now is a great way to make it easier to
-join the team's activities later!
-
-== QuickStart
-
-* If you just want to make a single change or fix a single issue, then
-just jump right in at attach a patch for it to the existing issue, or
-post a patch to the mailing list. Note that we still would like you to
-create an account and sign the FPCA so we can properly license your
-contributions.
-
-== How the team works
-
-The Fedora Infrastructure Group consists of volunteers and Red Hat employees. Our preferred
-method of communication is matrix though we also heavily use the Fedora Mailing
-List. 
-We try to be as transparent as possible and default to open.
-
-New members are encouraged to join the list, use the discourse, Matrix and attend meetings.
-
-Asking questions (in any of our public areas: Matrix, lists, meetings) is encouraged. Unless there's an outage
-or people are busy we are happy to try and explain how something is setup or works.
-
-The team is a meritocracy, which means those people who solve issues and do work are given more privileges over time. In
-general don't worry about the access and privileges, instead, try and solve problems and prove that you will be around
-and reliable over time and you will be setup with what you need to do that work. Since we are a small team we don't
-usually have the cycles to do full time mentoring of new contributors, so you will be expected to be a "self-starter"
-and able to gather information on your own. We are happy to answer questions when you get stuck. 
+= Getting Started with Infrastructure
+
+== Help Wanted!
+
+We're always looking for dedicated and energetic people to join the fun
+times in the Fedora Infrastructure team. What fun stuff will you do to
+support and grow the Fedora community?
+
+* You will help design and implement highly available and fault-tolerant
+systems
+* Fix system issues for grateful Fedora developers
+* Maintain the servers that make the Fedora Project possible
+* Create and maintain custom tools and applications to automate systems
+maintenance
+* Create and maintain tools and applications to enhance and grow the
+Fedora community
+
+The skills you should possess or be willing to learn to do this work
+include:
+
+* Being polite
+* Being patient
+* How to help fellow hackers
+* How to write systems administration scripts
+* How to write web applications
+** We primarily use Python, SQL, and associated technologies
+** Other equivalent technologies are welcome
+** We can especially use skills in this area or folks that are willing
+to learn
+* How the Fedora Project works "behind the scenes"
+
+It would be great if
+
+* You have previous systems admin experience
+* Have access to your own testing machines
+** Our resources are limited, especially for testing!
+* Work in other areas of Fedora like packaging or documentation
+
+== Getting Started
+
+See below for a list of steps or head down to the <<quickstart>> section if you
+just want to submit a single change or fix.
+
+== First steps [[first_steps]]
+
+* First you will need to read through and understand
+link:https://docs.fedoraproject.org/en-US/fedora-join/contribute/successful-contributor/[how to be a successful contributor].
+* Next you will need to create a link:https://docs.fedoraproject.org/en-US/fedora-accounts/user/[Fedora Account]:
+** This account will be used for just about everything you do as a
+member of the Fedora Community
+** You will need it to sign the link:https://fedoraproject.org/wiki/Legal:Fedora_Project_Contributor_Agreement[FPCA]
+which is required to contribute to the Fedora Community
+** You will need it to login to various systems associated with the Infrastructure Group
+** You will need it to upload code changes, make changes to this wiki and etc.
+* After you have created your account and signed the FPCA, you should then subscribe to the
+link:https://lists.fedoraproject.org/admin/lists/infrastructure.lists.fedoraproject.org/[Fedora Infrastructure Mailing List]
+and you should check the link:https://discussion.fedoraproject.org/tags/c/project/7/infrastructure-team[`#infrastructure-team` tag at Fedora Discussion].
+** This is the mailing list you will use to send your introduction email to the Fedora
+Infrastructure Team as well as communicate with other team members on a regular basis.
+** When you are ready to send a [introduction to the group](mailto:infrastructure@lists.fedoraproject.org),
+** your subject should be 'Meeting Agenda Item: Introduction _Your Name_'.
+The message body should include:
+*** Your Matrix handle
+**** link:https://fedoramagazine.org/join-the-conversation/[Fedora's Matrix instance at chat.fedoraproject.org]
+*** What skills you have to offer and which you would like to learn. This can include...
+**** Programming languages you are familiar with or have used
+**** Systems administration skills, certifications, and technologies you have or have used (or wish to learn)
+**** Any associations you have (e.g. local hackerspace/makerspace, Linux User Groups, employer, etc.)
+** What you want to learn
+*** What you would like to work on and quite possibly which link:https://forge.fedoraproject.org/infra/tickets/issues[outstanding issues] you would like to help resolve
+** Any initial questions you have for the team
+*** Look at the link:https://docs.fedoraproject.org/en-US/infra/sysadmin_guide/[Fedora Infrastructure Best Practices] document
+*** Be patient, as sometimes folks are busy and might not reply to your email quickly. You may get a faster response on Matrix.
+*** join the #admin:fedoraproject.org channel on matrix and attend the next matrix meeting.
+*** Watch link:http://fedoramagazine.org/?p=642[some videos] intended to introduce new contributors to
+the team.
+
+== What is next?
+
+After you've completed the steps outlined in the <<first_steps>> section you should:
+
+* Regularly attend the link:https://fedoraproject.org/wiki/Infrastructure/Meetings[Weekly Meetings]
+on Matrix and be sure to introduce yourself the first time you attend. There is a section at the
+start of the meeting where you can give a short introduction of yourself to the rest of the team.
+* Take some time to learn about the xref:ROOT:map_critical_services.adoc[services]
+the Fedora Infrastructure Group develops, deploys and maintains.
+* Ask about joining the xref:apprentice.adoc[Fedora Infrastructure Apprentice] (fi-apprentice) group.
+* Read up on link:https://docs.fedoraproject.org/en-US/infra/sysadmin_guide/#_standard_operating_procedures[SOPs]
+you find interesting. These are a good point of reference for hosts related to an app. They give an overview
+of how things work for that app.
+* Idle in matrix and chime in with questions or offers to help when you see an interesting problem being discussed.
+
+If you don't have the time to be involved on a regular basis at this point, please feel free to watch over
+things and report bugs and RFEs as you see fit. Showing interest now is a great way to make it easier to
+join the team's activities later!
+
+== QuickStart [[quickstart]]
+
+* If you just want to make a single change or fix a single issue, then
+just jump right in at attach a patch for it to the existing issue, or
+post a patch to the mailing list. Note that we still would like you to
+create an account and sign the FPCA so we can properly license your
+contributions.
+
+== How the team works
+
+The Fedora Infrastructure Group consists of volunteers and Red Hat employees. Our preferred method
+of communication is Matrix, though we also heavily use Discussion (our forum), and we still have the
+Fedora Mailing List. We try to be as transparent as possible and default to open.
+
+New members are encouraged to join the list, use the discourse, Matrix and attend meetings.
+
+Asking questions (in any of our public areas: Matrix, lists, meetings) is encouraged. Unless there's an outage
+or people are busy we are happy to try and explain how something is setup or works.
+
+The team is a meritocracy, which means those people who solve issues and do work are given more privileges over time. In
+general don't worry about the access and privileges, instead, try and solve problems and prove that you will be around
+and reliable over time and you will be setup with what you need to do that work. Since we are a small team we don't
+usually have the cycles to do full time mentoring of new contributors, so you will be expected to be a "self-starter"
+and able to gather information on your own. We are happy to answer questions when you get stuck.

modules/release_guide/pages/overview.adoc

@@ -130,7 +130,7 @@ privately.
 
 BitTorrent is currently served by http://torrent.fedoraproject.org.
 Images are added to the system via this
-https://infrastructure.fedoraproject.org/infra/docs/docs/sysadmin-guide/sops/torrentrelease.rst[Standard
+https://infrastructure.fedoraproject.org/infra/docs/docs/sysadmin-guide/sysadmin_sops:torrentrelease.rst[Standard
 Operating Procedure].
 
 == Acknowledgements

modules/release_guide/pages/sop_mass_branching.adoc

@@ -72,7 +72,7 @@ You should get a list of all of the source packages by name.
 sudo -su robosignatory
 passphrase=$(systemd-ask-password "Please enter passphrase for 'autosign' key: ")
 (enter the autosign passphrase)
-keyctl add user "sigul:autosign" "${passphrase}" @s
+keyctl add user "sigul:autosign" "$\{passphrase}" @s
 for i in `cat unsigned-packages`
 do
   echo $i;
@@ -197,7 +197,7 @@ and updating the Rawhide branch with new release values.
 * Location: `release-process/mass-branching/fedora/get_active_packages.sh`
 - Update `OUTPUT_FINAL` variable in script to `components_f{rawhide}.txt`.
 
-=== Ansible 
+=== Ansible
 
 * Repository: https://forge.fedoraproject.org/infra/ansible
 
@@ -258,7 +258,7 @@ with the correct `bug_fixes` and `security_fixes` dates (EOL date in the https:/
 * On `rawhide` branch update relevant lines:
 ** `%global rawhide_release {rawhide_next}`
 ** `Version: {rawhide_next}`
-** `Release:        0.1%{?eln:.eln%{eln}}`
+** `Release:        0.1%{?eln:.eln%\{eln}}`
 ** Add a `%changelog` entry:
 
 [source,subs="attributes"]
@@ -271,7 +271,7 @@ with the correct `bug_fixes` and `security_fixes` dates (EOL date in the https:/
 * On `f{rawhide}` branch update relevant lines:
 ** `%global rawhide_release {rawhide_next}`
 ** `global updates_testing_enabled 1`
-** `Release:        0.3%{?eln:.eln%{eln}}`
+** `Release:        0.3%{?eln:.eln%\{eln}}`
 *** Increment whatever number there is by one.
 ** Add a `%changelog` entry:
 
@@ -336,7 +336,7 @@ Do this on **both** hosts so that one is not left open to external users.
 ----
 $ ssh koji01.rdu3.fedoraproject.org
 and in a second tmux window:
-$ ssh koji02.rdu3.fedoraproject.org 
+$ ssh koji02.rdu3.fedoraproject.org
 ----
 +
 . Make sure the toggle script is available from the releng tooling repository.

modules/release_guide/pages/sop_release_eol.adoc

@@ -183,7 +183,7 @@ Send the final announcement to `devel-announce@`, `test@`, `test-announce@`, and
 ==== Remove EOL Release From `Koschei`
 
 The release going EOL must be removed from Koschei to prevent a flood of failed scratch builds.
-See the xref:sysadmin_guide:koschei.adoc#_removing_an_eol_fedora_release[Koschei sysadmin guide] for details.
+See the xref:sysadmin_sops:koschei.adoc#_removing_an_eol_fedora_release[Koschei sysadmin guide] for details.
 
 ==== Remove Release From `fedfind` Source Of Truth
 

modules/releng_misc_guide/pages/overview.adoc

@@ -131,7 +131,7 @@ privately.
 
 BitTorrent is currently served by http://torrent.fedoraproject.org.
 Images are added to the system via this
-https://infrastructure.fedoraproject.org/infra/docs/docs/sysadmin-guide/sops/torrentrelease.rst[Standard
+https://infrastructure.fedoraproject.org/infra/docs/docs/sysadmin-guide/sysadmin_sops:torrentrelease.rst[Standard
 Operating Procedure].
 
 == Acknowledgements

modules/sysadmin_guide/pages/forgejo.adoc

@@ -1,6 +0,0 @@
-= Forgejo Related SOPs
-
-- xref:sop_forgejo_installation.adoc[SOP Forgejo Installation]
-- xref:sop_forgejo_backups.adoc[SOP Forgejo Backups]
-- xref:sop_forgejo_restore_backup.adoc[SOP Forgejo Restore Backup]
-- xref:sop_forgejo_valkey.adoc[SOP Forgejo Valkey Information]

modules/sysadmin_guide/pages/index.adoc

@@ -2,14 +2,16 @@
 
 Welcome to The Fedora Infrastructure system administration guide.
 
+This document is primarily an index of available documentation for those who
+already have some level of access.  If you're interested in contributing to our
+work, please see the xref:join_guide:index.adoc[Join Guide].
+
 == Getting Started
 
 If you haven't already, you should complete the general
 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
-Infrastructure Apprentice] group.
+Once you've completed that, you're ready to get involved in the Fedora
+Infrastructure Apprentice group.
 
 === Fedora Infrastructure Apprentice
 
@@ -18,7 +20,7 @@ https://accounts.fedoraproject.org/group/fi-apprentice/[Fedora
 Infrastructure Apprentice] group in the Fedora Account System grants
 read-only access to many Fedora infrastructure machines. This group is
 used for new folks to look around at the infrastructure setup, check
-machines and processes and see where they might like to contribute
+machines and processes, and see where they might like to contribute
 moving forward. This also allows apprentices to examine and gather info
 on problems, then propose solutions.
 
@@ -40,7 +42,7 @@ have read-only access). Apprentice can, however, contribute to the
 infrastructure documentation by making a pull request to the
 https://forge.fedoraproject.org/infra/docs[infra-docs] repository. Access is via the
 bastion.fedoraproject.org machine and from there to each machine. See
-the xref:sshaccess.adoc[ssh-sop] for instructions on how to set up SSH.
+the xref:sysadmin_sops:sshaccess.adoc[ssh-sop] for instructions on how to set up SSH.
 You can see a list of hosts that allow apprentice access by using:
 
 ....
@@ -68,203 +70,203 @@ xref:developer_guide:sops.adoc[Developing Standard Operating Procedures].
 === Access, Identity & Permissions
 
 * Access to Infrastructure & Services
-** xref:aws-access.adoc[Amazon Web Services Access]
-** xref:bastion-hosts-info.adoc[Bastion Hosts]
-** xref:ipa.adoc[IPA infrastructure]
-** xref:ipsilon.adoc[Ipsilon Infrastructure]
-** xref:sshaccess.adoc[SSH Access Infrastructure]
+** xref:sysadmin_sops:aws-access.adoc[Amazon Web Services Access]
+** xref:sysadmin_sops:bastion-hosts-info.adoc[Bastion Hosts]
+** xref:sysadmin_sops:ipa.adoc[IPA infrastructure]
+** xref:sysadmin_sops:ipsilon.adoc[Ipsilon Infrastructure]
+** xref:sysadmin_sops:sshaccess.adoc[SSH Access Infrastructure]
 
 * Authentication & Account Security
-** xref:accountdeletion.adoc[Account Deletion SOP]
-** xref:departing-admin.adoc[Departing admin]
-** xref:2-factor.adoc[Two factor auth]
+** xref:sysadmin_sops:accountdeletion.adoc[Account Deletion SOP]
+** xref:sysadmin_sops:departing-admin.adoc[Departing admin]
+** xref:sysadmin_sops:2-factor.adoc[Two factor auth]
 
 * Compliance & Data Protection
-** xref:gdpr_delete.adoc[GDPR Delete]
-** xref:gdpr_sar.adoc[GDPR SAR]
+** xref:sysadmin_sops:gdpr_delete.adoc[GDPR Delete]
+** xref:sysadmin_sops:gdpr_sar.adoc[GDPR SAR]
 
 * Identity & Account Management
-** xref:nonhumanaccounts.adoc[Non-human Accounts Infrastructure]
+** xref:sysadmin_sops:nonhumanaccounts.adoc[Non-human Accounts Infrastructure]
 
 * Trust & Credentials
-** xref:sshknownhosts.adoc[SSH known hosts Infrastructure]
-** xref:ssl-certificates.adoc[SSL Certificates]
+** xref:sysadmin_sops:sshknownhosts.adoc[SSH known hosts Infrastructure]
+** xref:sysadmin_sops:ssl-certificates.adoc[SSL Certificates]
 
 === Application & Product Services
 
 * Build & Release Applications
-** xref:bodhi-deploy.adoc[Bodhi Infrastructure - Deployment]
-** xref:bodhi.adoc[Bodhi Infrastructure - Releng]
-** xref:copr.adoc[Copr]
-** xref:koji-archive.adoc[Koji Archive]
-** xref:koji.adoc[Koji Infrastructure]
-** xref:koji-builder-setup.adoc[Setup Koji Builder]
+** xref:sysadmin_sops:bodhi-deploy.adoc[Bodhi Infrastructure - Deployment]
+** xref:sysadmin_sops:bodhi.adoc[Bodhi Infrastructure - Releng]
+** xref:sysadmin_sops:copr.adoc[Copr]
+** xref:sysadmin_sops:koji-archive.adoc[Koji Archive]
+** xref:sysadmin_sops:koji.adoc[Koji Infrastructure]
+** xref:sysadmin_sops:koji-builder-setup.adoc[Setup Koji Builder]
 
 * Identity, Collaboration & Communication
-** xref:forgejo.adoc[Forgejo]
-** xref:mailman.adoc[Mailman Infrastructure]
-** xref:pagure.adoc[Pagure Infrastructure]
-** xref:zodbot.adoc[Zodbot Infrastructure]
+** xref:sysadmin_sops:forgejo.adoc[Forgejo]
+** xref:sysadmin_sops:mailman.adoc[Mailman Infrastructure]
+** xref:sysadmin_sops:pagure.adoc[Pagure Infrastructure]
+** xref:sysadmin_sops:zodbot.adoc[Zodbot Infrastructure]
 
 * Packaging, CI & QA Services
-** xref:blockerbugs.adoc[Blockerbugs Infrastructure]
-** xref:kerneltest-harness.adoc[Kerneltest-harness]
-** xref:koschei.adoc[Koschei]
-** xref:retrace.adoc[Retrace]
+** xref:sysadmin_sops:blockerbugs.adoc[Blockerbugs Infrastructure]
+** xref:sysadmin_sops:kerneltest-harness.adoc[Kerneltest-harness]
+** xref:sysadmin_sops:koschei.adoc[Koschei]
+** xref:sysadmin_sops:retrace.adoc[Retrace]
 
 * Policy, Gating & Metadata
-** xref:greenwave.adoc[Greenwave]
+** xref:sysadmin_sops:greenwave.adoc[Greenwave]
 
 * Specialized & Supporting Services
-** xref:anitya.adoc[Anitya Infrastructure SOP]
-** xref:bugzilla2fedmsg.adoc[bugzilla2fedmsg]
-** xref:registry.adoc[Container registry]
-** xref:coreos-cincinnati.adoc[CoreOS Cincinnati]
-** xref:debuginfod.adoc[Debuginfod Service]
-** xref:geoip-city-wsgi.adoc[geoip-city-wsgi]
-** xref:mote.adoc[mote]
-** xref:planetsubgroup.adoc[Planet Subgroup Infrastructure]
-** xref:hotness.adoc[The New Hotness]
+** xref:sysadmin_sops:anitya.adoc[Anitya Infrastructure SOP]
+** xref:sysadmin_sops:bugzilla2fedmsg.adoc[bugzilla2fedmsg]
+** xref:sysadmin_sops:registry.adoc[Container registry]
+** xref:sysadmin_sops:coreos-cincinnati.adoc[CoreOS Cincinnati]
+** xref:sysadmin_sops:debuginfod.adoc[Debuginfod Service]
+** xref:sysadmin_sops:geoip-city-wsgi.adoc[geoip-city-wsgi]
+** xref:sysadmin_sops:mote.adoc[mote]
+** xref:sysadmin_sops:planetsubgroup.adoc[Planet Subgroup Infrastructure]
+** xref:sysadmin_sops:hotness.adoc[The New Hotness]
 
 * Websites & User Services
-** xref:apps-fp-o.adoc[apps.fedoraproject.org]
-** xref:fedocal.adoc[Fedocal]
-** xref:voting.adoc[Voting Infrastructure]
-** xref:wiki.adoc[Wiki Infrastructure]
+** xref:sysadmin_sops:apps-fp-o.adoc[apps.fedoraproject.org]
+** xref:sysadmin_sops:fedocal.adoc[Fedocal]
+** xref:sysadmin_sops:voting.adoc[Voting Infrastructure]
+** xref:sysadmin_sops:wiki.adoc[Wiki Infrastructure]
 
 === Backup, Recovery & Continuity
 
 * Backup Systems
-** xref:rdiff-backup.adoc[rdiff-backup]
+** xref:sysadmin_sops:rdiff-backup.adoc[rdiff-backup]
 
 * Storage & Backup Hardware
-** xref:iscsi.adoc[iSCSI]
-** xref:netapp.adoc[Netapp Infrastructure]
+** xref:sysadmin_sops:iscsi.adoc[iSCSI]
+** xref:sysadmin_sops:netapp.adoc[Netapp Infrastructure]
 
 === Build, Release & Content Pipeline
 
 * CI, Testing & Validation
-** xref:openqa.adoc[OpenQA Infrastructure]
+** xref:sysadmin_sops:openqa.adoc[OpenQA Infrastructure]
 
 * Mirroring & CDN
-** xref:mirrormanager-S3-EC2-netblocks.adoc[Amazon Web Services Mirrors]
-** xref:mastermirror.adoc[Master Mirror Infrastructure]
-** xref:mirrorhiding.adoc[Mirror Hiding Infrastructure]
-** xref:mirrormanager.adoc[MirrorManager Infrastructure]
+** xref:sysadmin_sops:mirrormanager-S3-EC2-netblocks.adoc[Amazon Web Services Mirrors]
+** xref:sysadmin_sops:mastermirror.adoc[Master Mirror Infrastructure]
+** xref:sysadmin_sops:mirrorhiding.adoc[Mirror Hiding Infrastructure]
+** xref:sysadmin_sops:mirrormanager.adoc[MirrorManager Infrastructure]
 
 * Packaging, Signing & Security
-** xref:packagereview.adoc[Package Review]
-** xref:pesign-upgrade.adoc[Pesign upgrades/reboots]
-** xref:sigul-upgrade.adoc[Sigul servers upgrades/reboots]
+** xref:sysadmin_sops:packagereview.adoc[Package Review]
+** xref:sysadmin_sops:pesign-upgrade.adoc[Pesign upgrades/reboots]
+** xref:sysadmin_sops:sigul-upgrade.adoc[Sigul servers upgrades/reboots]
 
 * Repository & Distribution Infrastructure
-** xref:cloud-image-uploader.adoc[Cloud Image Uploader]
-** xref:compose-tracker.adoc[Compose Tracker]
-** xref:contenthosting.adoc[Content Hosting Infrastructure]
-** xref:dnf-counting.adoc[DNF Counting]
-** xref:fedora-releases.adoc[Fedora Release Infrastructure]
-** xref:infra-repo.adoc[Infrastructure DNF Repo]
+** xref:sysadmin_sops:cloud-image-uploader.adoc[Cloud Image Uploader]
+** xref:sysadmin_sops:compose-tracker.adoc[Compose Tracker]
+** xref:sysadmin_sops:contenthosting.adoc[Content Hosting Infrastructure]
+** xref:sysadmin_sops:dnf-counting.adoc[DNF Counting]
+** xref:sysadmin_sops:fedora-releases.adoc[Fedora Release Infrastructure]
+** xref:sysadmin_sops:infra-repo.adoc[Infrastructure DNF Repo]
 
 === Change Management & Outages
 
 * Environment Management
-** xref:staging.adoc[Staging]
+** xref:sysadmin_sops:staging.adoc[Staging]
 
 * Incident & Outage Handling
-** xref:outage.adoc[Outage Infrastructure]
+** xref:sysadmin_sops:outage.adoc[Outage Infrastructure]
 
 * Upgrades and Reboots
-** xref:massupgrade.adoc[Mass Upgrade Infrastructure]
+** xref:sysadmin_sops:massupgrade.adoc[Mass Upgrade Infrastructure]
 
 === Host & System Lifecycle
 
 * Hardware Maintenance & Troubleshooting
-** xref:hardware_troubleshooting_power.adoc[Hardware Troubleshoot Power Issue]
-** xref:virt-image.adoc[Kpartx Notes]
-** xref:failedharddrive.adoc[Replacing Failed Hard Drives]
+** xref:sysadmin_sops:hardware_troubleshooting_power.adoc[Hardware Troubleshoot Power Issue]
+** xref:sysadmin_sops:virt-image.adoc[Kpartx Notes]
+** xref:sysadmin_sops:failedharddrive.adoc[Replacing Failed Hard Drives]
 
 * Infrastructure Environments
-** xref:infra-hostrename.adoc[Infrastructure Host Rename]
-** xref:infra-retiremachine.adoc[Infrastructure retire machine]
-** xref:publictest-dev-stg-production.adoc[Machine Classes]
+** xref:sysadmin_sops:infra-hostrename.adoc[Infrastructure Host Rename]
+** xref:sysadmin_sops:infra-retiremachine.adoc[Infrastructure retire machine]
+** xref:sysadmin_sops:publictest-dev-stg-production.adoc[Machine Classes]
 
 * Provisioning & Installation
-** xref:kickstarts.adoc[Kickstart Infrastructure]
+** xref:sysadmin_sops:kickstarts.adoc[Kickstart Infrastructure]
 
 * Virtualization & Guest Management
-** xref:guestdisk.adoc[Guest Disk Resize]
-** xref:guestedit.adoc[Guest Editing]
-** xref:virt-notes.adoc[Libvirt Notes]
-** xref:guest_migrate.adoc[Migrate Guest VMs]
-** xref:new-virtual-hosts.adoc[Virtual Host Addition]
+** xref:sysadmin_sops:guestdisk.adoc[Guest Disk Resize]
+** xref:sysadmin_sops:guestedit.adoc[Guest Editing]
+** xref:sysadmin_sops:virt-notes.adoc[Libvirt Notes]
+** xref:sysadmin_sops:guest_migrate.adoc[Migrate Guest VMs]
+** xref:sysadmin_sops:new-virtual-hosts.adoc[Virtual Host Addition]
 
 === Monitoring, Logging & Alerting
 
 * Logging & Audit
-** xref:syslog.adoc[Log Infrastructure]
+** xref:sysadmin_sops:syslog.adoc[Log Infrastructure]
 
 * Metrics & Monitoring
-** xref:collectd.adoc[Collectd]
-** xref:nagios.adoc[Nagios]
-** xref:zabbix.adoc[Zabbix Infrastructure]
+** xref:sysadmin_sops:collectd.adoc[Collectd]
+** xref:sysadmin_sops:nagios.adoc[Nagios]
+** xref:sysadmin_sops:zabbix.adoc[Zabbix Infrastructure]
 
 * Status & Public Communication
-** xref:status-fedora.adoc[Fedora Status Service]
+** xref:sysadmin_sops:status-fedora.adoc[Fedora Status Service]
 
 === Networking & Traffic
 
 * DNS & Name Resolution
-** xref:dns.adoc[DNS repository for fedoraproject]
-** xref:unbound.adoc[Unbound Notes]
+** xref:sysadmin_sops:dns.adoc[DNS repository for fedoraproject]
+** xref:sysadmin_sops:unbound.adoc[Unbound Notes]
 
 * Load Balancing & Traffic Control
-** xref:haproxy.adoc[Haproxy Infrastructure]
+** xref:sysadmin_sops:haproxy.adoc[Haproxy Infrastructure]
 
 * Server VPN solution
-** xref:openvpn.adoc[OpenVPN]
+** xref:sysadmin_sops:openvpn.adoc[OpenVPN]
 
 === Requests, Planning & Meta-Processes
 
 * Configuration Management & Automation
-** xref:ansible.adoc[Ansible]
+** xref:sysadmin_sops:ansible.adoc[Ansible]
 
 * Planning & Initiative Management
-** xref:infra_handover.adoc[Initiative Handover]
+** xref:sysadmin_sops:infra_handover.adoc[Initiative Handover]
 
 * Requests & Onboarding
-** xref:externally-hosted-services.adoc[Externally Hosted Services]
-** xref:tickets.adoc[How to handle new tickets in fedora-infrastructure]
-** xref:requestforresources.adoc[Request for resources]
-** xref:wcidff.adoc[What Can I Do For Fedora]
+** xref:sysadmin_sops:externally-hosted-services.adoc[Externally Hosted Services]
+** xref:sysadmin_sops:tickets.adoc[How to handle new tickets in fedora-infrastructure]
+** xref:sysadmin_sops:requestforresources.adoc[Request for resources]
+** xref:sysadmin_sops:wcidff.adoc[What Can I Do For Fedora]
 
 * Source Control & Project Management
-** xref:infra-git-repo.adoc[Infrastructure Git Repos]
-** xref:openshift_sops.adoc[Openshift SOPs]
-** xref:github.adoc[Using github for Infra Projects]
+** xref:sysadmin_sops:infra-git-repo.adoc[Infrastructure Git Repos]
+** xref:sysadmin_sops:openshift_sops.adoc[Openshift SOPs]
+** xref:sysadmin_sops:github.adoc[Using github for Infra Projects]
 
 === Security & Compliance
 
 * Emergency & Exception Handling
-** xref:hotfix.adoc[HOTFIXES]
+** xref:sysadmin_sops:hotfix.adoc[HOTFIXES]
 
 * Mandatory Access Control / Policy Enforcement
-** xref:selinux.adoc[SELinux Infrastructure]
+** xref:sysadmin_sops:selinux.adoc[SELinux Infrastructure]
 
 === Service Operations
 
 * Caching & Performance
-** xref:memcached.adoc[Memcached Infrastructure]
+** xref:sysadmin_sops:memcached.adoc[Memcached Infrastructure]
 
 * Databases & Storage Services
-** xref:database.adoc[Database Infrastructure]
+** xref:sysadmin_sops:database.adoc[Database Infrastructure]
 
 * Gating, Results & Policy
-** xref:resultsdb.adoc[ResultsDB]
-** xref:waiverdb.adoc[WaiverDB]
+** xref:sysadmin_sops:resultsdb.adoc[ResultsDB]
+** xref:sysadmin_sops:waiverdb.adoc[WaiverDB]
 
 * Messaging & Event Systems
-** xref:datanommer.adoc[Datanommer]
-** xref:rabbitmq.adoc[RabbitMQ]
+** xref:sysadmin_sops:datanommer.adoc[Datanommer]
+** xref:sysadmin_sops:rabbitmq.adoc[RabbitMQ]
 
 == HOWTOs
 
@@ -304,4 +306,4 @@ In this section is list of guides for common tasks that are done in Fedora Infra
 * xref:howtos:share_tmux_session.adoc[How to share a tmux session accross users]
 * xref:howtos:unblock_bodhi_rawhide_updates.adoc[How to unblock Bodhi rawhide updates]
 * xref:howtos:update_watch_dist_git.adoc[How to update the watch status of someone in dist-git]
-* xref:howtos:idrac-firmware-update.adoc[How to perform firmware upgrades on iDRAC management controllers]
+* xref:howtos:idrac-firmware-update.adoc[How to perform firmware upgrades on iDRAC management controllers]

modules/sysadmin_guide/pages/openshift_sops.adoc

@@ -1,25 +0,0 @@
-= SOPs
-
-- xref:sop_configure_baremetal_pxe_uefi_boot.adoc[SOP Configure Baremetal PXE-UEFI Boot]
-- xref:sop_configure_image_registry_operator.adoc[SOP Configure the Image Registry Operator]
-- xref:sop_configure_local_storage_operator.adoc[SOP Configure the Local Storage Operator]
-- xref:sop_configure_oauth_ipa.adoc[SOP Configure oauth Authentication via IPA/Noggin]
-- xref:sop_configure_openshift_container_storage.adoc[SOP Configure the Openshift Container Storage Operator]
-- xref:sop_configure_userworkload_monitoring_stack.adoc[SOP Configure the Userworkload Monitoring Stack]
-- xref:sop_cordoning_nodes_and_draining_pods.adoc[SOP Cordoning and Draining Nodes]
-- xref:sop_create_machineconfigs.adoc[SOP Create MachineConfigs to Configure RHCOS]
-- xref:sop_disable_provisioners_role.adoc[SOP Disable the Provisioners Role]
-- xref:sop_graceful_shutdown_ocp_cluster.adoc[SOP Graceful Cluster Shutdown]
-- xref:sop_graceful_startup_ocp_cluster.adoc[SOP Graceful Cluster Startup]
-- xref:sop_installation.adoc[SOP Openshift 4 Installation on Fedora Infra]
-- xref:sop_retrieve_ocp4_cacert.adoc[SOP Retrieve OCP4 CACERT]
-- xref:sop_renew_ocp_api_certs.adoc[SOP Replace OCP API certs]
-- xref:sop_upgrade.adoc[SOP Upgrade OCP4 Cluster]
-- xref:sop_etcd_backup.adoc[SOP Create etcd backup]
-- xref:sop_configure_openshift_virtualization_operator.adoc[SOP Configure the Openshift Virtualization Operator]
-- xref:sop_add_node.adoc[SOP Add an OCP4 Node to an Existing Cluster]
-- xref:sop_add_odf_storage.adoc[SOP Add new capacity to the OCP4 ODF Storage Cluster]
-- xref:sop_velero.adoc[SOP Velero]
-- xref:sop_aws_efs_operator.adoc[SOP AWS EFS Operator]
-- xref:sop_communishift.adoc[SOP Communishift Cluster Administration]
-- xref:sop_fas2discourse_operator.adoc[SOP fas2discourse operator]

modules/sysadmin_guide/pages/orientation.adoc

@@ -1,4 +1,4 @@
-= Orientation Infrastructure SOP
+= Sysadmin Orientation
 
 Basic orientation and introduction to the sysadmin group. Welcome
 aboard!

modules/sysadmin_guide/pages/sop_communishift.adoc

@@ -1,13 +0,0 @@
-= Communishift
-The following SOPs are related to the administration of the Communishift Cluster.
-
-== Resources
-- https://console-openshift-console.apps.fedora.cj14.p1.openshiftapps.com[Cluster]
-- xref:sop_communishift_authorization_operator.adoc[Install the CommunishiftAuthorization operator]
-- xref:sop_communishift_authorization_operator_testing.adoc[Testing the CommunishiftAuthorization operator]
-- xref:sop_communishift_authorization_operator_build.adoc[Building/releasing the CommunishiftAuthorization operator]
-- xref:sop_communishift_onboard_tenant.adoc[Onboarding a Communishift tenant]
-- xref:sop_communishift_tenant_quota.adoc[Configuring the Resourcequota for a tenant]
-- xref:sop_communishift_create_sharedvolume.adoc[Create the SharedVolume object which manages tenant storage]
-- xref:sop_communishift_cleanup_script.adoc[Run the Communishift Clean Up Script]
-

modules/sysadmin_guide/pages/sop_fas2discourse_operator.adoc

@@ -1,13 +0,0 @@
-= fas2discourse Operator
-The following SOPs are related to the administration of the fas2discourse operator.
-
-== Resources
-- https://pagure.io/cpe/fas2discourse/[Code]
-- https://quay.io/repository/fedora/fas2discourse-operator[Image]
-- https://forge.fedoraproject.org/infra/tickets/issues/10952[Initial ticket]
-- xref:sop_fas2discourse_operator_installation.adoc[Install the fas2discourse operator]
-- xref:sop_fas2discourse_operator_testing.adoc[Testing the fas2discourse operator]
-- xref:sop_fas2discourse_operator_build.adoc[Building/releasing the fas2discourse operator]
-- xref:sop_fas2discourse_operator_interacting.adoc[Interacting with the the fas2discourse operator]
-- xref:sop_fas2discourse_operator_debugging.adoc[Debugging issues with the the fas2discourse operator]
-

modules/sysadmin_guide/pages/zabbix.adoc

@@ -1,8 +0,0 @@
-= Zabbix Related SOPs
-
-- xref:sop_zabbix_installation.adoc[SOP Zabbix Installation]
-- xref:sop_add_zabbix_agent.adoc[SOP Add Zabbix Agent to hosts]
-- xref:sop_zabbix_day_to_day_maintenance.adoc[SOP Day-to-Day Zabbix usage for Infrastructure]
-- xref:sop_add_zabbix_template_to_ansible.adoc[SOP Add Zabbix template to Ansible]
-- xref:sop_develop_new_checks_on_zabbix_stg.adoc[SOP Developing new Zabbix checks on Staging]
-- xref:sop_zabbix_inventory_management.adoc[SOP Updating the Zabbix inventory]

modules/sysadmin_sops/pages/anitya.adoc

@@ -81,9 +81,9 @@ Anitya on production.
 ==== Configuration
 
 To deploy the new configuration, you need
-xref:sshaccess.adoc[ssh
+xref:sysadmin_sops:sshaccess.adoc[ssh
 access] to batcave01.rdu3.fedoraproject.org and
-xref:ansible.adoc[permissions
+xref:sysadmin_sops:ansible.adoc[permissions
 to run the Ansible playbook].
 
 All the following commands should be run from batcave01.

modules/sysadmin_sops/pages/ansible.adoc

@@ -227,7 +227,7 @@ Templates use the jinja2 syntax.
 
 === Add new virtual machine
 
-See xref:new-virtual-hosts.adoc[]
+See xref:sysadmin_sops:new-virtual-hosts.adoc[]
 
 == Cloud Instances
 
@@ -236,7 +236,7 @@ See xref:new-virtual-hosts.adoc[]
 
 == rdiff-backups
 
-See: xref:rdiff-backup.adoc[]
+See: xref:sysadmin_sops:rdiff-backup.adoc[]
 
 == Additional Reading/Resources
 

modules/sysadmin_sops/pages/bodhi-deploy.adoc

@@ -9,7 +9,7 @@ Bodhi production instance: https://bodhi.fedoraproject.org
 
 Bodhi project page: https://github.com/fedora-infra/bodhi
 
-See also: xref:bodhi.adoc[Bodhi Infrastructure - Releng SOP]
+See also: xref:sysadmin_sops:bodhi.adoc[Bodhi Infrastructure - Releng SOP]
 
 == Performing a bodhi upgrade
 
@@ -52,7 +52,7 @@ When you are ready to denote the new patch version:
 2. run the get-authors.py in ./news
 3. run towncrier
 4. review the docs/user/release_notes.rst
-5. commit, push to your branch and make a PR against develop with the corect `*-backports` label 
+5. commit, push to your branch and make a PR against develop with the corect `*-backports` label
 
 After all of the tests successfully passed in the PRs, and both of them are merged, tag the release:
 1. git checkout 5.7

modules/sysadmin_sops/pages/communishift.adoc

@@ -0,0 +1,12 @@
+= Communishift
+The following SOPs are related to the administration of the Communishift Cluster.
+
+== Resources
+- https://console-openshift-console.apps.fedora.cj14.p1.openshiftapps.com[Cluster]
+- xref:sysadmin_sops:communishift_authorization_operator.adoc[Install the CommunishiftAuthorization operator]
+- xref:sysadmin_sops:communishift_authorization_operator_testing.adoc[Testing the CommunishiftAuthorization operator]
+- xref:sysadmin_sops:communishift_authorization_operator_build.adoc[Building/releasing the CommunishiftAuthorization operator]
+- xref:sysadmin_sops:communishift_onboard_tenant.adoc[Onboarding a Communishift tenant]
+- xref:sysadmin_sops:communishift_tenant_quota.adoc[Configuring the Resourcequota for a tenant]
+- xref:sysadmin_sops:communishift_create_sharedvolume.adoc[Create the SharedVolume object which manages tenant storage]
+- xref:sysadmin_sops:communishift_cleanup_script.adoc[Run the Communishift Clean Up Script]

modules/sysadmin_sops/pages/dns.adoc

@@ -70,7 +70,7 @@ This is the same copy/view that the nameservers themselves have.
 === Adding a new Host
 
 Adding a new host requires to add it to DNS and to ansible, see
-xref:new-virtual-hosts.adoc[] for the details.
+xref:sysadmin_sops:new-virtual-hosts.adoc[] for the details.
 
 === Editing the domain(s)
 

modules/sysadmin_sops/pages/forgejo.adoc

@@ -0,0 +1,6 @@
+= Forgejo Related SOPs
+
+- xref:sysadmin_sops:forgejo_installation.adoc[SOP Forgejo Installation]
+- xref:sysadmin_sops:forgejo_backups.adoc[SOP Forgejo Backups]
+- xref:sysadmin_sops:forgejo_restore_backup.adoc[SOP Forgejo Restore Backup]
+- xref:sysadmin_sops:forgejo_valkey.adoc[SOP Forgejo Valkey Information]

modules/sysadmin_sops/pages/hotness.adoc

@@ -34,7 +34,7 @@ This OpenShift namespace runs following pods:
 
 This OpenShift project relies on:
 
-* xref:anitya.adoc[Anitya] as message publisher
+* xref:sysadmin_sops:anitya.adoc[Anitya] as message publisher
 * Fedora messaging RabbitMQ hub for consuming messages
 * Koji for scratch builds
 * Bugzilla for issue reporting
@@ -66,9 +66,9 @@ the-new-hotness on production.
 ==== Configuration
 
 To deploy the new configuration, you need
-xref:sshaccess.adoc[ssh
+xref:sysadmin_sops:sshaccess.adoc[ssh
 access] to _batcave01.rdu3.fedoraproject.org_ and
-xref:ansible.adoc[permissions
+xref:sysadmin_sops:ansible.adoc[permissions
 to run the Ansible playbook].
 
 All the following commands should be run from batcave01.

modules/sysadmin_sops/pages/infra-hostrename.adoc

@@ -19,7 +19,7 @@ that the vm resides on as `$vmhost`.
 
 If this process is being followed so that a temporary-named host can
 replace a production host, please be sure to follow the
-xref:infra-retiremachine.adoc[Infrastructure retire machine SOP] to properly
+xref:sysadmin_sops:infra-retiremachine.adoc[Infrastructure retire machine SOP] to properly
 decommission the old host before continuing.
 
 == Finding out where the host is

modules/sysadmin_sops/pages/ipa.adoc

@@ -64,4 +64,4 @@ if that becomes necessary.
 This section describes some common actions done on IPA.
 
 * xref:howtos:groups_in_fedora.adoc#_how_to_create_a_group[Creating group]
-* xref:2-factor.adoc[Two factor authentication]
+* xref:sysadmin_sops:2-factor.adoc[Two factor authentication]

modules/sysadmin_sops/pages/massupgrade.adoc

@@ -140,7 +140,7 @@ the middle of doing other things.
 
 batcave01 is our ansible control host. It's where you run playbooks
 that have been mentioned in this SOP. However, it too needs updating
-and rebooting and you cannot use the vhost_reboot playbook for it, 
+and rebooting and you cannot use the vhost_reboot playbook for it,
 since it's rebooting it's own virthost. For this host you should
 go to the virthost and 'virsh shutdown' all the other vm's, then
 'virsh shutdown' batcave01, then reboot the virthost manually.
@@ -235,7 +235,7 @@ use and give clearer results.
 If possible, system upgrades should be done in advance of the reboot
 (with relevant testing of new packages on staging). To do the upgrades,
 make sure that the Infrastructure RHEL repo is updated as necessary to
-pull in the new packages (xref:infra-repo.adoc[Infrastructure Yum Repo SOP])
+pull in the new packages (xref:sysadmin_sops:infra-repo.adoc[Infrastructure Yum Repo SOP])
 
 Before outage, ansible can be used to just apply all updates to hosts or
 apply all updates to staging hosts before those are done. Something like:

modules/sysadmin_sops/pages/nagios.adoc

@@ -46,7 +46,7 @@ Production and staging instances through SSH: Please make sure you are
 into 'sysadmin' and 'sysadmin-noc' FAS groups before trying to access
 these hosts.
 
-See xref:sshaccess.adoc[SSH Access SOP]
+See xref:sysadmin_sops:sshaccess.adoc[SSH Access SOP]
 ====
 
 === NRPE
@@ -96,5 +96,5 @@ change is needed at the end of their oncall week.
 
 === Further Reading
 
-* xref:ansible.adoc[Ansible SOP]
-* xref:outage.adoc[Outages SOP]
+* xref:sysadmin_sops:ansible.adoc[Ansible SOP]
+* xref:sysadmin_sops:outage.adoc[Outages SOP]