Changeset 1836 for trunk

Timestamp:

Dec 10, 2008, 11:21:24 PM (16 years ago)

Author:

broder

Message:

config.{authn[0] => kerberos}.realm

Location:

trunk/packages

Files:

• invirt-base/debian/changelog (modified) (1 diff)
• invirt-base/scripts/invirt-getconf (modified) (1 diff)
• invirt-console/debian/changelog (modified) (1 diff)
• invirt-console/host/usr/sbin/invirt-update-conserver (modified) (1 diff)
• invirt-console/server/etc/remctl/acl/invirt-console-server.mako (modified) (1 diff)
• invirt-console/server/usr/bin/invirt-consolefs (modified) (1 diff)
• invirt-remote/debian/changelog (modified) (1 diff)
• invirt-remote/host/etc/remctl/acl/remote.mako (modified) (1 diff)
• invirt-remote/server/etc/remctl/acl/web.mako (modified) (1 diff)
• invirt-remote/server/usr/sbin/invirt-remconffs (modified) (1 diff)
• invirt-web/code/main.py (modified) (1 diff)
• invirt-web/debian/changelog (modified) (1 diff)
• invirt-web/files/etc/apache2/sites-available/ssl.mako (modified) (1 diff)

trunk/packages/invirt-base/debian/changelog

@@ +1 @@
+invirt-base (0.0.16) unstable; urgency=low
+
+  * Don't reference a config field that we no longer use
+
+ -- Evan Broder <broder@mit.edu>  Wed, 10 Dec 2008 23:04:58 -0500
+
 invirt-base (0.0.15) unstable; urgency=low
 

trunk/packages/invirt-base/scripts/invirt-getconf

@@ -14 +14 @@
 
   invirt-getconf db.uri
-  invirt-getconf authn.0.type
+  invirt-getconf hosts.0.ip
 """
 

trunk/packages/invirt-console/debian/changelog

@@ +1 @@
+invirt-console (0.2.4) unstable; urgency=low
+
+  * config.{authn[0] => kerberos}.realm
+
+ -- Evan Broder <broder@mit.edu>  Wed, 10 Dec 2008 23:06:24 -0500
+
 invirt-console (0.2.3) unstable; urgency=low
 

trunk/packages/invirt-console/host/usr/sbin/invirt-update-conserver

@@ -19 +19 @@
 if __name__ == '__main__':
     hostname = socket.getfqdn().lower()
-    realm = config.authn[0].realm
+    realm = config.kerberos.realm
     principal = 'host/'+hostname+'@'+realm
     conftext = '\n'.join('console %s { master %s; }' % (vm, hostname)

trunk/packages/invirt-console/server/etc/remctl/acl/invirt-console-server.mako

@@ -1 +1 @@
 <% from invirt.config import structs as cfg %>\
 % for h in cfg.hosts:
-host/${h.hostname}@${cfg.authn[0].realm}
+host/${h.hostname}@${cfg.kerberos.realm}
 % endfor

trunk/packages/invirt-console/server/usr/bin/invirt-consolefs

@@ -86 +86 @@
         else:
             princ = user
-            realm = config.authn[0].realm
+            realm = config.kerberos.realm
         
         return princ.replace('.', '/') + '@' + realm

trunk/packages/invirt-remote/debian/changelog

@@ +1 @@
+invirt-remote (0.2.2) unstable; urgency=low
+
+  * config.{authn[0] => kerberos}.realm
+
+ -- Evan Broder <broder@mit.edu>  Wed, 10 Dec 2008 23:18:45 -0500
+
 invirt-remote (0.2.1) unstable; urgency=low
 

trunk/packages/invirt-remote/host/etc/remctl/acl/remote.mako

@@ -1 +1 @@
 <% from invirt.config import structs as cfg %>\
-host/${cfg.remote.hostname}@${cfg.authn[0].realm}
+host/${cfg.remote.hostname}@${cfg.kerberos.realm}

trunk/packages/invirt-remote/server/etc/remctl/acl/web.mako

@@ -1 +1 @@
 <% from invirt.config import structs as cfg %>\
-daemon/${cfg.web.hostname}@${cfg.authn[0].realm}\
+daemon/${cfg.web.hostname}@${cfg.kerberos.realm}\

trunk/packages/invirt-remote/server/usr/sbin/invirt-remconffs

@@ -80 +80 @@
         else:
             princ = user
-            realm = config.authn[0].realm
+            realm = config.kerberos.realm
         
         return princ.replace('.', '/') + '@' + realm

trunk/packages/invirt-web/code/main.py

@@ -682 +682 @@
     if environ.get('AUTH_TYPE') == 'Negotiate':
         # Convert the krb5 principal into a krb4 username
-        if not user.endswith('@%s' % config.authn[0].realm):
+        if not user.endswith('@%s' % config.kerberos.realm):
             return
         else:

trunk/packages/invirt-web/debian/changelog

@@ +1 @@
+invirt-web (0.0.15) unstable; urgency=low
+
+  * config.{authn[0] => kerberos}.realm
+
+ --
+
 invirt-web (0.0.14) unstable; urgency=low
 

trunk/packages/invirt-web/files/etc/apache2/sites-available/ssl.mako

@@ -76 +76 @@
                 KrbMethodK5Passwd off
                 KrbAuthoritative off
-                KrbAuthRealms ${cfg.authn[0].realm}
+                KrbAuthRealms ${cfg.kerberos.realm}
                 Krb5Keytab /etc/invirt/keytab
                 KrbSaveCredentials off