Merge branch 'master' of defaria.com:/opt/git/clearscm

Conflicts:
	clearadm/etc/conf.d/clearadm.conf

diff --git a/bin/rexec b/bin/rexec
index 7f73760..48dea14 100755 (executable)
--- a/bin/rexec
+++ b/bin/rexec
@@ -80,7 +80,7 @@ sub Interrupted {
 
   display BLUE . "\nInterrupted execution on $currentHost" . RESET;
 
-  Stats \%total, $log;
+  Stats \%total;
 
   display_nolf "Executing on " . YELLOW . $currentHost . RESET . " - "
     . GREEN     . BOLD . "S" . RESET . GREEN    . "kip"         . RESET . ", "
@@ -109,7 +109,7 @@ sub Interrupted {
     $total{Skips}++;
   } elsif ($answer eq "a") {
     display RED . "Aborting run". RESET;
-    Stats \%total, $log;
+    Stats \%total;
     exit;
   } else {
     display "Continuing...";

diff --git a/clearadm/etc/conf.d/clearadm.conf b/clearadm/etc/conf.d/clearadm.conf
new file mode 100644 (file)
index 0000000..38ef606
--- /dev/null
+++ b/clearadm/etc/conf.d/clearadm.conf
@@ -0,0 +1,25 @@
+###############################################################################
+#
+# File:         $RCSfile: clearadm,v $
+# Revision:     $Revision: 1.3 $
+# Description:  Apache config file for Clearadm
+# Author:       Andrew@ClearSCM.com
+# Created:      Wed Dec 15 18:43:12 EST 2010
+# Modified:     $Date: 2011/05/26 05:48:43 $
+# Language:     Apache conf
+#
+# (c) Copyright 2010, ClearSCM, Inc., all rights reserved
+#
+###############################################################################
+Alias /clearadm /opt/clearscm/clearadm
+ 
+<Directory "/opt/clearscm/clearadm">
+  Options Indexes FollowSymLinks ExecCGI
+  AllowOverride None
+  Order allow,deny
+  Allow from all
+  Require all granted
+  DirectoryIndex index.cgi index.html
+</Directory>
+
+AddHandler cgi-script .cgi