Update Stanford naming documentation for puppet.conf

Add a naming convention for puppet.conf files containing secure data
and reorganize the naming convention documentation to group all
service objects together.

1 files changed, 14 insertions, 7 deletions

diff --git a/docs/stanford-naming b/docs/stanford-naming
index f887a69..3c6330b 100644
--- a/docs/stanford-naming
+++ b/docs/stanford-naming
@@ -70,13 +70,6 @@ Object Naming
     Then, we use the following naming conventions for different types of
     objects:
 
-    <group>-<service>-db-<name>
-
-        Stores the database password for the database named <name>.  This
-        may be a file containing only the database password or a Perl
-        AppConfig configuration file with the database connection
-        information including the password.
-
     <group>-<server>-htpasswd-<app>
 
         An .htpasswd file for HTTP Basic Authentication for special-case
@@ -109,6 +102,13 @@ Object Naming
         The public certificate we manage external to wallet since it
         doesn't need to be protected or encrypted.
 
+    <group>-<service>-db-<name>
+
+        Stores the database password for the database named <name>.  This
+        may be a file containing only the database password or a Perl
+        AppConfig configuration file with the database connection
+        information including the password.
+
     <group>-<service>-gpg-key
 
         Stores the GnuPG private key for a service that needs to do GnuPG
@@ -122,6 +122,13 @@ Object Naming
         sometimes it's too hard to separate out chunks of a properties
         file.
 
+    <group>-<service>-puppetconf
+
+        A puppet.conf configuration file for Puppet that contains some
+        secure data (such as SSL key passwords or database passwords).
+        Ideally the secure data should be stored in separate files, but
+        Puppet likes to use a single configuration file.
+
     <group>-<service>-shibboleth
 
         The shibboleth.xml configuration file for a service, when it