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

Comparing configsdp.txt (file contents):
Revision 1.37 by arta, Fri Jun 20 17:33:07 2014 UTC vs.
Revision 1.55 by arta, Wed Feb 17 19:06:25 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 <
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 58 | Line 57 | q:SUMRM_NORUN_STOP              0
57   # JMD
58   p:JMD_IS_INSTALLED              0
59   q:JMD_URL                       http://localhost:8080/JMD/JMD
60 + # Remote SUMS
61 + q:RS_SITE_TABLE                         drms.rs_sites
62 + q:RS_REQUEST_TABLE                      drms.rs_requests
63 + q:RS_SU_TABLE                           drms.rs_sus
64 + q:RS_DBNAME                             jsoc
65 + q:RS_DBHOST                             hmidb
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 + q:RS_BINPATH                            /home/jsoc/cvs/Development/JSOC/bin/linux_x86_64
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 164 | Line 192 | MPI_PATH:AVX            /home/jsoc/avx/b
192  
193   TAR_INCS:X86_64         /home/jsoc/include
194   TAR_INCS:IA32           /home/jsoc/include
195 < TAR_INCS:AVX            /home/jsoc/include
195 > TAR_INCS:AVX            /home/jsoc/avx/include
196   TAR_INCS:IA64           /home/jsoc/include
197  
198   TAR_LIBS:X86_64         /home/jsoc/lib/linux-x86_64
# Line 172 | Line 200 | TAR_LIBS:IA32           /home/jsoc/lib/l
200   TAR_LIBS:AVX            /home/jsoc/lib/linux_avx
201   TAR_LIBS:IA64           /home/jsoc/lib/linux-ia64
202  
203 + PY_LIB                  python3.4m
204 + PY_INCS:X86_64          /home/jsoc/ActiveStatePy/linux_x86_64/ActivePython-3.4/include/python3.4m
205 + PY_INCS:AVX             /home/jsoc/ActiveStatePy/linux_avx/ActivePython-3.4/include/python3.4m
206 + PY_LIBS:X86_64          /home/jsoc/ActiveStatePy/linux_x86_64/ActivePython-3.4/lib
207 + PY_LIBS:AVX             /home/jsoc/ActiveStatePy/linux_avx/ActivePython-3.4/lib
208 + PY_HOME:X86_64          /home/jsoc/ActiveStatePy/linux_x86_64/ActivePython-3.4
209 + PY_HOME:AVX             /home/jsoc/ActiveStatePy/linux_avx/ActivePython-3.4
210 +
211   # Set custom make file to tell the make system that the gcc cfitsio library is called
212   # libcfitsio_gcc.a
213   _CUST_
# Line 183 | Line 219 | endif
219   _ENDCUST_
220  
221   __PROJ_MK_RULES__
222 < $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBSUM) $(LIBDSTRUCT)
223 < $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBSUM)
222 > $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM) $(LIBDSTRUCT)
223 > $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM)
224  
225   $(MODEXEDROBJ):                 CF_TGT := $(CF_TGT) -I$(SRCDIR)/proj/libs/dr
226   $(MODEXEDR) $(MODEXEDR_SOCK):   $(LIBDR)
# Line 202 | Line 238 | __PROJ__
238               <subdir>stats</subdir>
239               <subdir>egsehmicomp</subdir>
240               <subdir>imrotate</subdir>
241 +             <subdir>projection/subdir>
242         </subdirs>
243     </proj>
244     <proj>
# Line 368 | Line 405 | __PROJ__
405               <subdir>ident/libs/mex2c</subdir>
406               <subdir>ident/libs/mexfunctions</subdir>
407               <subdir>ident/libs/util</subdir>
408 +             <subdir>libs</subdir>
409 +             <subdir>libs/util</subdir>
410               <subdir>patch/apps</subdir>
411               <subdir>nlfff/apps</subdir>
412               <subdir>d4vm/apps</subdir>
413               <subdir>remapmags/apps</subdir>
414               <subdir>synop/apps</subdir>
415 +             <subdir>polarfield/apps</subdir>
416          </subdirs>
417          <filters>
418               <filter>
# Line 410 | Line 450 | __PROJ__
450          <subdirs>
451               <subdir>apps</subdir>
452               <subdir>lorentz/apps</subdir>
453 +             <subdir>pdfi/apps</subdir>
454          </subdirs>
455          <filters>
456               <filter>
# Line 422 | Line 463 | __PROJ__
463   __PROJCFG__
464   #! /bin/csh -f
465  
466 < # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
426 < # directory).
466 > set PERLBIN = ""
467  
468 < 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" \;
468 > if ($PERLBIN == "") then
469 >    if (-x /home/jsoc/bin/linux_x86_64/activeperl) then
470 >        set PERLBIN = "/home/jsoc/bin/linux_x86_64/activeperl"
471 >    else
472 >        set PERLBIN = "perl"
473 >    endif
474 > endif
475  
476 + # Project-specific configuration (like adding links to scripts to the $JSOCROOT/scripts
477 + # directory).
478 + 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