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.69 by arta, Fri May 19 21:51:54 2017 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 > q:DRMS_LOG_DIR                  /home/jsoc/jsoclogs
36 > q:DRMS_LOCK_DIR                 /home/jsoc/locks
37   # The number of SUMS process SETS to spawn. If this number is not 1, then the number of SUMS processes
38   # is SUM_NUMSUM * 5 + 2.
39   a:SUM_NUMSUM                    3
# Line 68 | Line 69 | a:RS_DBPORT
69   q:RS_DBUSER                             production
70   q:RS_LOCKFILE                           /home/jsoc/locks/remotesums.lck
71   q:RS_LOGDIR                             /home/jsoc/jsoclogs/rsums
72 < a:RS_DLTIMEOUT                          30
73 < a:RS_REQTIMEOUT                          5
74 < a:RS_MAXTHREADS                         32
72 > a:RS_DLTIMEOUT                          120
73 > a:RS_REQTIMEOUT                         300
74 > a:RS_MAXTHREADS                         216
75   q:RS_BINPATH                            /home/jsoc/cvs/Development/JSOC/bin/linux_x86_64
76 + a:RS_N_WORKERS                          4
77 + q:RS_TMPDIR                             /tmp
78 + a:RS_SCP_MAXSUS                         48
79 + a:RS_SCP_MAXPAYLOAD                     512
80 + a:RS_SCP_TIMEOUT                        2
81   # White-list (access to internal stuff)
82   a:WL_HASWL                              1
83   q:WL_FILE                               /web/jsoc/htdocs/whitelist.txt
84 + # Bin paths
85 + q:BIN_EXPORT                            /home/jsoc/cvs/Development/JSOC/bin
86 + q:SCRIPTS_EXPORT                        /home/jsoc/cvs/Development/JSOC/scripts
87 + q:BIN_PY                                /home/jsoc/bin/linux_x86_64/activepython27
88 + q:BIN_PY3                               /home/jsoc/anaconda3/bin/python3
89 + a:SUMS_USEMTSUMS                        1
90 + a:SUMS_USEMTSUMS_INFO                   1
91 + # Email registration
92 + a:REGEMAIL_TIMEOUT                      5
93 + # Slony
94 + q:SLONY_CONFIG                          /home/jsoc/cvs/Development/JSOC/proj/replication/etc/repserver.cfg
95 +
96 + # lev1.5_hmi
97 + q:POLCAL_PARAMS                         /home/jsoc/hmi/tables/lev15/polcal-param-fit.bin
98  
99   __MAKE__
100   # JSOC_SDP third-party libraries used by base
# Line 200 | Line 220 | endif
220   _ENDCUST_
221  
222   __PROJ_MK_RULES__
223 < $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBSUM) $(LIBDSTRUCT)
224 < $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBSUM)
223 > $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM) $(LIBDSTRUCT) $(LIBMISC)
224 > $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM)
225  
226   $(MODEXEDROBJ):                 CF_TGT := $(CF_TGT) -I$(SRCDIR)/proj/libs/dr
227   $(MODEXEDR) $(MODEXEDR_SOCK):   $(LIBDR)
# Line 216 | Line 236 | __PROJ__
236               <subdir>dsputil</subdir>
237               <subdir>gapfiller</subdir>
238               <subdir>interpolate</subdir>
239 +             <subdir>limbcompute_aia</subdir>
240               <subdir>stats</subdir>
241               <subdir>egsehmicomp</subdir>
242               <subdir>imrotate</subdir>
243 +             <subdir>projection</subdir>
244         </subdirs>
245     </proj>
246     <proj>
# Line 235 | Line 257 | __PROJ__
257          </subdirs>
258     </proj>
259     <proj>
260 +        <name>limbfit_aia</name>
261 +         <subdirs>
262 +             <subdir>apps</subdir>
263 +         </subdirs>
264 +   </proj>
265 +   <proj>
266          <name>maps_avgs</name>
267          <subdirs>
268               <subdir>apps</subdir>    
# Line 371 | Line 399 | __PROJ__
399     <proj>
400          <name>mag</name>
401          <subdirs>
374             <subdir>apps</subdir>
402               <subdir>pfss/apps</subdir>
403               <subdir>ambig/apps</subdir>
404               <subdir>harp/apps</subdir>
# Line 385 | Line 412 | __PROJ__
412               <subdir>ident/libs/mex2c</subdir>
413               <subdir>ident/libs/mexfunctions</subdir>
414               <subdir>ident/libs/util</subdir>
415 +             <subdir>libs</subdir>
416 +             <subdir>libs/util</subdir>
417               <subdir>patch/apps</subdir>
418               <subdir>nlfff/apps</subdir>
419               <subdir>d4vm/apps</subdir>
420               <subdir>remapmags/apps</subdir>
421               <subdir>synop/apps</subdir>
422 +             <subdir>polarfield/apps</subdir>
423 +             <subdir>polcorr/apps</subdir>
424 +        </subdirs>
425 +        <filters>
426 +             <filter>
427 +                  <name>COMPILER</name>
428 +                  <value>icc</value>
429 +             </filter>
430 +       </filters>
431 +   </proj>
432 +   <proj>
433 +        <name>qmaps</name>
434 +        <subdirs>
435 +             <subdir>apps</subdir>
436          </subdirs>
437          <filters>
438               <filter>
# Line 427 | Line 470 | __PROJ__
470          <subdirs>
471               <subdir>apps</subdir>
472               <subdir>lorentz/apps</subdir>
473 +             <subdir>pdfi/apps</subdir>
474 +             <subdir>prep/apps</subdir>
475          </subdirs>
476          <filters>
477               <filter>
# Line 439 | Line 484 | __PROJ__
484   __PROJCFG__
485   #! /bin/csh -f
486  
487 < # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
443 < # directory).
487 > set PERLBIN = ""
488  
489 < 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" \;
489 > if ($PERLBIN == "") then
490 >    if (-x /home/jsoc/bin/linux_x86_64/activeperl) then
491 >        set PERLBIN = "/home/jsoc/bin/linux_x86_64/activeperl"
492 >    else
493 >        set PERLBIN = "perl"
494 >    endif
495 > endif
496  
497 + # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
498 + # directory).
499 + 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