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

Comparing configsdp.txt (file contents):
Revision 1.44 by arta, Thu Oct 2 19:14:34 2014 UTC vs.
Revision 1.52 by arta, Tue Aug 25 18:47:27 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              6004
26   a:DRMS_LOCAL_SITE_CODE          0x0000
27   q:DBNAME                        jsoc
28   q:WEB_DBUSER                    apache
# Line 29 | Line 31 | q:SUMS_MANAGER                  producti
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 73 | Line 75 | q:RS_BINPATH
75   a:WL_HASWL                              1
76   q:WL_FILE                               /web/jsoc/htdocs/whitelist.txt
77   # Bin paths
78 < q:BIN_PY                                /home/jsoc/bin/linux_x86_64/activepython
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                        1
82 > # Email registration
83 > a:REGEMAIL_TIMEOUT                      5
84 > # Slony
85 > q:SLONY_CONFIG                          /home/jsoc/cvs/Development/JSOC/proj/replication/etc/repserver.cfg
86  
87   __MAKE__
88   # JSOC_SDP third-party libraries used by base
# Line 188 | Line 197 | TAR_LIBS:IA32           /home/jsoc/lib/l
197   TAR_LIBS:AVX            /home/jsoc/lib/linux_avx
198   TAR_LIBS:IA64           /home/jsoc/lib/linux-ia64
199  
200 + PY_LIB                  python3.4m
201 + PY_INCS:X86_64          /home/jsoc/ActiveStatePy/linux_x86_64/ActivePython-3.4/include/python3.4m
202 + PY_INCS:AVX             /home/jsoc/ActiveStatePy/linux_avx/ActivePython-3.4/include/python3.4m
203 + PY_LIBS:X86_64          /home/jsoc/ActiveStatePy/linux_x86_64/ActivePython-3.4/lib
204 + PY_LIBS:AVX             /home/jsoc/ActiveStatePy/linux_avx/ActivePython-3.4/lib
205 + PY_HOME:X86_64          /home/jsoc/ActiveStatePy/linux_x86_64/ActivePython-3.4
206 + PY_HOME:AVX             /home/jsoc/ActiveStatePy/linux_avx/ActivePython-3.4
207 +
208   # Set custom make file to tell the make system that the gcc cfitsio library is called
209   # libcfitsio_gcc.a
210   _CUST_
# Line 199 | Line 216 | endif
216   _ENDCUST_
217  
218   __PROJ_MK_RULES__
219 < $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBSUM) $(LIBDSTRUCT)
220 < $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBSUM)
219 > $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM) $(LIBDSTRUCT)
220 > $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM)
221  
222   $(MODEXEDROBJ):                 CF_TGT := $(CF_TGT) -I$(SRCDIR)/proj/libs/dr
223   $(MODEXEDR) $(MODEXEDR_SOCK):   $(LIBDR)
# Line 438 | Line 455 | __PROJ__
455   __PROJCFG__
456   #! /bin/csh -f
457  
458 < # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
442 < # directory).
458 > set PERLBIN = ""
459  
460 < 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" \;
460 > if ($PERLBIN == "") then
461 >    if (-x /home/jsoc/bin/linux_x86_64/activeperl) then
462 >        set PERLBIN = "/home/jsoc/bin/linux_x86_64/activeperl"
463 >    else
464 >        set PERLBIN = "perl"
465 >    endif
466 > endif
467  
468 + # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
469 + # directory).
470 + 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