freeze: use rmdom and revoke instead of rmuser

Just revoke access to domains, no need to totally purge domtool
cert/key for user when freezing.

diff --git a/freeze b/freeze
index 6a6a741..65e1f37 100755 (executable)
--- a/freeze
+++ b/freeze
@@ -279,17 +279,14 @@ sub domtool {
                        # As per adamc's suggestion, I should not be
                        # running rmdom explicitly.
                        # https://bugzilla.hcoop.net/show_bug.cgi?id=555
-                       #if (!DRY) {
-                       #       system("domtool-admin rmdom $_")
-                       #} else {
-                       #       warn qq|system("domtool-admin rmdom $_")\n|
-                       #}
-               }
-
-               if (!DRY) {
-                       system("domtool-rmuser $u")
-               } else {
-                       warn qq|system("domtool-rmuser $u")\n|
+                       # adam was wrong, rmuser is too broad. rmdom + revoke
+                       if (!DRY) {
+                           system("domtool-admin rmdom $_");
+                           system("domtool-admin revoke $u domain $_");
+                       } else {
+                           warn qq|system("domtool-admin rmdom $_")\n|;
+                           warn qq|system("domtool-admin revoke $u domain $_")\n|
+                       }
                }
 
                push @{ $$store{$u}{modules} }, 'domtool';
@@ -297,9 +294,9 @@ sub domtool {
 
        elsif ($a =~ /^u/i) {
                if (!DRY) {
-                       system("ssh -K deleuze domtool-adduser $u")
+                       system("domtool-adduser $u")
                } else {
-                       warn qq|system("ssh -K deleuze domtool-adduser $u")\n|
+                       warn qq|system("domtool-adduser $u")\n|
                }
 
                for ( @{ $$store{$u}{domains} } ) {