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.65 by arta, Fri Oct 21 21:53:33 2016 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 65 | Line 67 | a:RS_DBPORT
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
70 > a:RS_DLTIMEOUT                          120
71 > a:RS_REQTIMEOUT                         300
72 > a:RS_MAXTHREADS                         216
73   q:RS_BINPATH                            /home/jsoc/cvs/Development/JSOC/bin/linux_x86_64
74 + a:RS_N_WORKERS                          4
75 + q:RS_TMPDIR                             /tmp
76 + a:RS_SCP_MAXSUS                         48
77 + a:RS_SCP_MAXPAYLOAD                     512
78 + a:RS_SCP_TIMEOUT                        2
79   # White-list (access to internal stuff)
80   a:WL_HASWL                              1
81   q:WL_FILE                               /web/jsoc/htdocs/whitelist.txt
82   # Bin paths
83 < q:BIN_PY                                /home/jsoc/bin/linux_x86_64/activepython
83 > q:BIN_EXPORT                            /home/jsoc/cvs/Development/JSOC/bin
84 > q:SCRIPTS_EXPORT                        /home/jsoc/cvs/Development/JSOC/scripts
85 > q:BIN_PY                                /home/jsoc/bin/linux_x86_64/activepython27
86 > q:BIN_PY3                               /home/jsoc/anaconda3/bin/python3
87 > a:SUMS_USEMTSUMS                        1
88 > a:SUMS_USEMTSUMS_INFO                   1
89 > # Email registration
90 > a:REGEMAIL_TIMEOUT                      5
91 > # Slony
92 > q:SLONY_CONFIG                          /home/jsoc/cvs/Development/JSOC/proj/replication/etc/repserver.cfg
93 >
94 > # lev1.5_hmi
95 > q:POLCAL_PARAMS                         /home/jsoc/hmi/tables/lev15/polcal-param-fit.bin
96  
97   __MAKE__
98   # JSOC_SDP third-party libraries used by base
# Line 199 | Line 218 | endif
218   _ENDCUST_
219  
220   __PROJ_MK_RULES__
221 < $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBSUM) $(LIBDSTRUCT)
222 < $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBSUM)
221 > $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM) $(LIBDSTRUCT)
222 > $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM)
223  
224   $(MODEXEDROBJ):                 CF_TGT := $(CF_TGT) -I$(SRCDIR)/proj/libs/dr
225   $(MODEXEDR) $(MODEXEDR_SOCK):   $(LIBDR)
# Line 218 | Line 237 | __PROJ__
237               <subdir>stats</subdir>
238               <subdir>egsehmicomp</subdir>
239               <subdir>imrotate</subdir>
240 +             <subdir>projection</subdir>
241         </subdirs>
242     </proj>
243     <proj>
# Line 370 | Line 390 | __PROJ__
390     <proj>
391          <name>mag</name>
392          <subdirs>
373             <subdir>apps</subdir>
393               <subdir>pfss/apps</subdir>
394               <subdir>ambig/apps</subdir>
395               <subdir>harp/apps</subdir>
# Line 384 | Line 403 | __PROJ__
403               <subdir>ident/libs/mex2c</subdir>
404               <subdir>ident/libs/mexfunctions</subdir>
405               <subdir>ident/libs/util</subdir>
406 +             <subdir>libs</subdir>
407 +             <subdir>libs/util</subdir>
408               <subdir>patch/apps</subdir>
409               <subdir>nlfff/apps</subdir>
410               <subdir>d4vm/apps</subdir>
411               <subdir>remapmags/apps</subdir>
412               <subdir>synop/apps</subdir>
413 +             <subdir>polarfield/apps</subdir>
414          </subdirs>
415          <filters>
416               <filter>
# Line 426 | Line 448 | __PROJ__
448          <subdirs>
449               <subdir>apps</subdir>
450               <subdir>lorentz/apps</subdir>
451 +             <subdir>pdfi/apps</subdir>
452          </subdirs>
453          <filters>
454               <filter>
# Line 438 | Line 461 | __PROJ__
461   __PROJCFG__
462   #! /bin/csh -f
463  
464 < # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
442 < # directory).
464 > set PERLBIN = ""
465  
466 < 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" \;
466 > if ($PERLBIN == "") then
467 >    if (-x /home/jsoc/bin/linux_x86_64/activeperl) then
468 >        set PERLBIN = "/home/jsoc/bin/linux_x86_64/activeperl"
469 >    else
470 >        set PERLBIN = "perl"
471 >    endif
472 > endif
473  
474 + # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
475 + # directory).
476 + 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