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

Comparing configsdp.txt (file contents):
Revision 1.53 by xudong, Fri Aug 28 21:04:37 2015 UTC vs.
Revision 1.66 by arta, Mon Dec 5 22:37:21 2016 UTC

# Line 67 | 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
# Line 78 | Line 83 | q:WL_FILE
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
99   # The parameters in this section are used to create make variables. For example, the line
# Line 197 | Line 207 | TAR_LIBS:IA32           /home/jsoc/lib/l
207   TAR_LIBS:AVX            /home/jsoc/lib/linux_avx
208   TAR_LIBS:IA64           /home/jsoc/lib/linux-ia64
209  
200 PY_LIB                  python3.4m
201 PY_INCS:X86_64          /home/jsoc/ActiveStatePy/linux_x86_64/ActivePython-3.4/include/python3.4m
202 PY_INCS:AVX             /home/jsoc/ActiveStatePy/linux_avx/ActivePython-3.4/include/python3.4m
203 PY_LIBS:X86_64          /home/jsoc/ActiveStatePy/linux_x86_64/ActivePython-3.4/lib
204 PY_LIBS:AVX             /home/jsoc/ActiveStatePy/linux_avx/ActivePython-3.4/lib
205 PY_HOME:X86_64          /home/jsoc/ActiveStatePy/linux_x86_64/ActivePython-3.4
206 PY_HOME:AVX             /home/jsoc/ActiveStatePy/linux_avx/ActivePython-3.4
207
210   # Set custom make file to tell the make system that the gcc cfitsio library is called
211   # libcfitsio_gcc.a
212   _CUST_
# Line 216 | Line 218 | endif
218   _ENDCUST_
219  
220   __PROJ_MK_RULES__
221 < $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM) $(LIBDSTRUCT)
221 > $(CEXESUMS):                    $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM) $(LIBDSTRUCT) $(LIBMISC)
222   $(MODEXESUMS):                  $(LIBSUMSAPI) $(LIBCJSON) $(LIBSUM)
223  
224   $(MODEXEDROBJ):                 CF_TGT := $(CF_TGT) -I$(SRCDIR)/proj/libs/dr
# Line 235 | 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 387 | Line 390 | __PROJ__
390     <proj>
391          <name>mag</name>
392          <subdirs>
390             <subdir>apps</subdir>
393               <subdir>pfss/apps</subdir>
394               <subdir>ambig/apps</subdir>
395               <subdir>harp/apps</subdir>
# Line 401 | 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>
# Line 444 | 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>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines