Changes by docelic.

diff --git a/apache-sync-logs b/apache-sync-logs
index 3f83088..f5ee0ad 100755 (executable)
--- a/apache-sync-logs
+++ b/apache-sync-logs
@@ -31,17 +31,26 @@ for A in $(find $LOCAL_LOG_DIR -mindepth 3 -maxdepth 3 -print); do
 
     # Skip deleted or empty log directories
     if test ! -d "$LOG_SRC" || ! ls "$LOG_SRC"/*/*/*.log >/dev/null 2>&1; then
 
     # Skip deleted or empty log directories
     if test ! -d "$LOG_SRC" || ! ls "$LOG_SRC"/*/*/*.log >/dev/null 2>&1; then

+        if test "$VERBOSE" = "true"; then
+               echo "Skipping $USER (deleted or empty log dir $LOG_SRC)"
+        fi

         continue
     fi
 
     # Skip people who have unreadable log subdirectories
     if test -d "$USER_HOME/.logs" && \
         ! ls "$USER_HOME/.logs" >/dev/null 2>&1; then
         continue
     fi
 
     # Skip people who have unreadable log subdirectories
     if test -d "$USER_HOME/.logs" && \
         ! ls "$USER_HOME/.logs" >/dev/null 2>&1; then

+        if test "$VERBOSE" = "true"; then
+               echo "Skipping $USER (unreadable log dir $USER_HOME/.logs)"
+        fi

         continue
     fi
 
     # Skip people who do not have keytabs
     if test ! -f "$KEYTAB_DIR/$USER"; then
         continue
     fi
 
     # Skip people who do not have keytabs
     if test ! -f "$KEYTAB_DIR/$USER"; then

+        if test "$VERBOSE" = "true"; then
+               echo "Skipping $USER (missing keytab $KEYTAB_DIR/$USER)"
+        fi

         continue
     fi
 
         continue
     fi
 

diff --git a/freeze b/freeze
index 2fb6ccd..660619a 100755 (executable)
--- a/freeze
+++ b/freeze
@@ -285,21 +285,21 @@ sub domtool {
                        #}
                }
 
                        #}
                }
 

-                       if (!DRY) {
-                               system("domtool-rmuser $_")
-                       } else {
-                               warn qq|system("domtool-rmuser $_")\n|
-                       }
+               if (!DRY) {
+                       system("domtool-rmuser $u")
+               } else {
+                       warn qq|system("domtool-rmuser $u")\n|
+               }

 
                push @{ $$store{$u}{modules} }, 'domtool';
        }
 
        elsif ($a =~ /^u/i) {
 
                push @{ $$store{$u}{modules} }, 'domtool';
        }
 
        elsif ($a =~ /^u/i) {

-                       if (!DRY) {
-                               system("domtool-adduser $_")
-                       } else {
-                               warn qq|system("domtool-adduser $_")\n|
-                       }
+               if (!DRY) {
+                       system("domtool-adduser $u")
+               } else {
+                       warn qq|system("domtool-adduser $u")\n|
+               }

 
                for ( @{ $$store{$u}{domains} } ) {
                        if (!DRY) {
 
                for ( @{ $$store{$u}{domains} } ) {
                        if (!DRY) {