ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/JSOC/configsdp.txt
(Generate patch)

Comparing configsdp.txt (file contents):
Revision 1.39 by arta, Wed Aug 13 19:13:56 2014 UTC vs.
Revision 1.50 by arta, Wed May 20 20:43:05 2015 UTC

# Line 21 | Line 21 | q:SERVER                        hmidb
21   q:DRMSPGPORT                    5432
22   q:SUMS_DB_HOST                  hmidb3
23   q:SUMPGPORT                     5434
24 + a:SUMSD_MAX_THREADS             32
25 + a:SUMSD_LISTENPORT              6002
26   a:DRMS_LOCAL_SITE_CODE          0x0000
27   q:DBNAME                        jsoc
28 <
28 > q:WEB_DBUSER                    apache
29   q:POSTGRES_ADMIN                postgres
30   q:SUMS_MANAGER                  production
29 # This seems like a bad idea to make the UID a parameter. Why not just convert the SUM_MANAGER value
30 # to a UID when needed? If the UID of the SUM_MANAGER changes, we have to change the UID here.
31 q:SUMS_MANAGER_UID              388
31   q:SUMS_GROUP                    SOI
32   q:SUMLOG_BASEDIR                /usr/local/logs/SUM
33   q:SUMBIN_BASEDIR                /usr/local/bin
34 < q:SUMSERVER                     k1
34 > q:SUMSERVER                     k1.stanford.edu
35   # The number of SUMS process SETS to spawn. If this number is not 1, then the number of SUMS processes
36   # is SUM_NUMSUM * 5 + 2.
37   a:SUM_NUMSUM                    3
# Line 65 | Line 64 | q:RS_SU_TABLE
64   q:RS_DBNAME                             jsoc
65   q:RS_DBHOST                             hmidb
66   a:RS_DBPORT                             5432
67 + q:RS_DBUSER                             production
68   q:RS_LOCKFILE                           /home/jsoc/locks/remotesums.lck
69 + q:RS_LOGDIR                             /home/jsoc/jsoclogs/rsums
70 + a:RS_DLTIMEOUT                          30
71 + a:RS_REQTIMEOUT                          5
72 + a:RS_MAXTHREADS                         32
73 + q:RS_BINPATH                            /home/jsoc/cvs/Development/JSOC/bin/linux_x86_64
74 + # White-list (access to internal stuff)
75 + a:WL_HASWL                              1
76 + q:WL_FILE                               /web/jsoc/htdocs/whitelist.txt
77 + # Bin paths
78 + q:BIN_EXPORT                            /home/jsoc/cvs/Development/JSOC/bin
79 + q:SCRIPTS_EXPORT                        /home/jsoc/cvs/Development/JSOC/scripts
80 + q:BIN_PY                                /home/jsoc/bin/linux_x86_64/activepython27
81 + a:SUMS_USEMTSUMS                        0
82 + # Email registration
83 + a:REGEMAIL_TIMEOUT                      5
84  
85   __MAKE__
86   # JSOC_SDP third-party libraries used by base
# Line 180 | Line 195 | TAR_LIBS:IA32           /home/jsoc/lib/l
195   TAR_LIBS:AVX            /home/jsoc/lib/linux_avx
196   TAR_LIBS:IA64           /home/jsoc/lib/linux-ia64
197  
198 + PY_LIB                  python3.4m
199 + PY_INCS:X86_64          /home/jsoc/ActiveStatePy/linux_x86_64/ActivePython-3.4/include/python3.4m
200 + PY_INCS:AVX             /home/jsoc/ActiveStatePy/linux_avx/ActivePython-3.4/include/python3.4m
201 + PY_LIBS:X86_64          /home/jsoc/ActiveStatePy/linux_x86_64/ActivePython-3.4/lib
202 + PY_LIBS:AVX             /home/jsoc/ActiveStatePy/linux_avx/ActivePython-3.4/lib
203 + PY_HOME:X86_64          /home/jsoc/ActiveStatePy/linux_x86_64/ActivePython-3.4
204 + PY_HOME:AVX             /home/jsoc/ActiveStatePy/linux_avx/ActivePython-3.4
205 +
206 +
207   # Set custom make file to tell the make system that the gcc cfitsio library is called
208   # libcfitsio_gcc.a
209   _CUST_
# Line 430 | Line 454 | __PROJ__
454   __PROJCFG__
455   #! /bin/csh -f
456  
457 < # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
434 < # directory).
457 > set PERLBIN = ""
458  
459 < find ../proj/lev0/scripts -mindepth 1 \( -path \*CVS -prune -o -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \;
459 > if ($PERLBIN == "") then
460 >    if (-x /home/jsoc/bin/linux_x86_64/activeperl) then
461 >        set PERLBIN = "/home/jsoc/bin/linux_x86_64/activeperl"
462 >    else
463 >        set PERLBIN = "perl"
464 >    endif
465 > endif
466  
467 + # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
468 + # directory).
469 + find ../proj/lev0/scripts -mindepth 1 -path \*CVS -prune -o -print | ${PERLBIN} -MFile::Basename -n -e 'my($bn) = basename($_); chomp($bn); my($path) = $_; chomp($path); if (!(-e $bn)) { `ln -s $_`; if ($? >> 8 == 0) { print "   " . $path . " OK\n"; } else { print "   " . $path . " ERROR - could not create link\n"; } }'

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines