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

Comparing configsdp.txt (file contents):
Revision 1.42 by arta, Thu Sep 11 16:54:15 2014 UTC vs.
Revision 1.58 by arta, Thu Jun 16 16:39:28 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 75 | Line 74 | q:RS_BINPATH
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                        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 + # lev1.5_hmi
88 + q:POLCAL_PARAMS                         /home/jsoc/hmi/tables/lev15/polcal-param-fit.bin
89  
90   __MAKE__
91   # JSOC_SDP third-party libraries used by base
# Line 200 | Line 211 | endif
211   _ENDCUST_
212  
213   __PROJ_MK_RULES__
214 < $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBSUM) $(LIBDSTRUCT)
215 < $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBSUM)
214 > $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM) $(LIBDSTRUCT)
215 > $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM)
216  
217   $(MODEXEDROBJ):                 CF_TGT := $(CF_TGT) -I$(SRCDIR)/proj/libs/dr
218   $(MODEXEDR) $(MODEXEDR_SOCK):   $(LIBDR)
# Line 219 | Line 230 | __PROJ__
230               <subdir>stats</subdir>
231               <subdir>egsehmicomp</subdir>
232               <subdir>imrotate</subdir>
233 +             <subdir>projection</subdir>
234         </subdirs>
235     </proj>
236     <proj>
# Line 371 | Line 383 | __PROJ__
383     <proj>
384          <name>mag</name>
385          <subdirs>
374             <subdir>apps</subdir>
386               <subdir>pfss/apps</subdir>
387               <subdir>ambig/apps</subdir>
388               <subdir>harp/apps</subdir>
# Line 385 | Line 396 | __PROJ__
396               <subdir>ident/libs/mex2c</subdir>
397               <subdir>ident/libs/mexfunctions</subdir>
398               <subdir>ident/libs/util</subdir>
399 +             <subdir>libs</subdir>
400 +             <subdir>libs/util</subdir>
401               <subdir>patch/apps</subdir>
402               <subdir>nlfff/apps</subdir>
403               <subdir>d4vm/apps</subdir>
404               <subdir>remapmags/apps</subdir>
405               <subdir>synop/apps</subdir>
406 +             <subdir>polarfield/apps</subdir>
407          </subdirs>
408          <filters>
409               <filter>
# Line 427 | Line 441 | __PROJ__
441          <subdirs>
442               <subdir>apps</subdir>
443               <subdir>lorentz/apps</subdir>
444 +             <subdir>pdfi/apps</subdir>
445          </subdirs>
446          <filters>
447               <filter>
# Line 439 | Line 454 | __PROJ__
454   __PROJCFG__
455   #! /bin/csh -f
456  
457 < # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
443 < # 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