From: Andrew DeFaria Date: Tue, 4 Aug 2015 19:49:35 +0000 (-0700) Subject: Merge branch 'master' of /opt/git/clearscm X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=741c2b2cf2529abe150429f0f9ccd5f4f9b19c90;hp=f98faaaed013f662649e50096c2943399d4c2a53;p=clearscm.git Merge branch 'master' of /opt/git/clearscm Conflicts: web/Resumes/Andrew/index.php --- diff --git a/bin/bice.pl b/bin/bice.pl index 491a304..4f3073a 100755 --- a/bin/bice.pl +++ b/bin/bice.pl @@ -178,7 +178,7 @@ sub SendEmail ($$$$$) { mail ( from => "BICE\@$domain", to => $to, - cc => $contact, + #cc => $contact, subject => $subject, mode => 'html', data => $message, diff --git a/clearadm/etc/clearadm.conf b/clearadm/etc/clearadm.conf index 4bd38f3..e9d7d44 100644 --- a/clearadm/etc/clearadm.conf +++ b/clearadm/etc/clearadm.conf @@ -11,7 +11,7 @@ # (c) Copyright 2010, ClearSCM, Inc., all rights reserved # ############################################################################### -CLEARADM_SERVER: localhost +CLEARADM_SERVER: earth CLEARADM_PORT: 25327 CLEARADM_LOADAVG_THRESHOLD: 5.00 CLEARADM_USERNAME: clearwriter @@ -20,4 +20,4 @@ CLEARADM_BASE: /opt/clearscm/clearadm CLEARADM_LOGDIR: $CLEARADM_BASE/log CLEARADM_RUNDIR: $CLEARADM_BASE/var/run CLEARADM_WEBBASE: http://$CLEARADM_SERVER/clearadm -CLEARADM_NOTIFY: Andrew@DeFaria.com \ No newline at end of file +CLEARADM_NOTIFY: Andrew@DeFaria.com