more renames and removals

dkess · dkess · commit fddd630f5b0a · 2019-04-04T23:54:44.000-07:00
diff --git a/ocfweb/docs/docs/staff/backend/mail/vhost.md b/ocfweb/docs/docs/staff/backend/mail/vhost.md
@@ -46,4 +46,4 @@ clients to send as a vhost address. (See `/etc/pam.d/smtp` and
 
 ## How do I add mail hosting to a group?
 
-See [[here|doc staff/procedures/vhost#mail]].
+See [[here|doc staff/howto/user-services/vhost#mail]].
diff --git a/ocfweb/docs/docs/staff/backend/printhost.md b/ocfweb/docs/docs/staff/backend/printhost.md
@@ -140,7 +140,7 @@ and emails users in the case a job fails.
 After printing a document from a desktop, lab visitors are notified when pages
 are subtracted from their quota by a little popup notification. This is done by
 a short daemon script, [notify script][notify], which starts upon login and
-runs the [[paper command|doc staff/scripts/paper]] every minute to see if the
+runs the [[paper command|doc staff/howto/user-services/paper]] every minute to see if the
 quota has changed.
 
 In the future, it would be nice to have a more robust notification system where
@@ -157,9 +157,9 @@ current user.
 
 ## See also
 
-- [[Printing maintenance|doc staff/procedures/printing]]
+- [[Printing maintenance|doc staff/howto/maintenance/printing]]
 - The [ocf\_printhost][ocf_printhost] Puppet class
-- The [[paper|doc staff/scripts/paper]] command
+- The [[paper|doc staff/howto/user-services/paper]] command
 - [CUPS documentation at Samba][cups-samba] (for Windows users, but has general
   CUPS info as well)
 
diff --git a/ocfweb/docs/docs/staff/backend/switch.md b/ocfweb/docs/docs/staff/backend/switch.md
@@ -83,7 +83,7 @@ Port Channel Port-Channel7:
 
 More details can be found on the EOS guide online, in the [Port Channel section][lacp-guide].
 
-LACP also needs to be configured on the [[host side | doc staff/procedures/setting-up-lacp]].
+LACP also needs to be configured on the [[host side | doc staff/howto/infrastructure/setting-up-lacp]].
 
 [primary-switch]: https://www.arista.com/assets/data/pdf/Datasheets/7050SX-128_64_Datasheet.pdf
 [secondary-switch]: https://www.arista.com/assets/data/pdf/Datasheets/7048T-A_DataSheet.pdf
diff --git a/ocfweb/docs/docs/staff/howto/account-management/association.md b/ocfweb/docs/docs/staff/howto/account-management/association.md
@@ -3,7 +3,7 @@
 New individual accounts have a `calnetUid` attribute in
 [[LDAP|doc staff/backend/ldap]] which is used for
 [[changing passwords online|change_password]], querying CalNet when running
-[[`check`|doc staff/scripts/check]], and producing aggregate counts of
+[[`check`|doc staff/howto/account-management/check]], and producing aggregate counts of
 the number of members by university affiliation.
 
 Similarly, group accounts have a `callinkOid` attribute.
diff --git a/ocfweb/docs/docs/staff/howto/account-management/check.md b/ocfweb/docs/docs/staff/howto/account-management/check.md
@@ -16,7 +16,7 @@ may only be accessible to privileged users or root, or depend on the server
 * Virtual host, apphost, and/or virtual mail configuration if applicable
 * DNS records for any of the above
 * Signatory of / signatories for
-* [[Notes|doc staff/scripts/note]] about the user in `~staff/User_Info`
+* [[Notes|doc staff/howto/account-management/note]] about the user in `~staff/User_Info`
 * Processes running on the current machine owned by that user
 * Recent login history on the current machine by that user
 
diff --git a/ocfweb/docs/docs/staff/howto/account-management/checkacct.md b/ocfweb/docs/docs/staff/howto/account-management/checkacct.md
@@ -6,7 +6,7 @@ If a member does not know their account name, you can use this script to look
 it up.
 
 Before recording an account request for a group with [[approve|doc
-staff/scripts/approve]], check to see if the group already has an account. Be
+staff/howto/user-services/approve]], check to see if the group already has an account. Be
 sure to use different forms and abbreviations of the group's name to maximize
 the chance that a group will be found.
 
diff --git a/ocfweb/docs/docs/staff/howto/account-management/note.md b/ocfweb/docs/docs/staff/howto/account-management/note.md
@@ -16,4 +16,4 @@ reasons where some documentation should be made about an OCF account.
 
 `note` will append the note-taking user's username, the day's date, the noted
 user's username, and the note to `~staff/User_Info`, where it can later be retrieved by
-[[`check`|doc staff/scripts/check]].
+[[`check`|doc staff/howto/account-management/check]].
diff --git a/ocfweb/docs/docs/staff/howto/account-management/signat.md b/ocfweb/docs/docs/staff/howto/account-management/signat.md
@@ -6,7 +6,7 @@ The `signat` script is used to look up the signatory status of people and
 student groups. This allows us to verify that the people who email us or come
 in to [[staff hours|staff-hours]] are really signatories for their group, and
 it also gives all the information needed to create group accounts with
-[[approve|doc staff/scripts/approve]].
+[[approve|doc staff/howto/user-services/approve]].
 
 ## How it works
 
diff --git a/ocfweb/docs/docs/staff/howto/account-management/sorry.md b/ocfweb/docs/docs/staff/howto/account-management/sorry.md
@@ -31,7 +31,7 @@ After sorrying a user, make sure to run the `note` command to document the
 reasoning to ~staff/User_Info. This reason will be read to future users running
 `check` on the sorried user.
 
-[[Unsorrying | doc staff/scripts/unsorry]] a user is also possible.
+[[Unsorrying | doc staff/howto/account-management/unsorry]] a user is also possible.
 
 If a user is sending too much mail, it may be easier to `nomail` the user
 instead of sorrying their account. This involves adding the user to
diff --git a/ocfweb/docs/docs/staff/howto/account-management/unsorry.md b/ocfweb/docs/docs/staff/howto/account-management/unsorry.md
@@ -4,8 +4,8 @@
 
 For various reasons, we've had to disable accounts. Some for weak passwords,
 some for security vulnerabilities, or myriad other reasons. If an account
-is [[sorried|doc staff/scripts/sorry]], once you've made sure the original problem
-has been resolved (you can check `User_Info` via [[check| doc staff/scripts/check]])
+is [[sorried|doc staff/howto/account-management/sorry]], once you've made sure the original problem
+has been resolved (you can check `User_Info` via [[check| doc staff/howto/account-management/check]])
 you can `unsorry` their account and let them log in again.
 
 `unsorry` will remove the user from the sorry group, re-enable a login shell,
@@ -21,4 +21,4 @@ infrastructure.
 
 It may also be necessary to run `nscd -i passwd` on **`tsunami`**.
 
-Make sure to document all `sorry`ing and `unsorry`ing using [[note|doc staff/scripts/note]]
+Make sure to document all `sorry`ing and `unsorry`ing using [[note|doc staff/howto/account-management/note]]
diff --git a/ocfweb/docs/docs/staff/howto/development/editing-docs.md b/ocfweb/docs/docs/staff/howto/development/editing-docs.md
@@ -38,7 +38,7 @@ commiting on master or making a pull request.
 
 For more complicated ones, the repository's readme file has instructions for
 testing and building the website so you can preview your edits before making
-the commit. Also see [[our page on Git|doc staff/backend/git]] for further info
+the commit. Also see [[our page on Git|doc staff/howto/development/git]] for further info
 on working with OCF repos.
 
 
diff --git a/ocfweb/docs/docs/staff/howto/development/git.md b/ocfweb/docs/docs/staff/howto/development/git.md
diff --git a/ocfweb/docs/docs/staff/howto/infrastructure/installing-updates.md b/ocfweb/docs/docs/staff/howto/infrastructure/installing-updates.md
@@ -17,7 +17,7 @@ To install updates:
 1. Make sure the desktops are not
    [suspended](https://github.com/ocf/puppet/blob/master/modules/ocf_desktop/files/suspend/ocf-suspend),
    and that you aren't trying to install updates near a 15-minute boundary when
-   the desktops auto-suspend. See [[lab-wakeup|doc staff/scripts/lab-wakeup]] to
+   the desktops auto-suspend. See [[lab-wakeup|doc staff/howto/maintenance/lab-wakeup]] to
    wake up the desktops prior to updating.
 
 2. From `supernova`, run:
diff --git a/ocfweb/docs/docs/staff/howto/infrastructure/libvirt.md b/ocfweb/docs/docs/staff/howto/infrastructure/libvirt.md
@@ -79,7 +79,7 @@ then you would run `vncviewer -via jaws 127.0.0.1:10` (or `localhost:10`).
 
 ### How do I create a VM?
 
-See [[Creating new hosts|doc staff/procedures/new-host]].
+See [[Creating new hosts|doc staff/howto/infrastructure/new-host]].
 
 ### How do I delete a VM?
 
@@ -97,7 +97,7 @@ On the hypervisor:
 
 ### How do I move a VM from one host to another?
 
-Use the [[migrate-vm|doc staff/scripts/migrate-vm]] script.
+Use the [[migrate-vm|doc staff/howto/infrastructure/migrate-vm]] script.
 
 ### Oh no, I've got a VM with broken networking. How can I access it?
 
diff --git a/ocfweb/docs/docs/staff/howto/other/i3wm.md b/ocfweb/docs/docs/staff/howto/other/i3wm.md
@@ -1,6 +1,6 @@
 [[!meta title="i3wm"]]
 
 `i3wm` or `i3` is is a tiling window manager we use on `tornado`, which is the computer behind the ocf tv.
-To learn how to access the ocf tv, see [[ocf-tv|doc staff/scripts/ocf-tv]]. A tiling window manager is
+To learn how to access the ocf tv, see [[ocf-tv|doc staff/howto/other/ocf-tv]]. A tiling window manager is
 a window manager that breaks the screen into different tiles, and places applications into these tiles,
 which are normally controlled by keyboard shortcuts instead of by dragging and dropping.
diff --git a/ocfweb/docs/docs/staff/howto/other/ocf-tv.md b/ocfweb/docs/docs/staff/howto/other/ocf-tv.md
@@ -9,7 +9,7 @@ start a VNC session to the TV. If you do not specify the host it will use the
 TV by default.
 
 `ocf-tv connect` will open up a VNC window using `xvncviewer` to the host.
-The TV uses [[i3wm|doc staff/i3wm]], a tiling window manager, so if you are
+The TV uses [[i3wm|doc staff/howto/other/i3wm]], a tiling window manager, so if you are
 unsure of how to use it read the linked documentation.
 
 If you'd like to just change the volume on the host, you can use the
diff --git a/ocfweb/docs/docs/staff/howto/other/pdf-open.md b/ocfweb/docs/docs/staff/howto/other/pdf-open.md
@@ -15,6 +15,6 @@ filename doesn't have any spaces or weird characters in it. After
 re-rasterizing the file, Evince will open, and you can start a new print job
 from there. Monitor the job's progress in
 [printhost.ocf.berkeley.edu](//printhost.ocf.berkeley.edu) to ensure the job
-survives. You may [[refund|doc staff/scripts/paper]] printing credits to
+survives. You may [[refund|doc staff/howto/user-services/paper]] printing credits to
 the user in case they've gone over their daily capacity and you're feeling
 generous.
diff --git a/ocfweb/docs/docs/staff/howto/user-services/alumni-reset.md b/ocfweb/docs/docs/staff/howto/user-services/alumni-reset.md
@@ -20,7 +20,7 @@ actual alumnus to perform the search for you, if you are so inclined but
 unable to access the page on account of your youth.
 
 To perform the association, simply follow the steps outlined in the
-[[LDAP Association|doc staff/procedures/accounts/association]] documentation
+[[LDAP Association|doc staff/howto/account-management/association]] documentation
 with regards to adding the `calnetUid` record. However, don't delete it after
 you're done.
 
@@ -46,8 +46,8 @@ password and you can relay this to the alumni.
 
 #### Disabled Account    {sorried}
 
-If the account is [[sorried|doc staff/scripts/sorry]], refer to the documentation
-for [[unsorry|doc staff/scripts/unsorry]] to re-enable the account.
+If the account is [[sorried|doc staff/howto/account-management/sorry]], refer to the documentation
+for [[unsorry|doc staff/howto/account-management/unsorry]] to re-enable the account.
 
 #### Manual Verification of Alumni Identity    {verify}
 
diff --git a/ocfweb/docs/docs/staff/howto/user-services/approve.md b/ocfweb/docs/docs/staff/howto/user-services/approve.md
@@ -25,7 +25,7 @@ direct them to an OCF officer.
   to see what constitutes acceptable documentation.
 
 * If the group is a registered student group, you can look up the requester's
-  signatory status by name with [[signat|doc staff/scripts/signat]].
+  signatory status by name with [[signat|doc staff/howto/account-management/signat]].
 
   ```text
   $ signat name matthew mcallister
diff --git a/ocfweb/docs/docs/staff/policies.md b/ocfweb/docs/docs/staff/policies.md
@@ -5,7 +5,7 @@ read and be aware of these policies.
 
  * [[Staff policy|doc staff/policies/staff-policy]]
  * [[Keycard policy|doc staff/policies/keycard]]
- * The [[restarting services procedure|doc staff/procedures/restarting-services]]
+ * The [[restarting services procedure|doc staff/howto/infrastructure/restarting-services]]
 
 OCF staff should also familiarize themselves with the
 [University's IT Policies](https://security.berkeley.edu/policy/policy-catalog).
diff --git a/ocfweb/docs/docs/staff/procedures.md b/ocfweb/docs/docs/staff/procedures.md
diff --git a/ocfweb/docs/docs/staff/rebuild.md b/ocfweb/docs/docs/staff/rebuild.md
diff --git a/ocfweb/docs/docs/staff/rt.md b/ocfweb/docs/docs/staff/rt.md
diff --git a/ocfweb/docs/docs/staff/scripts.md b/ocfweb/docs/docs/staff/scripts.md
diff --git a/ocfweb/docs/urls.py b/ocfweb/docs/urls.py
@@ -39,6 +39,12 @@
     '/docs/constitution': 'docs/operatingrules/constitution',
     '/docs/bylaws': 'docs/operatingrules/bylaws',
 
+    '/staff/backend/git': 'staff/howto/development/git',
+    '/staff/rebuild/rt': 'staff/rt',
+    '/staff/backend/libvirt': 'staff/howto/infrastructure/libvirt',
+    '/staff/i3wm': 'staff/howto/other/i3wm',
+    '/staff/procedures': 'staff/howto',
+    '/staff/scripts': 'staff/howto',
     '/staff/procedures/accounts/association': 'staff/howto/account-management/association',
     '/staff/scripts/check': 'staff/howto/account-management/check',
     '/staff/scripts/checkacct': 'staff/howto/account-management/checkacct',

Original file line number	Diff line number	Diff line change
@@ -46,4 +46,4 @@ clients to send as a vhost address. (See `/etc/pam.d/smtp` and
`46`	`46`
`47`	`47`	`## How do I add mail hosting to a group?`
`48`	`48`
`49`		`-See [[here\|doc staff/procedures/vhost#mail]].`
	`49`	`+See [[here\|doc staff/howto/user-services/vhost#mail]].`