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

Comparing configsdp.txt (file contents):
Revision 1.40 by arta, Mon Aug 25 18:32:31 2014 UTC vs.
Revision 1.60 by arta, Mon Aug 1 15:07:10 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
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 67 | Line 66 | q:RS_DBHOST
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 < a:RS_BINPATH                            /home/jsoc/cvs/Development/JSOC/bin/linux_x86_64
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 > # White-list (access to internal stuff)
77 > a:WL_HASWL                              1
78 > q:WL_FILE                               /web/jsoc/htdocs/whitelist.txt
79 > # Bin paths
80 > q:BIN_EXPORT                            /home/jsoc/cvs/Development/JSOC/bin
81 > q:SCRIPTS_EXPORT                        /home/jsoc/cvs/Development/JSOC/scripts
82 > q:BIN_PY                                /home/jsoc/bin/linux_x86_64/activepython27
83 > a:SUMS_USEMTSUMS                        1
84 > # Email registration
85 > a:REGEMAIL_TIMEOUT                      5
86 > # Slony
87 > q:SLONY_CONFIG                          /home/jsoc/cvs/Development/JSOC/proj/replication/etc/repserver.cfg
88 >
89 > # lev1.5_hmi
90 > q:POLCAL_PARAMS                         /home/jsoc/hmi/tables/lev15/polcal-param-fit.bin
91  
92   __MAKE__
93   # JSOC_SDP third-party libraries used by base
# Line 195 | Line 213 | endif
213   _ENDCUST_
214  
215   __PROJ_MK_RULES__
216 < $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBSUM) $(LIBDSTRUCT)
217 < $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBSUM)
216 > $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM) $(LIBDSTRUCT)
217 > $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM)
218  
219   $(MODEXEDROBJ):                 CF_TGT := $(CF_TGT) -I$(SRCDIR)/proj/libs/dr
220   $(MODEXEDR) $(MODEXEDR_SOCK):   $(LIBDR)
# Line 214 | Line 232 | __PROJ__
232               <subdir>stats</subdir>
233               <subdir>egsehmicomp</subdir>
234               <subdir>imrotate</subdir>
235 +             <subdir>projection</subdir>
236         </subdirs>
237     </proj>
238     <proj>
# Line 366 | Line 385 | __PROJ__
385     <proj>
386          <name>mag</name>
387          <subdirs>
369             <subdir>apps</subdir>
388               <subdir>pfss/apps</subdir>
389               <subdir>ambig/apps</subdir>
390               <subdir>harp/apps</subdir>
# Line 380 | Line 398 | __PROJ__
398               <subdir>ident/libs/mex2c</subdir>
399               <subdir>ident/libs/mexfunctions</subdir>
400               <subdir>ident/libs/util</subdir>
401 +             <subdir>libs</subdir>
402 +             <subdir>libs/util</subdir>
403               <subdir>patch/apps</subdir>
404               <subdir>nlfff/apps</subdir>
405               <subdir>d4vm/apps</subdir>
406               <subdir>remapmags/apps</subdir>
407               <subdir>synop/apps</subdir>
408 +             <subdir>polarfield/apps</subdir>
409          </subdirs>
410          <filters>
411               <filter>
# Line 422 | Line 443 | __PROJ__
443          <subdirs>
444               <subdir>apps</subdir>
445               <subdir>lorentz/apps</subdir>
446 +             <subdir>pdfi/apps</subdir>
447          </subdirs>
448          <filters>
449               <filter>
# Line 434 | Line 456 | __PROJ__
456   __PROJCFG__
457   #! /bin/csh -f
458  
459 < # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
438 < # directory).
459 > set PERLBIN = ""
460  
461 < 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" \;
461 > if ($PERLBIN == "") then
462 >    if (-x /home/jsoc/bin/linux_x86_64/activeperl) then
463 >        set PERLBIN = "/home/jsoc/bin/linux_x86_64/activeperl"
464 >    else
465 >        set PERLBIN = "perl"
466 >    endif
467 > endif
468  
469 + # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
470 + # directory).
471 + 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