Removed invirt-web-afs-apache

svn path=/trunk/packages/hvirt-config/; revision=2920

diff --git a/debian/changelog b/debian/changelog
index 79231ae..3c8038e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hvirt-config (0.0.15) unstable; urgency=low
+
+  * Added vnc conf line
+
+ -- Greg Brockman <gdb@mit.edu>  Tue, 19 Jan 2010 02:45:33 -0500
+
 hvirt-config (0.0.14) unstable; urgency=low
 
   * Fixed install line to install k5login into /root.

diff --git a/dev/master.yaml b/dev/master.yaml
index 6e989c5..b42847d 100644 (file)
--- a/dev/master.yaml
+++ b/dev/master.yaml
@@ -1,4 +1,4 @@
-contact: &contact hvirt@hcs.harvard..edu
+contact: &contact hvirt@hcs.harvard.edu
 console:
  hostname: hvirt-console-dev.hcs.harvard.edu
  ip: 140.247.89.175
@@ -18,6 +18,7 @@ hosts:
 
 kerberos:
  realm: HCS.HARVARD.EDU
+ keytab: /etc/invirt/keytab
 
 remote:
  hostname: hvirt-remote-dev.hcs.harvard.edu
@@ -27,6 +28,37 @@ svn:
  uri: https://xvm.mit.edu:1111
 
 web:
+ sites:
+  certs:
+   port: 443
+   suffix: "MIT.EDU"
+  cas:
+   login: https://secure.hcs.harvard.edu/login
+   validate: https://secure.hcs.harvard.edu/serviceValidate
+   authname: "HCS CAS Login"
+   port: 444
+  noauth:
+   port: 445
+  svn:
+   repopath: /home
+   authname: "testing"
+   port: 1111
+   alias: foo
+   localpath: /home
+ ssl:
+  rewriterules:
+    - rule: apt
+      target: '-'
+      type: L
+  redirects:
+    - rule: wiki
+      target: trac
+  cert: ssl/server.crt
+  key: ssl/server.key
+  ca: /etc/ssl/certs/hcs.ca
+ mods: rewrite
+       ssl
+       auth_cas
  baseuri: https://hvirt-dev.hcs.harvard.edu/
  hostname: hvirt-dev.hcs.harvard.edu
  errormail: *contact
@@ -39,3 +71,7 @@ network:
 
 lvm:
  vg: root
+
+vnc:
+ base_port: 10003
+ proxy_ip: 140.247.89.175