Index: trunk/packages/invirt-vnc-server/debian/changelog
===================================================================
--- trunk/packages/invirt-vnc-server/debian/changelog	(revision 1413)
+++ trunk/packages/invirt-vnc-server/debian/changelog	(revision 1414)
@@ -1,2 +1,8 @@
+invirt-vnc-server (0.0.4) unstable; urgency=low
+
+  * Deprecate /etc/invirt/secrets in favor of /etc/invirt/vnc
+
+ -- Evan Broder <broder@mit.edu>  Tue, 28 Oct 2008 23:58:37 -0400
+
 invirt-vnc-server (0.0.3) unstable; urgency=low
 
Index: trunk/packages/invirt-vnc-server/debian/invirt-vnc-server.postinst
===================================================================
--- trunk/packages/invirt-vnc-server/debian/invirt-vnc-server.postinst	(revision 1413)
+++ trunk/packages/invirt-vnc-server/debian/invirt-vnc-server.postinst	(revision 1414)
@@ -21,16 +21,16 @@
 case "$1" in
     configure)
-        mkdir -p /etc/invirt/secrets
-        if ! [ -e /etc/invirt/secrets/vnc.pem ]; then
-            openssl genrsa -out /etc/invirt/secrets/vnc.pem 1024 >/dev/null
+        mkdir -p /etc/invirt/vnc
+        if ! [ -e /etc/invirt/vnc/server.pem ]; then
+            openssl genrsa -out /etc/invirt/vnc/server.pem 1024 >/dev/null
         fi
         
-        if ! [ -e /etc/invirt/secrets/vnc.crt ]; then
-            openssl req -new -x509 -nodes -sha1 -subj '/' -key /etc/invirt/secrets/vnc.pem \
-                > /etc/invirt/secrets/vnc.crt
+        if ! [ -e /etc/invirt/vnc/server.crt ]; then
+            openssl req -new -x509 -nodes -sha1 -subj '/' -key /etc/invirt/vnc/server.pem \
+                > /etc/invirt/vnc/server.crt
         fi
         
-        if ! [ -e /etc/invirt/secrets/vnc-key ]; then
-            openssl rand -base64 33 >/etc/invirt/secrets/vnc-key
+        if ! [ -e /etc/invirt/vnc/token-key ]; then
+            openssl rand -base64 33 >/etc/invirt/vnc/token-key
         fi
     ;;
Index: trunk/packages/invirt-vnc-server/invirt-vnc-getcert
===================================================================
--- trunk/packages/invirt-vnc-server/invirt-vnc-getcert	(revision 1413)
+++ trunk/packages/invirt-vnc-server/invirt-vnc-getcert	(revision 1414)
@@ -4,5 +4,5 @@
 
 try:
-    print open('/etc/invirt/secrets/vnc.crt').read()
+    print open('/etc/invirt/vnc/server.crt').read()
 except IOError, e:
     sys.exit(e.errno)
Index: trunk/packages/invirt-vnc-server/python/vnc/extauth.py
===================================================================
--- trunk/packages/invirt-vnc-server/python/vnc/extauth.py	(revision 1413)
+++ trunk/packages/invirt-vnc-server/python/vnc/extauth.py	(revision 1414)
@@ -21,5 +21,5 @@
 
 def getTokenKey():
-    return file('/etc/invirt/secrets/vnc-key').read().strip()
+    return file('/etc/invirt/vnc/token-key').read().strip()
 
 def getPort(name, auth_data):