From 48c35eb9ddfae29d181757b73713d508127faea8 Mon Sep 17 00:00:00 2001
From: Evan Broder <broder@mit.edu>
Date: Wed, 29 Oct 2008 00:00:16 -0400
Subject: [PATCH] In invirt-vnc-server, deprecate /etc/invirt/secrets in favor
 of /etc/invirt/vnc

svn path=/trunk/packages/invirt-vnc-server/; revision=1414
---
 debian/changelog                  |    6 ++++++
 debian/invirt-vnc-server.postinst |   16 ++++++++--------
 invirt-vnc-getcert                |    2 +-
 python/vnc/extauth.py             |    2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a08c903..2a4ca80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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
 
   * Fix a typo in the new init script
diff --git a/debian/invirt-vnc-server.postinst b/debian/invirt-vnc-server.postinst
index 12f3616..f30b573 100755
--- a/debian/invirt-vnc-server.postinst
+++ b/debian/invirt-vnc-server.postinst
@@ -20,18 +20,18 @@ set -e
 
 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
     ;;
 
diff --git a/invirt-vnc-getcert b/invirt-vnc-getcert
index 11b62c8..f0e14e8 100755
--- a/invirt-vnc-getcert
+++ b/invirt-vnc-getcert
@@ -3,6 +3,6 @@
 import sys
 
 try:
-    print open('/etc/invirt/secrets/vnc.crt').read()
+    print open('/etc/invirt/vnc/server.crt').read()
 except IOError, e:
     sys.exit(e.errno)
diff --git a/python/vnc/extauth.py b/python/vnc/extauth.py
index a2cd570..a01a858 100644
--- a/python/vnc/extauth.py
+++ b/python/vnc/extauth.py
@@ -20,7 +20,7 @@ import socket
 import time
 
 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):
     import get_port
-- 
1.7.9.5