Index: head/databases/leofs/Makefile =================================================================== --- head/databases/leofs/Makefile (revision 433108) +++ head/databases/leofs/Makefile (revision 433109) @@ -1,243 +1,239 @@ # Created by: Mikolaj Golub # $FreeBSD$ PORTNAME= leofs -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.2 CATEGORIES= databases DIST_SUBDIR= ${PORTNAME} MAINTAINER= trociny@FreeBSD.org COMMENT= Highly scalable, fault-tolerant distributed file system LICENSE= APACHE20 -BUILD_DEPENDS= ${LOCALBASE}/lib/erlang17/bin/erlc:lang/erlang-runtime17 \ +BUILD_DEPENDS= ${LOCALBASE}/lib/erlang18/bin/erlc:lang/erlang-runtime18 \ ${LOCALBASE}/bin/cmake:devel/cmake \ ${LOCALBASE}/lib/libcheck.a:devel/libcheck USE_GITHUB= yes GH_ACCOUNT= leo-project BROKEN_aarch64= Does not compile: fatal error: lzo/lzo1x.h file not found BROKEN_powerpc64= Does not build BROKEN_sparc64= Does not build: error Please implement AtomicPointer for this platform LEOFS_USER= leofs LEOFS_GROUP= leofs USERS= ${LEOFS_USER} GROUPS= ${LEOFS_GROUP} LEOFS_ETCDIR= ${ETCDIR} LEOFS_BASEDIR= ${PREFIX}/lib/${PORTNAME} LEOFS_DBDIR= /var/db/${PORTNAME} LEOFS_LOGDIR= /var/log/${PORTNAME} LEOFS_RUNDIR= /var/run/${PORTNAME} LEOFS_SBIN_FILES= \ leo_gateway \ leo_manager \ leo_manager_slave \ leo_storage \ leofs PLIST_SUB+= LEOFS_USER=${LEOFS_USER} \ LEOFS_GROUP=${LEOFS_GROUP} \ LEOFS_DBDIR=${LEOFS_DBDIR} \ LEOFS_LOGDIR=${LEOFS_LOGDIR} \ LEOFS_RUNDIR=${LEOFS_RUNDIR} SUB_LIST+= LEOFS_USER=${LEOFS_USER} \ LEOFS_GROUP=${LEOFS_GROUP} \ LEOFS_ETCDIR=${LEOFS_ETCDIR} \ LEOFS_BASEDIR=${LEOFS_BASEDIR} \ LEOFS_DBDIR=${LEOFS_DBDIR} \ LEOFS_LOGDIR=${LEOFS_LOGDIR} \ LEOFS_RUNDIR=${LEOFS_RUNDIR} SUB_FILES+= ${LEOFS_SBIN_FILES:S/^/sbin-/} USES= dos2unix gmake pkgconfig ssl USE_RC_SUBR= ${PORTNAME} -DOS2UNIX_FILES= deps/leo_*/snmp/snmpa_*/leo_*_snmp.config +DOS2UNIX_FILES= apps/leo_*/snmp/snmpa_*/leo_*_snmp.config ALL_TARGET= release MAKE_JOBS_UNSAFE=yes MAKE_ENV= PATH=${LOCALBASE}/lib/erlang17/bin:${PATH} LEOFS_DEPS= \ - leo-project/leo_gateway=${PORTVERSION}:leo_gateway \ - leo-project/leo_manager=${PORTVERSION}:leo_manager \ - leo-project/leo_storage=${PORTVERSION}:leo_storage \ - basho/bitcask=2.0.6:bitcask \ - basho/cuttlefish=2.0.10:cuttlefish \ + basho/bitcask=2.0.7:bitcask \ + basho/cuttlefish=2.0.11:cuttlefish \ basho/eleveldb=2.0.33:eleveldb \ basho/getopt=v0.8.2:getopt \ basho/goldrush=0.1.9:goldrush \ basho/lager=3.2.4:lager \ basho/leveldb=2.0.33:leveldb \ - basho/neotoma=1.7.3:neotoma \ + basho/neotoma=1.7.4:neotoma \ davisp/jiffy=0.14.8:jiffy \ - eproxus/meck=0.8.2:meck \ - extend/cowlib=1.0.0:cowlib \ + eproxus/meck=0.8.4:meck \ extend/ranch=1.0.0:ranch \ ferd/recon=2.3.1:recon \ leo-project/bear=0.8.2-for-leofs:bear \ leo-project/cowboy=for-leofs-1.4:cowboy \ leo-project/elarm=d9e8a6f:elarm \ leo-project/erpcgen=0.2.5:erpcgen \ - leo-project/fifo_utils=d19b92c:fifo_utils \ - leo-project/folsom=0.8.2-for-leofs:folsom \ - leo-project/leo_backend_db=1.2.6:leo_backend_db \ - leo-project/leo_cache=0.8.2:leo_cache \ - leo-project/leo_commons=1.1.8:leo_commons \ + leo-project/folsom=0.8.2-p1:folsom \ + leo-project/leo_backend_db=1.2.8:leo_backend_db \ + leo-project/leo_cache=0.8.3:leo_cache \ + leo-project/leo_commons=1.1.9:leo_commons \ leo-project/leo_dcerl=0.4.6:leo_dcerl \ - leo-project/leo_logger=1.2.4:leo_logger \ + leo-project/leo_logger=1.2.5:leo_logger \ leo-project/leo_mcerl=0.6.4:leo_mcerl \ - leo-project/leo_mq=1.4.9:leo_mq \ - leo-project/leo_object_storage=1.2.28:leo_object_storage \ - leo-project/leo_ordning_reda=1.2.2:leo_ordning_reda \ - leo-project/leo_pod=0.6.7:leo_pod \ - leo-project/leo_redundant_manager=1.9.29:leo_redundant_manager \ - leo-project/leo_rpc=0.10.10:leo_rpc \ - leo-project/leo_s3_libs=1.2.7:leo_s3_libs \ - leo-project/leo_statistics=1.1.14:leo_statistics \ - leo-project/leo_watchdog=0.12.5:leo_watchdog \ - leo-project/leo_tran=0.2.7:leo_tran \ + leo-project/leo_mq=1.4.12:leo_mq \ + leo-project/leo_object_storage=1.2.30:leo_object_storage \ + leo-project/leo_ordning_reda=1.2.4:leo_ordning_reda \ + leo-project/leo_pod=0.6.8:leo_pod \ + leo-project/leo_redundant_manager=1.9.32:leo_redundant_manager \ + leo-project/leo_rpc=0.10.12:leo_rpc \ + leo-project/leo_s3_libs=1.2.9:leo_s3_libs \ + leo-project/leo_statistics=1.1.17:leo_statistics \ + leo-project/leo_tran=0.2.8:leo_tran \ + leo-project/leo_watchdog=0.12.6:leo_watchdog \ leo-project/libcutil=0.4.4:libcutil \ leo-project/nfs_rpc_server=0.2.5:nfs_rpc_server \ - leo-project/savanna_agent=0.4.17:savanna_agent \ - leo-project/savanna_commons=0.10.3:savanna_commons \ + leo-project/savanna_agent=0.4.20:savanna_agent \ + leo-project/savanna_commons=0.10.6:savanna_commons \ manopapad/proper=f558989:proper \ + ninenines/cowlib=1.0.0:cowlib \ GH_TUPLE= ${LEOFS_DEPS:C,(.*)/(.*)=(.*):(.*),\1:\2:\3:\4/deps/\4,} post-extract: .for dep in ${LEOFS_DEPS} .for tagname in ${dep:C,^[^=]+=([^\?]+)\?.*$,\1,} .for label in ${dep:C,^.*:,,} @if [ -f "${WRKSRC}/deps/${label}/src/${label}.app.src" ]; then \ ${REINPLACE_CMD} -e "s|{vsn, *git}|{vsn, \"${tagname}\"}|" \ "${WRKSRC}/deps/${label}/src/${label}.app.src"; \ fi .endfor .endfor .endfor @(cd ${WRKSRC}/deps/eleveldb/c_src && ${LN} -s ../../leveldb) @(cd ${WRKSRC}/deps/leo_mcerl/c_src && ${LN} -s ../../libcutil) @(cd ${WRKSRC}/deps/leo_dcerl/c_src && ${LN} -s ../../libcutil) post-patch: @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g; \ s|%%LEOFS_DBDIR%%|${LEOFS_DBDIR}|g; \ s|%%LEOFS_LOGDIR%%|${LEOFS_LOGDIR}|g;' \ - ${WRKSRC}/deps/leo_gateway/priv/leo_gateway.conf \ - ${WRKSRC}/deps/leo_gateway/priv/leo_gateway.schema \ - ${WRKSRC}/deps/leo_gateway/snmp/snmpa_gateway_0/leo_gateway_snmp.config \ - ${WRKSRC}/deps/leo_manager/priv/leo_manager_0.conf \ - ${WRKSRC}/deps/leo_manager/priv/leo_manager_0.schema \ - ${WRKSRC}/deps/leo_manager/priv/leo_manager_1.conf \ - ${WRKSRC}/deps/leo_manager/priv/leo_manager_1.schema \ - ${WRKSRC}/deps/leo_manager/snmp/snmpa_manager_0/leo_manager_snmp.config \ - ${WRKSRC}/deps/leo_manager/snmp/snmpa_manager_1/leo_manager_snmp.config \ - ${WRKSRC}/deps/leo_storage/priv/leo_storage.conf \ - ${WRKSRC}/deps/leo_storage/priv/leo_storage.schema \ - ${WRKSRC}/deps/leo_storage/snmp/snmpa_storage_0/leo_storage_snmp.config + ${WRKSRC}/apps/leo_gateway/priv/leo_gateway.conf \ + ${WRKSRC}/apps/leo_gateway/priv/leo_gateway.schema \ + ${WRKSRC}/apps/leo_gateway/snmp/snmpa_gateway_0/leo_gateway_snmp.config \ + ${WRKSRC}/apps/leo_manager/priv/leo_manager_0.conf \ + ${WRKSRC}/apps/leo_manager/priv/leo_manager_0.schema \ + ${WRKSRC}/apps/leo_manager/priv/leo_manager_1.conf \ + ${WRKSRC}/apps/leo_manager/priv/leo_manager_1.schema \ + ${WRKSRC}/apps/leo_manager/snmp/snmpa_manager_0/leo_manager_snmp.config \ + ${WRKSRC}/apps/leo_manager/snmp/snmpa_manager_1/leo_manager_snmp.config \ + ${WRKSRC}/apps/leo_storage/priv/leo_storage.conf \ + ${WRKSRC}/apps/leo_storage/priv/leo_storage.schema \ + ${WRKSRC}/apps/leo_storage/snmp/snmpa_storage_0/leo_storage_snmp.config pre-build: (cd ${WRKSRC}/deps/erpcgen && ${MAKE_ENV} ${MAKE}) (cd ${WRKSRC} && ${MAKE_ENV} ./deps/erpcgen/priv/erpcgen \ - -a [svc_callback,xdr,hrl] deps/leo_gateway/src/leo_nfs_proto3.x) + -a [svc_callback,xdr,hrl] apps/leo_gateway/src/leo_nfs_proto3.x) (cd ${WRKSRC} && ${MAKE_ENV} ./deps/erpcgen/priv/erpcgen \ - -a [svc_callback,xdr,hrl] deps/leo_gateway/src/leo_nfs_mount3.x) + -a [svc_callback,xdr,hrl] apps/leo_gateway/src/leo_nfs_mount3.x) (cd ${WRKSRC}/deps/nfs_rpc_server/src && \ ${MAKE_ENV} erl -noshell -pa ../../erpcgen/ebin \ -eval 'erpcgen:file(pmap, [xdrlib,clnt])' -s init stop) (cd ${WRKSRC}/deps/nfs_rpc_server/src && \ ${MAKE_ENV} erl -noshell -pa ../../erpcgen/ebin \ -eval 'erpcgen:file(nfs_rpc, [xdrlib,clnt])' -s init stop) FIND_ARGS= "! -name *.bak ! -name *.orig" do-install: ${MKDIR} \ ${STAGEDIR}${LEOFS_BASEDIR}/bin \ ${STAGEDIR}${LEOFS_BASEDIR}/snmp \ ${STAGEDIR}${LEOFS_BASEDIR}/releases/1 \ ${STAGEDIR}${LEOFS_ETCDIR} \ ${STAGEDIR}${LEOFS_DBDIR} \ ${STAGEDIR}${LEOFS_LOGDIR} \ ${STAGEDIR}${LEOFS_RUNDIR} (cd ${WRKSRC}/package/leo_gateway && \ ${COPYTREE_BIN} erts-*/bin ${STAGEDIR}${LEOFS_BASEDIR} ${FIND_ARGS} && \ ${COPYTREE_SHARE} etc ${STAGEDIR}${LEOFS_BASEDIR} ${FIND_ARGS} && \ ${COPYTREE_SHARE} lib ${STAGEDIR}${LEOFS_BASEDIR} ${FIND_ARGS}) (cd ${WRKSRC}/package/leo_manager_0 && \ ${COPYTREE_SHARE} etc ${STAGEDIR}${LEOFS_BASEDIR} ${FIND_ARGS} && \ ${COPYTREE_SHARE} lib ${STAGEDIR}${LEOFS_BASEDIR} ${FIND_ARGS}) (cd ${WRKSRC}/package/leo_storage && \ ${COPYTREE_SHARE} etc ${STAGEDIR}${LEOFS_BASEDIR} ${FIND_ARGS} && \ ${COPYTREE_SHARE} lib ${STAGEDIR}${LEOFS_BASEDIR} ${FIND_ARGS}) ${INSTALL_DATA} ${WRKSRC}/package/leo_manager_1/etc/leo_manager.schema \ ${STAGEDIR}${LEOFS_BASEDIR}/etc/leo_manager_slave.schema ${INSTALL_DATA} ${WRKSRC}/package/leo_manager_1/etc/leo_manager.conf \ ${STAGEDIR}${LEOFS_BASEDIR}/etc/leo_manager_slave.conf ${INSTALL_SCRIPT} ${WRKSRC}/package/leo_gateway/bin/cuttlefish \ ${STAGEDIR}${LEOFS_BASEDIR}/bin ${INSTALL_DATA} ${WRKSRC}/package/leo_gateway/releases/start_erl.data \ ${STAGEDIR}${LEOFS_BASEDIR}/releases ${INSTALL_DATA} ${WRKSRC}/package/leo_gateway/releases/1/start_clean.* \ ${STAGEDIR}${LEOFS_BASEDIR}/releases/1 (cd ${WRKSRC}/package/leo_gateway/releases && ${COPYTREE_SHARE} . \ ${STAGEDIR}${LEOFS_BASEDIR}/releases/leo_gateway ${FIND_ARGS}) (cd ${WRKSRC}/package/leo_manager_0/releases && ${COPYTREE_SHARE} . \ ${STAGEDIR}${LEOFS_BASEDIR}/releases/leo_manager ${FIND_ARGS}) (cd ${WRKSRC}/package/leo_storage/releases && ${COPYTREE_SHARE} . \ ${STAGEDIR}${LEOFS_BASEDIR}/releases/leo_storage ${FIND_ARGS}) (cd ${WRKSRC}/package/leo_gateway/snmp/snmpa_gateway_0 && \ ${COPYTREE_SHARE} . \ ${STAGEDIR}${LEOFS_BASEDIR}/snmp/snmpa_gateway ${FIND_ARGS}) (cd ${WRKSRC}/package/leo_manager_0/snmp/snmpa_manager_0 && \ ${COPYTREE_SHARE} . \ ${STAGEDIR}${LEOFS_BASEDIR}/snmp/snmpa_manager ${FIND_ARGS}) (cd ${WRKSRC}/package/leo_manager_1/snmp/snmpa_manager_1 && \ ${COPYTREE_SHARE} . \ ${STAGEDIR}${LEOFS_BASEDIR}/snmp/snmpa_manager_slave ${FIND_ARGS}) (cd ${WRKSRC}/package/leo_storage/snmp/snmpa_storage_0 && \ ${COPYTREE_SHARE} . \ ${STAGEDIR}${LEOFS_BASEDIR}/snmp/snmpa_storage ${FIND_ARGS}) ${INSTALL_DATA} ${WRKSRC}/package/leo_gateway/etc/leo_gateway.conf \ ${STAGEDIR}${LEOFS_ETCDIR}/leo_gateway.conf.sample ${INSTALL_DATA} ${WRKSRC}/package/leo_gateway/etc/server_cert.pem \ ${STAGEDIR}${LEOFS_ETCDIR}/server_cert.pem.sample ${INSTALL_DATA} ${WRKSRC}/package/leo_gateway/etc/server_key.pem \ ${STAGEDIR}${LEOFS_ETCDIR}/server_key.pem.sample ${INSTALL_DATA} ${WRKSRC}/package/leo_manager_0/etc/leo_manager.conf \ ${STAGEDIR}${LEOFS_ETCDIR}/leo_manager.conf.sample ${INSTALL_DATA} ${WRKSRC}/package/leo_manager_1/etc/leo_manager.conf \ ${STAGEDIR}${LEOFS_ETCDIR}/leo_manager_slave.conf.sample ${INSTALL_DATA} ${WRKSRC}/package/leo_storage/etc/leo_storage.conf \ ${STAGEDIR}${LEOFS_ETCDIR}/leo_storage.conf.sample ${INSTALL_SCRIPT} ${WRKSRC}/leofs-adm ${STAGEDIR}${PREFIX}/sbin/leofs-adm .for f in ${LEOFS_SBIN_FILES} ${INSTALL_SCRIPT} ${WRKDIR}/sbin-${f} ${STAGEDIR}${PREFIX}/sbin/${f} .endfor cd ${STAGEDIR}${PREFIX} ; \ ${FIND} ${LEOFS_BASEDIR:S/${PREFIX}\///} \ ${LEOFS_LIBXDIR:S/${PREFIX}\///} -type f -o -type l \ | ${SORT} > ${WRKDIR}/PLIST.leofs cd ${STAGEDIR}${PREFIX} ; \ ${FIND} ${LEOFS_BASEDIR:S/${PREFIX}\///} \ ${LEOFS_LIBXDIR:S/${PREFIX}\///} -type d -empty \ | ${SORT} -r | ${SED} -e 's/^/@dir /' \ >> ${WRKDIR}/PLIST.leofs ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script ${ECHO_CMD} "/Insert PLIST.leofs" >> ${WRKDIR}/ex.script ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script ${ECHO_CMD} "r ${WRKDIR}/PLIST.leofs" >> ${WRKDIR}/ex.script ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-leofs cd ${WRKDIR} ; ex < ex.script .include Index: head/databases/leofs/distinfo =================================================================== --- head/databases/leofs/distinfo (revision 433108) +++ head/databases/leofs/distinfo (revision 433109) @@ -1,89 +1,81 @@ -TIMESTAMP = 1484858151 -SHA256 (leofs/leo-project-leofs-1.3.1_GH0.tar.gz) = 5d3bf7fc3681c76cdd461e20fb9db115c3a9df7c911121ef5c11e5e802b3783b -SIZE (leofs/leo-project-leofs-1.3.1_GH0.tar.gz) = 1125358 -SHA256 (leofs/leo-project-leo_gateway-1.3.1_GH0.tar.gz) = c94770a180df09d933a8af743e206731d27b787380f50cb33a0b06cfac15e7d6 -SIZE (leofs/leo-project-leo_gateway-1.3.1_GH0.tar.gz) = 651275 -SHA256 (leofs/leo-project-leo_manager-1.3.1_GH0.tar.gz) = 0a1d1222b0f46ff3a34ea7af51d5db5bb8ef74447e696356532d0964cd559897 -SIZE (leofs/leo-project-leo_manager-1.3.1_GH0.tar.gz) = 600733 -SHA256 (leofs/leo-project-leo_storage-1.3.1_GH0.tar.gz) = 7271ba53d5e353f72d37bb93637d105870b1594ad7af4dbf9f99a1c42ee098b1 -SIZE (leofs/leo-project-leo_storage-1.3.1_GH0.tar.gz) = 592533 -SHA256 (leofs/basho-bitcask-2.0.6_GH0.tar.gz) = a35db0514ce1bbc6b88ed3c9c2ed483ed880362559271195fd3caf1437a8e4e6 -SIZE (leofs/basho-bitcask-2.0.6_GH0.tar.gz) = 968690 -SHA256 (leofs/basho-cuttlefish-2.0.10_GH0.tar.gz) = ec8b2e9180b519f9ccd2f1b493e01a1bd3e529471f58bbc4a9c640f503ab340b -SIZE (leofs/basho-cuttlefish-2.0.10_GH0.tar.gz) = 232033 +TIMESTAMP = 1485929506 +SHA256 (leofs/leo-project-leofs-1.3.2_GH0.tar.gz) = 802fb152522c98054a7ff3ece33ad26710c70873a84f764672e1652941ffd974 +SIZE (leofs/leo-project-leofs-1.3.2_GH0.tar.gz) = 2971030 +SHA256 (leofs/basho-bitcask-2.0.7_GH0.tar.gz) = 029a0707618d6a24dc9359bcef21d1fac582a8045674a009aea05db1ec77fd5d +SIZE (leofs/basho-bitcask-2.0.7_GH0.tar.gz) = 968514 +SHA256 (leofs/basho-cuttlefish-2.0.11_GH0.tar.gz) = 75de2ac844de08751e63ea97bbbb63c14bb8cb4860d76866cbdfe6a6992f4dd0 +SIZE (leofs/basho-cuttlefish-2.0.11_GH0.tar.gz) = 232032 SHA256 (leofs/basho-eleveldb-2.0.33_GH0.tar.gz) = 9a12167068f20bd61e23f29708a5ee73d5a33e14ee30ad1cb8390ecf4ab9a22c SIZE (leofs/basho-eleveldb-2.0.33_GH0.tar.gz) = 1750242 SHA256 (leofs/basho-getopt-v0.8.2_GH0.tar.gz) = bfeab0aeb3e515b1c2912874d6e644849561971d8d947ec4adc7c9ff4c394ea8 SIZE (leofs/basho-getopt-v0.8.2_GH0.tar.gz) = 151272 SHA256 (leofs/basho-goldrush-0.1.9_GH0.tar.gz) = 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612 SIZE (leofs/basho-goldrush-0.1.9_GH0.tar.gz) = 24548 SHA256 (leofs/basho-lager-3.2.4_GH0.tar.gz) = b2212ca817ee551540d4eb815691355e9e0ad4e76d93bc4426d95b6f00fc8d59 SIZE (leofs/basho-lager-3.2.4_GH0.tar.gz) = 245002 SHA256 (leofs/basho-leveldb-2.0.33_GH0.tar.gz) = bf129f00e8de67f008ae8cdd1cd20b805cd008e6f554fccfb3a9522e5e5b3a3d SIZE (leofs/basho-leveldb-2.0.33_GH0.tar.gz) = 353214 -SHA256 (leofs/basho-neotoma-1.7.3_GH0.tar.gz) = 0da8b63b908ea207f44fe6f3435c0a7cb9c041e472b21063ec79409544e2ed69 -SIZE (leofs/basho-neotoma-1.7.3_GH0.tar.gz) = 182343 +SHA256 (leofs/basho-neotoma-1.7.4_GH0.tar.gz) = 97e01d4577d9882b9cb10e079bd33114f1293abae5180dc272be17e419daa0df +SIZE (leofs/basho-neotoma-1.7.4_GH0.tar.gz) = 182456 SHA256 (leofs/davisp-jiffy-0.14.8_GH0.tar.gz) = 7d1054c475c82c626de3ad57201a7fc51da38667c8a7502149eb751edc6b601d SIZE (leofs/davisp-jiffy-0.14.8_GH0.tar.gz) = 1856737 -SHA256 (leofs/eproxus-meck-0.8.2_GH0.tar.gz) = dc1ad985b1c994c69b645f5cfd159bf9ba71d10a2984ce354500adb4ff0ae473 -SIZE (leofs/eproxus-meck-0.8.2_GH0.tar.gz) = 208694 -SHA256 (leofs/extend-cowlib-1.0.0_GH0.tar.gz) = 48a8784ae7d266724276f9842b3a06cfbbfe69469f58c27237c602232f7ebe5a -SIZE (leofs/extend-cowlib-1.0.0_GH0.tar.gz) = 41538 +SHA256 (leofs/eproxus-meck-0.8.4_GH0.tar.gz) = b4f951841c69a75a735ea4aea682899f19f254467c749df596f90757e51104b6 +SIZE (leofs/eproxus-meck-0.8.4_GH0.tar.gz) = 234157 SHA256 (leofs/extend-ranch-1.0.0_GH0.tar.gz) = ec75e8876bf25df2e1f5156909d51cf11f2e98dd76a3be2090fa30ebefc8062f SIZE (leofs/extend-ranch-1.0.0_GH0.tar.gz) = 41121 SHA256 (leofs/ferd-recon-2.3.1_GH0.tar.gz) = c9d9750a07b3743e8a83a273fde83f741b3e802adaf7f8ef666984c985ad0642 SIZE (leofs/ferd-recon-2.3.1_GH0.tar.gz) = 203506 SHA256 (leofs/leo-project-bear-0.8.2-for-leofs_GH0.tar.gz) = 3c547fb59f1d5ba830a3b24cefc600c9ac42b5b41ee9180ebbd2cad7d8899ecd SIZE (leofs/leo-project-bear-0.8.2-for-leofs_GH0.tar.gz) = 110538 -SHA256 (leofs/leo-project-cowboy-for-leofs-1.4_GH0.tar.gz) = ed056447ac98d77d6bc27ac8cddec23f60d368ce9847805757671f2f89967252 -SIZE (leofs/leo-project-cowboy-for-leofs-1.4_GH0.tar.gz) = 4829405 +SHA256 (leofs/leo-project-cowboy-for-leofs-1.4_GH0.tar.gz) = 6d1fc7938c6fc42e457fe4818a19f918ae08d294aec8908df42e59258d00d4e1 +SIZE (leofs/leo-project-cowboy-for-leofs-1.4_GH0.tar.gz) = 4829696 SHA256 (leofs/leo-project-elarm-d9e8a6f_GH0.tar.gz) = abe5140b9f2988dd691e6dda295e3bc549701ae7ebc5e2fec237ac5ba4bb5fa1 SIZE (leofs/leo-project-elarm-d9e8a6f_GH0.tar.gz) = 23600 SHA256 (leofs/leo-project-erpcgen-0.2.5_GH0.tar.gz) = 025032ea1d1edfc577d5e913b5225037cb3b45cb1b0732f94b8b130506091474 SIZE (leofs/leo-project-erpcgen-0.2.5_GH0.tar.gz) = 205451 -SHA256 (leofs/leo-project-fifo_utils-d19b92c_GH0.tar.gz) = 5a9df0a2d5a74134426e8f9c450851f681f82beea7956d761c81b4d245657910 -SIZE (leofs/leo-project-fifo_utils-d19b92c_GH0.tar.gz) = 18092 -SHA256 (leofs/leo-project-folsom-0.8.2-for-leofs_GH0.tar.gz) = fad850337a7f4331a46246c7911d9353b0e42966158561138d95ca1f52ed0d09 -SIZE (leofs/leo-project-folsom-0.8.2-for-leofs_GH0.tar.gz) = 174986 -SHA256 (leofs/leo-project-leo_backend_db-1.2.6_GH0.tar.gz) = 96c9ccee4e3a474abaebda5c634276651751b191bd53662f89b892465fb768e4 -SIZE (leofs/leo-project-leo_backend_db-1.2.6_GH0.tar.gz) = 195305 -SHA256 (leofs/leo-project-leo_cache-0.8.2_GH0.tar.gz) = 09d79ff3344823ca0e0c1de23bbede8f727a7f6c4ad792f6919d1e1d104acba7 -SIZE (leofs/leo-project-leo_cache-0.8.2_GH0.tar.gz) = 187932 -SHA256 (leofs/leo-project-leo_commons-1.1.8_GH0.tar.gz) = df08ff335d70685fca12e06a5762adf7f57147216b43fa37fd02cbca801fc342 -SIZE (leofs/leo-project-leo_commons-1.1.8_GH0.tar.gz) = 198702 +SHA256 (leofs/leo-project-folsom-0.8.2-p1_GH0.tar.gz) = aa2b2724be9600b0aabdcca535bb18334507b165ebc5728ce459f9321276ee0e +SIZE (leofs/leo-project-folsom-0.8.2-p1_GH0.tar.gz) = 174988 +SHA256 (leofs/leo-project-leo_backend_db-1.2.8_GH0.tar.gz) = 48982287f79ccc88928c71614cef23dfbec5fe6d3d5db7e7feff23f9c882c9bf +SIZE (leofs/leo-project-leo_backend_db-1.2.8_GH0.tar.gz) = 195370 +SHA256 (leofs/leo-project-leo_cache-0.8.3_GH0.tar.gz) = 4734aab62b79a53c9ff7fc07f502bc883cf1b5ef5dd6d7cdc571d4ca353c2282 +SIZE (leofs/leo-project-leo_cache-0.8.3_GH0.tar.gz) = 187896 +SHA256 (leofs/leo-project-leo_commons-1.1.9_GH0.tar.gz) = a19dd833f109513c359d9e5abd93c8678e244f3e39f1c73292501d0687755dcb +SIZE (leofs/leo-project-leo_commons-1.1.9_GH0.tar.gz) = 198750 SHA256 (leofs/leo-project-leo_dcerl-0.4.6_GH0.tar.gz) = 3d6c94fe0eef3d090969ce281e492d6162bb5a0f4fc204dd660b26ee73ea9b9f SIZE (leofs/leo-project-leo_dcerl-0.4.6_GH0.tar.gz) = 192867 -SHA256 (leofs/leo-project-leo_logger-1.2.4_GH0.tar.gz) = 4e3390b0b24ea578a8a4ba21b0a472b8c0ae7566d04ec1a0d7652c46164cae4f -SIZE (leofs/leo-project-leo_logger-1.2.4_GH0.tar.gz) = 211468 +SHA256 (leofs/leo-project-leo_logger-1.2.5_GH0.tar.gz) = 65b2f68c74d8ee0ff7f273c1edc4f42ce4bae60c70df707770e7b1f9ac77c00e +SIZE (leofs/leo-project-leo_logger-1.2.5_GH0.tar.gz) = 211445 SHA256 (leofs/leo-project-leo_mcerl-0.6.4_GH0.tar.gz) = 431fe61dc3885d43a8daff56184f8f64b9db8cfa87f29881a7b75998f7690c54 SIZE (leofs/leo-project-leo_mcerl-0.6.4_GH0.tar.gz) = 185304 -SHA256 (leofs/leo-project-leo_mq-1.4.9_GH0.tar.gz) = f58f473f198488b80cb99130af39a4a019ff9b92295c720c670f1986b8be10e9 -SIZE (leofs/leo-project-leo_mq-1.4.9_GH0.tar.gz) = 194267 -SHA256 (leofs/leo-project-leo_object_storage-1.2.28_GH0.tar.gz) = c5194e36335fcfc3403d6359dc53e2e79e3c92b50ac31e29550ad019c5751c0f -SIZE (leofs/leo-project-leo_object_storage-1.2.28_GH0.tar.gz) = 581273 -SHA256 (leofs/leo-project-leo_ordning_reda-1.2.2_GH0.tar.gz) = e2babe869125a022f653d3463897432d72e20d61ff14c9a3c0c4f9fd8d02e227 -SIZE (leofs/leo-project-leo_ordning_reda-1.2.2_GH0.tar.gz) = 190370 -SHA256 (leofs/leo-project-leo_pod-0.6.7_GH0.tar.gz) = 34820af169ad36e44acc845bf60fe56f2c071a76751fc0058d2d28e00fc29f34 -SIZE (leofs/leo-project-leo_pod-0.6.7_GH0.tar.gz) = 170352 -SHA256 (leofs/leo-project-leo_redundant_manager-1.9.29_GH0.tar.gz) = 469cfc3d69e74522b06114063261564734b62fa9a6006b878b3fa1c4947a05d7 -SIZE (leofs/leo-project-leo_redundant_manager-1.9.29_GH0.tar.gz) = 239268 -SHA256 (leofs/leo-project-leo_rpc-0.10.10_GH0.tar.gz) = 4b0346a286101ffe62240e38e3ae299434d195259ca178e552b0999c6729ac38 -SIZE (leofs/leo-project-leo_rpc-0.10.10_GH0.tar.gz) = 197663 -SHA256 (leofs/leo-project-leo_s3_libs-1.2.7_GH0.tar.gz) = 25ef568925ccc80cc6e6b6756517670f62464df6f5298a8edf1156a402fd133e -SIZE (leofs/leo-project-leo_s3_libs-1.2.7_GH0.tar.gz) = 209796 -SHA256 (leofs/leo-project-leo_statistics-1.1.14_GH0.tar.gz) = bc68bab7aeb46d82699c748c88e12f8ceeb89b9d22f6341d9f5cb97b059cb4c4 -SIZE (leofs/leo-project-leo_statistics-1.1.14_GH0.tar.gz) = 190518 -SHA256 (leofs/leo-project-leo_watchdog-0.12.5_GH0.tar.gz) = 4ac034a7a2559caae70192bf115358adda2b0ab1f55275a8d693a6f1b990f37a -SIZE (leofs/leo-project-leo_watchdog-0.12.5_GH0.tar.gz) = 201380 -SHA256 (leofs/leo-project-leo_tran-0.2.7_GH0.tar.gz) = 4839c222616c929be105ee94a721a14f2125b88a0f6ffab0265b7e45d0c2e929 -SIZE (leofs/leo-project-leo_tran-0.2.7_GH0.tar.gz) = 188389 +SHA256 (leofs/leo-project-leo_mq-1.4.12_GH0.tar.gz) = bd30cbf6f18fd8bcfe1e3754f633b59f7e08cc5e0ff61dbdc9281408d14ba90e +SIZE (leofs/leo-project-leo_mq-1.4.12_GH0.tar.gz) = 194234 +SHA256 (leofs/leo-project-leo_object_storage-1.2.30_GH0.tar.gz) = 8e445a34804609475eacb0d328672ac6dec69d116b3ac161c8b7c3d8d043fb97 +SIZE (leofs/leo-project-leo_object_storage-1.2.30_GH0.tar.gz) = 581138 +SHA256 (leofs/leo-project-leo_ordning_reda-1.2.4_GH0.tar.gz) = 0900177b20166b14ba522f763ef4fb7c9ce88e2f168b25083dc7a8eb5bae8ce4 +SIZE (leofs/leo-project-leo_ordning_reda-1.2.4_GH0.tar.gz) = 190372 +SHA256 (leofs/leo-project-leo_pod-0.6.8_GH0.tar.gz) = 892c366788f4bd5f742a86ce1584de254c5702f455dabc76118fc013db698d82 +SIZE (leofs/leo-project-leo_pod-0.6.8_GH0.tar.gz) = 170692 +SHA256 (leofs/leo-project-leo_redundant_manager-1.9.32_GH0.tar.gz) = fd2becb8d997cb7fc4b942feda6cbba5209f5e6588e6be12dd5630207ad02e8f +SIZE (leofs/leo-project-leo_redundant_manager-1.9.32_GH0.tar.gz) = 239250 +SHA256 (leofs/leo-project-leo_rpc-0.10.12_GH0.tar.gz) = c30b68edcdff6ad71e5c2971b5458332c67efcf2bfb05b75113be20afe5dcac6 +SIZE (leofs/leo-project-leo_rpc-0.10.12_GH0.tar.gz) = 197777 +SHA256 (leofs/leo-project-leo_s3_libs-1.2.9_GH0.tar.gz) = c476812fc80ab847204e7e97ea7ff32ca5f705a37d148b1fc5f8e794f2bbb387 +SIZE (leofs/leo-project-leo_s3_libs-1.2.9_GH0.tar.gz) = 209766 +SHA256 (leofs/leo-project-leo_statistics-1.1.17_GH0.tar.gz) = 8e25aca6b19f4d3f814246e9d7cad5f081a151a8559ac8ecd15b380adb691702 +SIZE (leofs/leo-project-leo_statistics-1.1.17_GH0.tar.gz) = 190515 +SHA256 (leofs/leo-project-leo_tran-0.2.8_GH0.tar.gz) = 1988005f031738678bd0f7cd34eaaa7b4028cc274bd2955e5ec47aaef35a646a +SIZE (leofs/leo-project-leo_tran-0.2.8_GH0.tar.gz) = 188382 +SHA256 (leofs/leo-project-leo_watchdog-0.12.6_GH0.tar.gz) = 5e4dfa84704e8f44a8d422d364a63422bb95e0f4c9ab9a5b4dd6712476a00d0e +SIZE (leofs/leo-project-leo_watchdog-0.12.6_GH0.tar.gz) = 201292 SHA256 (leofs/leo-project-libcutil-0.4.4_GH0.tar.gz) = da6b7ed990d45b960e1eb8f2bafc8ae8a127deac5ce71fe58e18359564451c68 SIZE (leofs/leo-project-libcutil-0.4.4_GH0.tar.gz) = 23825 SHA256 (leofs/leo-project-nfs_rpc_server-0.2.5_GH0.tar.gz) = 4f90b106f0aa637b109f05592804a083609a9700656b2b49fbda60d37d28cc89 SIZE (leofs/leo-project-nfs_rpc_server-0.2.5_GH0.tar.gz) = 197604 -SHA256 (leofs/leo-project-savanna_agent-0.4.17_GH0.tar.gz) = 06765aa38ab3df98e418089b0f4ab4952466570860149cee6c41112868f4b230 -SIZE (leofs/leo-project-savanna_agent-0.4.17_GH0.tar.gz) = 187111 -SHA256 (leofs/leo-project-savanna_commons-0.10.3_GH0.tar.gz) = 5bba18cc0f9ebcc166b8cf592888b52a51719356548ddb5c2699c96e691ccf19 -SIZE (leofs/leo-project-savanna_commons-0.10.3_GH0.tar.gz) = 198374 +SHA256 (leofs/leo-project-savanna_agent-0.4.20_GH0.tar.gz) = cffab336102c0bbf81563866787463111863738b1fbb96355da9253ec9677bc6 +SIZE (leofs/leo-project-savanna_agent-0.4.20_GH0.tar.gz) = 187126 +SHA256 (leofs/leo-project-savanna_commons-0.10.6_GH0.tar.gz) = f3267581e354cf55ea6813da23bd84ce165aa2d7edd145de5ebf87d953350bb7 +SIZE (leofs/leo-project-savanna_commons-0.10.6_GH0.tar.gz) = 198374 SHA256 (leofs/manopapad-proper-f558989_GH0.tar.gz) = 67db9f6ee77a5f54967b99d70974d9dda1a07f5cd8839ef8ad80625fde639c1b SIZE (leofs/manopapad-proper-f558989_GH0.tar.gz) = 292555 +SHA256 (leofs/ninenines-cowlib-1.0.0_GH0.tar.gz) = 48a8784ae7d266724276f9842b3a06cfbbfe69469f58c27237c602232f7ebe5a +SIZE (leofs/ninenines-cowlib-1.0.0_GH0.tar.gz) = 41538 Index: head/databases/leofs/files/patch-deps-leo_gateway-priv-leo_gateway.schema =================================================================== --- head/databases/leofs/files/patch-deps-leo_gateway-priv-leo_gateway.schema (revision 433108) +++ head/databases/leofs/files/patch-deps-leo_gateway-priv-leo_gateway.schema (nonexistent) @@ -1,144 +0,0 @@ ---- deps/leo_gateway/priv/leo_gateway.schema.orig 2014-08-06 05:56:49.000000000 +0300 -+++ deps/leo_gateway/priv/leo_gateway.schema 2014-08-13 23:13:17.000000000 +0300 -@@ -37,7 +37,7 @@ - "sasl.sasl_error_logger", - [ - {datatype, string}, -- {default, "./log/sasl/sasl-error.log"} -+ {default, "%%LEOFS_LOGDIR%%/leo_gateway/sasl/sasl-error.log"} - ]}. - - {translation, "sasl.sasl_error_logger", -@@ -63,7 +63,7 @@ - "sasl.error_logger_mf_dir", - "sasl.error_logger_mf_dir", - [ -- {default, "./log/sasl"} -+ {default, "%%LEOFS_LOGDIR%%/leo_gateway/sasl"} - ]}. - - %% @doc Specifies how large each individual file can be. -@@ -104,7 +104,7 @@ - Managers = cuttlefish_util:conf_get_value("managers", Conf), - case string:tokens(Managers, "[ , ]") of - [] -> -- ['manager_0@127.0.0.1', 'manager_1@127.0.0.1']; -+ ['manager@127.0.0.1', 'manager_slave@127.0.0.1']; - Tokens -> - lists:map(fun(X) -> - list_to_atom(X) -@@ -191,7 +191,7 @@ - "http.ssl_certfile", - "leo_gateway.http.ssl_certfile", - [ -- {default, "./etc/server_cert.pem"} -+ {default, "%%PREFIX%%/etc/leofs/server_cert.pem"} - ]}. - - %% @doc SSL key -@@ -199,7 +199,7 @@ - "http.ssl_keyfile", - "leo_gateway.http.ssl_keyfile", - [ -- {default, "./etc/server_key.pem"} -+ {default, "%%PREFIX%%/etc/leofs/server_key.pem"} - ]}. - - %% @doc Synchronized time of a bucket property (second) -@@ -306,7 +306,7 @@ - "cache.cache_disc_dir_data", - "leo_gateway.cache.cache_disc_dir_data", - [ -- {default, "./cache/data"} -+ {default, "%%LEOFS_DBDIR%%/leo_gateway/cache/data"} - ]}. - - %% @doc Directory for the disk cache journal -@@ -314,7 +314,7 @@ - "cache.cache_disc_dir_journal", - "leo_gateway.cache.cache_disc_dir_journal", - [ -- {default, "./cache/journal"} -+ {default, "%%LEOFS_DBDIR%%/leo_gateway/cache/journal"} - ]}. - - %% @doc Cache Expire in seconds -@@ -484,7 +484,7 @@ - "leo_gateway.log_dir", - [ - {datatype, string}, -- {default, "./log/erlang"} -+ {default, "%%LEOFS_LOGDIR%%/leo_gateway/erlang"} - ]}. - - %% @doc Output log file(s) - app -@@ -493,7 +493,7 @@ - "leo_gateway.log_appender", - [ - {datatype, string}, -- {default, "./log/app"} -+ {default, "%%LEOFS_LOGDIR%%/leo_gateway/app"} - ]}. - - {translation, "leo_gateway.log_appender", -@@ -508,7 +508,7 @@ - "leo_redundant_manager.log_dir_member", - [ - {datatype, string}, -- {default, "./log/ring"} -+ {default, "%%LEOFS_LOGDIR%%/leo_gateway/ring"} - ]}. - - %% @doc Output log file(s) - ring -@@ -517,7 +517,7 @@ - "leo_redundant_manager.log_dir_ring", - [ - {datatype, string}, -- {default, "./log/ring"} -+ {default, "%%LEOFS_LOGDIR%%/leo_gateway/ring"} - ]}. - - -@@ -529,7 +529,7 @@ - "queue_dir", - "leo_gateway.queue_dir", - [ -- {default, "./work/queue"} -+ {default, "%%LEOFS_DBDIR%%/leo_gateway/queue"} - ]}. - - %% @doc Directory of SNMP agent configuration -@@ -537,7 +537,7 @@ - "snmp_agent", - "leo_gateway.snmp_agent", - [ -- {default, "./snmp/snmpa_gateway_0/LEO-GATEWAY"} -+ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_gateway/LEO-GATEWAY"} - ]}. - - -@@ -752,7 +752,7 @@ - "nodename", - "vm_args.-name", - [ -- {default, "gateway_0@127.0.0.1"} -+ {default, "gateway@127.0.0.1"} - ]}. - - %% @doc Cookie for distributed node communication. All nodes in the same cluster -@@ -800,7 +800,7 @@ - "erlang.crash_dump", - "vm_args.-env ERL_CRASH_DUMP", - [ -- {default, "./log/erl_crash.dump"} -+ {default, "%%LEOFS_LOGDIR%%/leo_gateway/erl_crash.dump"} - ]}. - - %% @doc Raise the ETS table limit -@@ -839,5 +839,5 @@ - "snmp_conf", - "vm_args.-config", - [ -- {default, "./snmp/snmpa_gateway_0/leo_gateway_snmp"} -+ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_gateway/leo_gateway_snmp"} - ]}. Property changes on: head/databases/leofs/files/patch-deps-leo_gateway-priv-leo_gateway.schema ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_0.schema =================================================================== --- head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_0.schema (revision 433108) +++ head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_0.schema (nonexistent) @@ -1,99 +0,0 @@ ---- deps/leo_manager/priv/leo_manager_0.schema.orig 2014-06-15 20:05:19.000000000 +0300 -+++ deps/leo_manager/priv/leo_manager_0.schema 2014-06-15 20:06:20.000000000 +0300 -@@ -37,7 +37,7 @@ - "sasl.sasl_error_logger", - [ - {datatype, string}, -- {default, "./log/sasl/sasl-error.log"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager/sasl/sasl-error.log"} - ]}. - - {translation, "sasl.sasl_error_logger", -@@ -63,7 +63,7 @@ - "sasl.error_logger_mf_dir", - "sasl.error_logger_mf_dir", - [ -- {default, "./log/sasl"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager/sasl"} - ]}. - - %% @doc Specifies how large each individual file can be. -@@ -286,7 +286,7 @@ - "mnesia.dir", - [ - {datatype, string}, -- {default, "./work/mnesia/127.0.0.1"} -+ {default, "%%LEOFS_DBDIR%%/leo_manager/mnesia/127.0.0.1"} - ]}. - - %% @doc The write threshold for transaction log dumps -@@ -328,7 +328,7 @@ - "leo_manager.log_dir", - [ - {datatype, string}, -- {default, "./log/erlang"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager/erlang"} - ]}. - - %% @doc Output log file(s) - app -@@ -337,7 +337,7 @@ - "leo_manager.log_appender", - [ - {datatype, string}, -- {default, "./log/app"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager/app"} - ]}. - - {translation, "leo_manager.log_appender", -@@ -352,7 +352,7 @@ - "leo_redundant_manager.log_dir_member", - [ - {datatype, string}, -- {default, "./log/ring"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager/ring"} - ]}. - - %% @doc Output log file(s) - ring -@@ -361,7 +361,7 @@ - "leo_redundant_manager.log_dir_ring", - [ - {datatype, string}, -- {default, "./log/ring"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager/ring"} - ]}. - - -@@ -373,7 +373,7 @@ - "queue_dir", - "leo_manager.queue_dir", - [ -- {default, "./work/queue"} -+ {default, "%%LEOFS_DBDIR%%/leo_manager/queue"} - ]}. - - %% @doc Directory of SNMP agent configuration -@@ -381,7 +381,7 @@ - "snmp_agent", - "leo_manager.snmp_agent", - [ -- {default, "./snmp/snmpa_manager_0/LEO-MANAGER"} -+ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_manager/LEO-MANAGER"} - ]}. - - -@@ -592,7 +592,7 @@ - "erlang.crash_dump", - "vm_args.-env ERL_CRASH_DUMP", - [ -- {default, "./log/erl_crash.dump"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager/erl_crash.dump"} - ]}. - - %% @doc Raise the ETS table limit -@@ -631,5 +631,5 @@ - "snmp_conf", - "vm_args.-config", - [ -- {default, "./snmp/snmpa_manager_0/leo_manager_snmp"} -+ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_manager/leo_manager_snmp"} - ]}. Property changes on: head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_0.schema ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-deps-leo_manager-snmp-snmpa_manager_1-leo_manager_snmp.config =================================================================== --- head/databases/leofs/files/patch-deps-leo_manager-snmp-snmpa_manager_1-leo_manager_snmp.config (revision 433108) +++ head/databases/leofs/files/patch-deps-leo_manager-snmp-snmpa_manager_1-leo_manager_snmp.config (nonexistent) @@ -1,11 +0,0 @@ ---- deps/leo_manager/snmp/snmpa_manager_1/leo_manager_snmp.config.orig 2014-06-15 21:57:21.000000000 +0300 -+++ deps/leo_manager/snmp/snmpa_manager_1/leo_manager_snmp.config 2014-06-15 21:59:33.000000000 +0300 -@@ -1,6 +1,6 @@ - [{snmp, [{agent, [{versions, [v1, v2]}, -- {db_dir, "snmp/snmpa_manager_1/db"}, -- {config, [{dir, "snmp/snmpa_manager_1/agent/conf"}, -+ {db_dir, "%%LEOFS_DBDIR%%/snmp/snmpa_manager_slave"}, -+ {config, [{dir, "%%PREFIX%%/lib/leofs/snmp/snmpa_manager_slave/agent/conf"}, - {verbosity, silence}]}, - {net_if, [{verbosity, silence}]} - ]}, Property changes on: head/databases/leofs/files/patch-deps-leo_manager-snmp-snmpa_manager_1-leo_manager_snmp.config ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-deps-leo_manager-snmp-snmpa_manager_0-leo_manager_snmp.config =================================================================== --- head/databases/leofs/files/patch-deps-leo_manager-snmp-snmpa_manager_0-leo_manager_snmp.config (revision 433108) +++ head/databases/leofs/files/patch-deps-leo_manager-snmp-snmpa_manager_0-leo_manager_snmp.config (nonexistent) @@ -1,11 +0,0 @@ ---- deps/leo_manager/snmp/snmpa_manager_0/leo_manager_snmp.config.orig 2014-06-15 21:57:21.000000000 +0300 -+++ deps/leo_manager/snmp/snmpa_manager_0/leo_manager_snmp.config 2014-06-15 21:59:33.000000000 +0300 -@@ -1,6 +1,6 @@ - [{snmp, [{agent, [{versions, [v1, v2]}, -- {db_dir, "snmp/snmpa_manager_0/db"}, -- {config, [{dir, "snmp/snmpa_manager_0/agent/conf"}, -+ {db_dir, "%%LEOFS_DBDIR%%/snmp/snmpa_manager"}, -+ {config, [{dir, "%%PREFIX%%/lib/leofs/snmp/snmpa_manager/agent/conf"}, - {verbosity, silence}]}, - {net_if, [{verbosity, silence}]} - ]}, Property changes on: head/databases/leofs/files/patch-deps-leo_manager-snmp-snmpa_manager_0-leo_manager_snmp.config ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_1.schema =================================================================== --- head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_1.schema (revision 433108) +++ head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_1.schema (nonexistent) @@ -1,108 +0,0 @@ ---- deps/leo_manager/priv/leo_manager_1.schema.orig 2014-06-15 20:05:45.000000000 +0300 -+++ deps/leo_manager/priv/leo_manager_1.schema 2014-06-15 20:06:47.000000000 +0300 -@@ -37,7 +37,7 @@ - "sasl.sasl_error_logger", - [ - {datatype, string}, -- {default, "./log/sasl/sasl-error.log"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/sasl/sasl-error.log"} - ]}. - - {translation, "sasl.sasl_error_logger", -@@ -63,7 +63,7 @@ - "sasl.error_logger_mf_dir", - "sasl.error_logger_mf_dir", - [ -- {default, "./log/sasl"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/sasl"} - ]}. - - %% @doc Specifies how large each individual file can be. -@@ -167,7 +167,7 @@ - "mnesia.dir", - [ - {datatype, string}, -- {default, "./work/mnesia/127.0.0.1"} -+ {default, "%%LEOFS_DBDIR%%/leo_manager_slave/mnesia/127.0.0.1"} - ]}. - - %% @doc The write threshold for transaction log dumps -@@ -209,7 +209,7 @@ - "leo_manager.log_dir", - [ - {datatype, string}, -- {default, "./log/erlang"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/erlang"} - ]}. - - %% @doc Output log file(s) - app -@@ -218,7 +218,7 @@ - "leo_manager.log_appender", - [ - {datatype, string}, -- {default, "./log/app"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/app"} - ]}. - - {translation, "leo_manager.log_appender", -@@ -233,7 +233,7 @@ - "leo_redundant_manager.log_dir_member", - [ - {datatype, string}, -- {default, "./log/ring"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/ring"} - ]}. - - %% @doc Output log file(s) - ring -@@ -242,7 +242,7 @@ - "leo_redundant_manager.log_dir_ring", - [ - {datatype, string}, -- {default, "./log/ring"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/ring"} - ]}. - - -@@ -254,7 +254,7 @@ - "queue_dir", - "leo_manager.queue_dir", - [ -- {default, "./work/queue"} -+ {default, "%%LEOFS_DBDIR%%/leo_manager_slave/queue"} - ]}. - - %% @doc Directory of SNMP agent configuration -@@ -262,7 +262,7 @@ - "snmp_agent", - "leo_manager.snmp_agent", - [ -- {default, "./snmp/snmpa_manager_0/LEO-MANAGER"} -+ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_manager/LEO-MANAGER"} - ]}. - - -@@ -426,7 +426,7 @@ - "nodename", - "vm_args.-name", - [ -- {default, "manager_0@127.0.0.1"} -+ {default, "manager_slave@127.0.0.1"} - ]}. - - %% @doc Cookie for distributed node communication. All nodes in the same cluster -@@ -474,7 +474,7 @@ - "erlang.crash_dump", - "vm_args.-env ERL_CRASH_DUMP", - [ -- {default, "./log/erl_crash.dump"} -+ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/erl_crash.dump"} - ]}. - - %% @doc Raise the ETS table limit -@@ -513,5 +513,5 @@ - "snmp_conf", - "vm_args.-config", - [ -- {default, "./snmp/snmpa_manager_0/leo_manager_snmp"} -+ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_manager_slave/leo_manager_snmp"} - ]}. Property changes on: head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_1.schema ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-deps-leo_gateway-snmp-snmpa_gateway_0-leo_gateway_snmp.config =================================================================== --- head/databases/leofs/files/patch-deps-leo_gateway-snmp-snmpa_gateway_0-leo_gateway_snmp.config (revision 433108) +++ head/databases/leofs/files/patch-deps-leo_gateway-snmp-snmpa_gateway_0-leo_gateway_snmp.config (nonexistent) @@ -1,11 +0,0 @@ ---- deps/leo_gateway/snmp/snmpa_gateway_0/leo_gateway_snmp.config.orig 2014-06-15 22:05:33.000000000 +0300 -+++ deps/leo_gateway/snmp/snmpa_gateway_0/leo_gateway_snmp.config 2014-06-15 22:06:17.000000000 +0300 -@@ -1,6 +1,6 @@ - [{snmp, [{agent, [{versions, [v1, v2]}, -- {db_dir, "snmp/snmpa_gateway_0/db"}, -- {config, [{dir, "snmp/snmpa_gateway_0/agent/conf"}, -+ {db_dir, "%%LEOFS_DBDIR%%/snmp/snmpa_gateway"}, -+ {config, [{dir, "%%PREFIX%%/lib/leofs/snmp/snmpa_gateway/agent/conf"}, - {verbosity, silence}]}, - {net_if, [{verbosity, silence}]} - ]}, Property changes on: head/databases/leofs/files/patch-deps-leo_gateway-snmp-snmpa_gateway_0-leo_gateway_snmp.config ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-deps-leo_gateway-priv-leo_gateway.conf =================================================================== --- head/databases/leofs/files/patch-deps-leo_gateway-priv-leo_gateway.conf (revision 433108) +++ head/databases/leofs/files/patch-deps-leo_gateway-priv-leo_gateway.conf (nonexistent) @@ -1,111 +0,0 @@ ---- deps/leo_gateway/priv/leo_gateway.conf.orig 2016-03-29 12:43:41.000000000 +0300 -+++ deps/leo_gateway/priv/leo_gateway.conf 2016-04-09 10:29:53.029616000 +0300 -@@ -13,7 +13,7 @@ - ## about configuration parameters - - ## SASL error log path --## sasl.sasl_error_log = ./log/sasl/sasl-error.log -+## sasl.sasl_error_log = %%LEOFS_LOGDIR%%/leo_gateway/sasl/sasl-error.log - - ## Restricts the error logging performed by the specified sasl_error_logger - ## to error reports, progress reports, or both. -@@ -22,7 +22,7 @@ - - ## Specifies in which directory the files are stored. - ## If this parameter is undefined or false, the error_logger_mf_h is not installed. --## sasl.error_logger_mf_dir = ./log/sasl -+## sasl.error_logger_mf_dir = %%LEOFS_LOGDIR%%/leo_gateway/sasl - - ## Specifies how large each individual file can be. - ## If this parameter is undefined, the error_logger_mf_h is not installed. -@@ -36,7 +36,7 @@ - ## Manager's Node(s) - ## -------------------------------------------------------------------- - ## Name of Manager node(s) --managers = [manager_0@127.0.0.1, manager_1@127.0.0.1] -+managers = [manager@127.0.0.1, manager_slave@127.0.0.1] - - - ## -------------------------------------------------------------------- -@@ -65,10 +65,10 @@ - ## http.ssl_port = 8443 - - ## SSL Certificate file --## http.ssl_certfile = ./etc/server_cert.pem -+## http.ssl_certfile = %%PREFIX%%/etc/leofs/server_cert.pem - - ## SSL key --## http.ssl_keyfile = ./etc/server_key.pem -+## http.ssl_keyfile = %%PREFIX%%/etc/leofs/server_key.pem - - ## HTTP custom header configuration file path - ## http.headers_config_file = ./etc/http_custom_header.conf -@@ -141,10 +141,10 @@ - ## cache.cache_disc_threshold_len = 1048576 - - ## Directory for the disk cache data --## cache.cache_disc_dir_data = ./cache/data -+## cache.cache_disc_dir_data = %%LEOFS_DBDIR%%/leo_gateway/cache/data - - ## Directory for the disk cache journal --## cache.cache_disc_dir_journal = ./cache/journal -+## cache.cache_disc_dir_journal = %%LEOFS_DBDIR%%/leo_gateway/cache/journal - - - ## -@@ -256,25 +256,25 @@ - ## log.is_enable_access_log = false - - ## Output log file(s) - Erlang's log --## log.erlang = ./log/erlang -+## log.erlang = %%LEOFS_LOGDIR%%/leo_gateway/erlang - - ## Output log file(s) - app --## log.app = ./log/app -+## log.app = %%LEOFS_LOGDIR%%/leo_gateway/app - - ## Output log file(s) - members of storage-cluster --## log.member_dir = ./log/ring -+## log.member_dir = %%LEOFS_LOGDIR%%/leo_gateway/ring - - ## Output log file(s) - ring --## log.ring_dir = ./log/ring -+## log.ring_dir = %%LEOFS_LOGDIR%%/leo_gateway/ring - - ## -------------------------------------------------------------------- - ## GATEWAY - Other Directories - ## -------------------------------------------------------------------- - ## Directory of queue for monitoring "RING" --## queue_dir = ./work/queue -+## queue_dir = %%LEOFS_DBDIR%%/leo_gateway/queue - - ## Directory of SNMP agent configuration --## snmp_agent = ./snmp/snmpa_gateway_0/LEO-GATEWAY -+## snmp_agent = %%PREFIX%%/lib/leofs/snmp/snmpa_gateway_0/LEO-GATEWAY - - - ## -------------------------------------------------------------------- -@@ -313,7 +313,7 @@ - ## For vm.args - ##====================================================================== - ## Name of the leofs-gateway node --nodename = gateway_0@127.0.0.1 -+nodename = gateway@127.0.0.1 - - ## Cookie for distributed node communication. All nodes in the same cluster - ## should use the same cookie or they will not be able to communicate. -@@ -329,7 +329,7 @@ - erlang.max_ports = 64000 - - ## Set the location of crash dumps --erlang.crash_dump = ./log/erl_crash.dump -+erlang.crash_dump = %%LEOFS_LOGDIR%%/leo_gateway/erl_crash.dump - - ## Raise the ETS table limit - erlang.max_ets_tables = 256000 -@@ -359,4 +359,4 @@ - process_limit = 1048576 - - ## Path of SNMP-agent configuration --## snmp_conf = ./snmp/snmpa_gateway_0/leo_gateway_snmp -+snmp_conf = %%PREFIX%%/lib/leofs/snmp/snmpa_gateway/leo_gateway_snmp Property changes on: head/databases/leofs/files/patch-deps-leo_gateway-priv-leo_gateway.conf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-deps-leo_storage-priv-leo_storage.schema =================================================================== --- head/databases/leofs/files/patch-deps-leo_storage-priv-leo_storage.schema (revision 433108) +++ head/databases/leofs/files/patch-deps-leo_storage-priv-leo_storage.schema (nonexistent) @@ -1,117 +0,0 @@ ---- deps/leo_storage/priv/leo_storage.schema.orig 2014-12-17 11:21:38.000000000 +0200 -+++ deps/leo_storage/priv/leo_storage.schema 2014-12-20 00:06:58.000000000 +0200 -@@ -37,7 +37,7 @@ - "sasl.sasl_error_logger", - [ - {datatype, string}, -- {default, "./log/sasl/sasl-error.log"} -+ {default, "%%LEOFS_LOGDIR%%/leo_storage/sasl/sasl-error.log"} - ]}. - - {translation, "sasl.sasl_error_logger", -@@ -63,7 +63,7 @@ - "sasl.error_logger_mf_dir", - "sasl.error_logger_mf_dir", - [ -- {default, "./log/sasl"} -+ {default, "%%LEOFS_LOGDIR%%/leo_storage/sasl"} - ]}. - - %% @doc Specifies how large each individual file can be. -@@ -104,7 +104,7 @@ - Managers = cuttlefish_util:conf_get_value("managers", Conf), - case string:tokens(Managers, "[ , ]") of - [] -> -- ['manager_0@127.0.0.1', 'manager_1@127.0.0.1']; -+ ['manager@127.0.0.1', 'manager_slave@127.0.0.1']; - Tokens -> - lists:map(fun(X) -> - list_to_atom(X) -@@ -146,7 +146,7 @@ - Paths = cuttlefish_util:conf_get_value("obj_containers.path", Conf), - Paths_1 = case string:tokens(Paths, "[ , ]") of - [] -> -- ["./avs"]; -+ ["%%LEOFS_DBDIR%%/leo_storage/avs"]; - Tokens_1 -> - Tokens_1 - end, -@@ -780,7 +780,7 @@ - "leo_storage.log_dir", - [ - {datatype, string}, -- {default, "./log/erlang"} -+ {default, "%%LEOFS_LOGDIR%%/leo_storage/erlang"} - ]}. - - %% @doc Output log file(s) - app -@@ -789,7 +789,7 @@ - "leo_storage.log_appender", - [ - {datatype, string}, -- {default, "./log/app"} -+ {default, "%%LEOFS_LOGDIR%%/leo_storage/app"} - ]}. - - {translation, "leo_storage.log_appender", -@@ -804,7 +804,7 @@ - "leo_redundant_manager.log_dir_member", - [ - {datatype, string}, -- {default, "./log/ring"} -+ {default, "%%LEOFS_LOGDIR%%/leo_storage/ring"} - ]}. - - %% @doc Output log file(s) - ring -@@ -813,7 +813,7 @@ - "leo_redundant_manager.log_dir_ring", - [ - {datatype, string}, -- {default, "./log/ring"} -+ {default, "%%LEOFS_LOGDIR%%/leo_storage/ring"} - ]}. - - %% @doc is enable data-diagnosis log -@@ -833,7 +833,7 @@ - "queue_dir", - "leo_storage.queue_dir", - [ -- {default, "./work/queue"} -+ {default, "%%LEOFS_DBDIR%%/leo_storage/queue"} - ]}. - - %% @doc Directory of SNMP agent configuration -@@ -841,7 +841,7 @@ - "snmp_agent", - "leo_storage.snmp_agent", - [ -- {default, "./snmp/snmpa_storage_0/LEO-STORAGE"} -+ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_storage/LEO-STORAGE"} - ]}. - - -@@ -1070,7 +1070,7 @@ - "nodename", - "vm_args.-name", - [ -- {default, "storage_0@127.0.0.1"} -+ {default, "storage@127.0.0.1"} - ]}. - - %% @doc Cookie for distributed node communication. All nodes in the same cluster -@@ -1121,7 +1121,7 @@ - "erlang.crash_dump", - "vm_args.-env ERL_CRASH_DUMP", - [ -- {default, "./log/erl_crash.dump"} -+ {default, "%%LEOFS_LOGDIR%%/leo_storage/erl_crash.dump"} - ]}. - - %% @doc Raise the ETS table limit -@@ -1202,5 +1202,5 @@ - "snmp_conf", - "vm_args.-config", - [ -- {default, "./snmp/snmpa_storage_0/leo_storage_snmp"} -+ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_storage/leo_storage_snmp"} - ]}. Property changes on: head/databases/leofs/files/patch-deps-leo_storage-priv-leo_storage.schema ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-deps-leo_storage-priv-leo_storage.conf =================================================================== --- head/databases/leofs/files/patch-deps-leo_storage-priv-leo_storage.conf (revision 433108) +++ head/databases/leofs/files/patch-deps-leo_storage-priv-leo_storage.conf (nonexistent) @@ -1,103 +0,0 @@ ---- deps/leo_storage/priv/leo_storage.conf.orig 2015-06-30 07:30:19.000000000 +0300 -+++ deps/leo_storage/priv/leo_storage.conf 2015-07-04 21:02:35.000000000 +0300 -@@ -13,7 +13,7 @@ - ## about configuration parameters - - ## SASL error log path --## sasl.sasl_error_log = ./log/sasl/sasl-error.log -+## sasl.sasl_error_log = %%LEOFS_LOGDIR%%/leo_storage/sasl/sasl-error.log - - ## Restricts the error logging performed by the specified sasl_error_logger - ## to error reports, progress reports, or both. -@@ -22,7 +22,7 @@ - - ## Specifies in which directory the files are stored. - ## If this parameter is undefined or false, the error_logger_mf_h is not installed. --## sasl.error_logger_mf_dir = ./log/sasl -+## sasl.error_logger_mf_dir = %%LEOFS_LOGDIR%%/leo_storage/sasl - - ## Specifies how large each individual file can be. - ## If this parameter is undefined, the error_logger_mf_h is not installed. -@@ -36,13 +36,13 @@ - ## Manager's Node(s) - ## -------------------------------------------------------------------- - ## Name of Manager node(s) --managers = [manager_0@127.0.0.1, manager_1@127.0.0.1] -+managers = [manager@127.0.0.1, manager_slave@127.0.0.1] - - ## -------------------------------------------------------------------- - ## STORAGE - ## -------------------------------------------------------------------- - ## Object container --obj_containers.path = [./avs] -+obj_containers.path = [%%LEOFS_DBDIR%%/leo_storage/avs] - obj_containers.num_of_containers = [8] - - ## e.g. Case of plural pathes -@@ -239,16 +239,16 @@ - log.log_level = 1 - - ## Output log file(s) - Erlang's log --## log.erlang = ./log/erlang -+## log.erlang = %%LEOFS_LOGDIR%%/leo_storage/erlang - - ## Output log file(s) - app --## log.app = ./log/app -+## log.app = %%LEOFS_LOGDIR%%/leo_storage/app - - ## Output log file(s) - members of storage-cluster --## log.member_dir = ./log/ring -+## log.member_dir = %%LEOFS_LOGDIR%%/leo_storage/ring - - ## Output log file(s) - ring --## log.ring_dir = ./log/ring -+## log.ring_dir = %%LEOFS_LOGDIR%%/leo_storage/ring - - ## Output data-diagnosis log - log.is_enable_diagnosis_log = true -@@ -257,10 +257,10 @@ - ## STORAGE - Other Directories - ## -------------------------------------------------------------------- - ## Directory of queue for monitoring "RING" --## queue_dir = ./work/queue -+## queue_dir = %%LEOFS_DBDIR%%/leo_storage/queue - - ## Directory of SNMP agent configuration --## snmp_agent = ./snmp/snmpa_storage_0/LEO-STORAGE -+## snmp_agent = %%PREFIX%%/lib/leofs/snmp/snmpa_storage/LEO-STORAGE - - - ## -------------------------------------------------------------------- -@@ -270,7 +270,7 @@ - ## leo_ordning_reda.send_after_interval = 100 - - ## Temporary directory of stacked objects --## leo_ordning_reda.temp_stacked_dir = "work/ord_reda/" -+## leo_ordning_reda.temp_stacked_dir = %%LEOFS_DBDIR%%/leo_storage/ord_reda/ - - - ## -------------------------------------------------------------------- -@@ -344,7 +344,7 @@ - ## For vm.args - ##====================================================================== - ## Name of the leofs-storage node --nodename = storage_0@127.0.0.1 -+nodename = storage@127.0.0.1 - - ## Cookie for distributed node communication. All nodes in the same cluster - ## should use the same cookie or they will not be able to communicate. -@@ -360,7 +360,7 @@ - erlang.max_ports = 64000 - - ## Set the location of crash dumps --erlang.crash_dump = ./log/erl_crash.dump -+erlang.crash_dump = %%LEOFS_LOGDIR%%/leo_storage/erl_crash.dump - - ## Raise the ETS table limit - erlang.max_ets_tables = 256000 -@@ -390,4 +390,4 @@ - process_limit = 1048576 - - ## Path of SNMP-agent configuration --## snmp_conf = ./snmp/snmpa_storage_0/leo_storage_snmp -+snmp_conf = %%PREFIX%%/lib/leofs/snmp/snmpa_storage/leo_storage_snmp Property changes on: head/databases/leofs/files/patch-deps-leo_storage-priv-leo_storage.conf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-deps-leo_storage-snmp-snmpa_storage_0-leo_storage_snmp.config =================================================================== --- head/databases/leofs/files/patch-deps-leo_storage-snmp-snmpa_storage_0-leo_storage_snmp.config (revision 433108) +++ head/databases/leofs/files/patch-deps-leo_storage-snmp-snmpa_storage_0-leo_storage_snmp.config (nonexistent) @@ -1,11 +0,0 @@ ---- deps/leo_storage/snmp/snmpa_storage_0/leo_storage_snmp.config.orig 2014-06-15 22:07:24.000000000 +0300 -+++ deps/leo_storage/snmp/snmpa_storage_0/leo_storage_snmp.config 2014-06-15 22:08:18.000000000 +0300 -@@ -1,6 +1,6 @@ - [{snmp, [{agent, [{versions, [v1, v2]}, -- {db_dir, "snmp/snmpa_storage_0/db"}, -- {config, [{dir, "snmp/snmpa_storage_0/agent/conf"}, -+ {db_dir, "%%LEOFS_DBDIR%%/snmp/snmpa_storage"}, -+ {config, [{dir, "%%PREFIX%%/lib/leofs/snmp/snmpa_storage/agent/conf"}, - {verbosity, silence}]}, - {net_if, [{verbosity, silence}]} - ]}, Property changes on: head/databases/leofs/files/patch-deps-leo_storage-snmp-snmpa_storage_0-leo_storage_snmp.config ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_0.conf =================================================================== --- head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_0.conf (revision 433108) +++ head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_0.conf (nonexistent) @@ -1,95 +0,0 @@ ---- deps/leo_manager/priv/leo_manager_0.conf.orig 2015-04-14 10:09:26.000000000 +0300 -+++ deps/leo_manager/priv/leo_manager_0.conf 2015-05-02 21:56:17.000000000 +0300 -@@ -13,7 +13,7 @@ - ## about configuration parameters - - ## SASL error log path --## sasl.sasl_error_log = ./log/sasl/sasl-error.log -+## sasl.sasl_error_log = %%LEOFS_LOGDIR%%/leo_manager/sasl/sasl-error.log - - ## Restricts the error logging performed by the specified sasl_error_logger - ## to error reports, progress reports, or both. -@@ -22,7 +22,7 @@ - - ## Specifies in which directory the files are stored. - ## If this parameter is undefined or false, the error_logger_mf_h is not installed. --## sasl.error_logger_mf_dir = ./log/sasl -+## sasl.error_logger_mf_dir = %%LEOFS_LOGDIR%%/leo_manager/sasl - - ## Specifies how large each individual file can be. - ## If this parameter is undefined, the error_logger_mf_h is not installed. -@@ -36,7 +36,7 @@ - ## MANAGER - ## -------------------------------------------------------------------- - ## Partner of manager's alias --manager.partner = manager_1@127.0.0.1 -+manager.partner = manager_slave@127.0.0.1 - - ## Manager-console accepatable port number - console.port.cui = 10010 -@@ -96,7 +96,7 @@ - ## * Store the RING and the command histories - ## -------------------------------------------------------------------- - ## Mnesia dir --mnesia.dir = ./work/mnesia/127.0.0.1 -+mnesia.dir = %%LEOFS_DBDIR%%/leo_manager/mnesia/127.0.0.1 - - ## The write threshold for transaction log dumps - ## as the number of writes to the transaction log -@@ -113,26 +113,26 @@ - ## log.log_level = 1 - - ## Output log file(s) - Erlang's log --## log.erlang = ./log/erlang -+## log.erlang = %%LEOFS_LOGDIR%%/leo_manager/erlang - - ## Output log file(s) - app --## log.app = ./log/app -+## log.app = %%LEOFS_LOGDIR%%/leo_manager/app - - ## Output log file(s) - members of storage-cluster --## log.member_dir = ./log/ring -+## log.member_dir = %%LEOFS_LOGDIR%%/leo_manager/ring - - ## Output log file(s) - ring --## log.ring_dir = ./log/ring -+## log.ring_dir = %%LEOFS_LOGDIR%%/leo_manager/ring - - - ## -------------------------------------------------------------------- - ## MANAGER - Other Directories - ## -------------------------------------------------------------------- - ## Directory of queue for monitoring "RING" --## queue_dir = ./work/queue -+## queue_dir = %%LEOFS_DBDIR%%/leo_manager/queue - - ## Directory of SNMP agent configuration --## snmp_agent = ./snmp/snmpa_manager_0/LEO-MANAGER -+## snmp_agent = %%PREFIX%%/lib/leofs/snmp/snmpa_manager/LEO-MANAGER - - - ## -------------------------------------------------------------------- -@@ -177,7 +177,7 @@ - ## For vm.args - ##====================================================================== - ## Name of the LeoFS's manager node --nodename = manager_0@127.0.0.1 -+nodename = manager@127.0.0.1 - - ## Cookie for distributed node communication. All nodes in the same cluster - ## should use the same cookie or they will not be able to communicate. -@@ -193,7 +193,7 @@ - erlang.max_ports = 64000 - - ## Set the location of crash dumps --erlang.crash_dump = ./log/erl_crash.dump -+erlang.crash_dump = %%LEOFS_LOGDIR%%/leo_manager/erl_crash.dump - - ## Raise the ETS table limit - erlang.max_ets_tables = 256000 -@@ -202,4 +202,4 @@ - process_limit = 1048576 - - ## Path of SNMP-agent configuration --## snmp_conf = ./snmp/snmpa_manager_0/leo_manager_snmp -+##snmp_conf = %%PREFIX%%/lib/leofs/snmp/snmpa_manager/leo_manager_snmp Property changes on: head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_0.conf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_1.conf =================================================================== --- head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_1.conf (revision 433108) +++ head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_1.conf (nonexistent) @@ -1,95 +0,0 @@ ---- deps/leo_manager/priv/leo_manager_1.conf.orig 2015-04-14 10:09:26.000000000 +0300 -+++ deps/leo_manager/priv/leo_manager_1.conf 2015-05-02 21:58:23.000000000 +0300 -@@ -13,7 +13,7 @@ - ## about configuration parameters - - ## SASL error log path --## sasl.sasl_error_log = ./log/sasl/sasl-error.log -+## sasl.sasl_error_log = %%LEOFS_LOGDIR%%/leo_manager_slave/sasl/sasl-error.log - - ## Restricts the error logging performed by the specified sasl_error_logger - ## to error reports, progress reports, or both. -@@ -22,7 +22,7 @@ - - ## Specifies in which directory the files are stored. - ## If this parameter is undefined or false, the error_logger_mf_h is not installed. --## sasl.error_logger_mf_dir = ./log/sasl -+## sasl.error_logger_mf_dir = %%LEOFS_LOGDIR%%/leo_manager_slave/sasl - - ## Specifies how large each individual file can be. - ## If this parameter is undefined, the error_logger_mf_h is not installed. -@@ -36,7 +36,7 @@ - ## MANAGER - ## -------------------------------------------------------------------- - ## Partner of manager's alias --manager.partner = manager_0@127.0.0.1 -+manager.partner = manager@127.0.0.1 - - ## Manager-console accepatable port number - console.port.cui = 10011 -@@ -55,7 +55,7 @@ - ## * Store the RING and the command histories - ## -------------------------------------------------------------------- - ## Mnesia dir --mnesia.dir = ./work/mnesia/127.0.0.1 -+mnesia.dir = %%LEOFS_DBDIR%%/leo_manager_slave/mnesia/127.0.0.1 - - ## The write threshold for transaction log dumps - ## as the number of writes to the transaction log -@@ -72,26 +72,26 @@ - ## log.log_level = 1 - - ## Output log file(s) - Erlang's log --## log.erlang = ./log/erlang -+log.erlang = %%LEOFS_LOGDIR%%/leo_manager_slave/erlang - - ## Output log file(s) - app --## log.app = ./log/app -+log.app = %%LEOFS_LOGDIR%%/leo_manager_slave/app - - ## Output log file(s) - members of storage-cluster --## log.member_dir = ./log/ring -+log.member_dir = %%LEOFS_LOGDIR%%/leo_manager_slave/ring - - ## Output log file(s) - ring --## log.ring_dir = ./log/ring -+log.ring_dir = %%LEOFS_LOGDIR%%/leo_manager_slave/ring - - - ## -------------------------------------------------------------------- - ## MANAGER - Other Directories - ## -------------------------------------------------------------------- - ## Directory of queue for monitoring "RING" --## queue_dir = ./work/queue -+## queue_dir = %%LEOFS_DBDIR%%/leo_manager_slave/queue - - ## Directory of SNMP agent configuration --snmp_agent = ./snmp/snmpa_manager_1/LEO-MANAGER -+snmp_agent = %%PREFIX%%/lib/leofs/snmp/snmpa_manager_slave/LEO-MANAGER - - - ## -------------------------------------------------------------------- -@@ -136,7 +136,7 @@ - ## For vm.args - ##====================================================================== - ## Name of the LeoFS's manager node --nodename = manager_1@127.0.0.1 -+nodename = manager_slave@127.0.0.1 - - ## Cookie for distributed node communication. All nodes in the same cluster - ## should use the same cookie or they will not be able to communicate. -@@ -152,7 +152,7 @@ - erlang.max_ports = 64000 - - ## Set the location of crash dumps --erlang.crash_dump = ./log/erl_crash.dump -+erlang.crash_dump = %%LEOFS_LOGDIR%%/leo_manager_slave/erl_crash.dump - - ## Raise the ETS table limit - erlang.max_ets_tables = 256000 -@@ -161,4 +161,4 @@ - process_limit = 1048576 - - ## Path of SNMP-agent configuration --## snmp_conf = ./snmp/snmpa_manager_1/leo_manager_snmp -+snmp_conf = %%PREFIX%%/lib/leofs/snmp/snmpa_manager_slave/leo_manager_snmp Property changes on: head/databases/leofs/files/patch-deps-leo_manager-priv-leo_manager_1.conf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-apps-leo_gateway-priv-leo_gateway.conf =================================================================== --- head/databases/leofs/files/patch-apps-leo_gateway-priv-leo_gateway.conf (nonexistent) +++ head/databases/leofs/files/patch-apps-leo_gateway-priv-leo_gateway.conf (revision 433109) @@ -0,0 +1,111 @@ +--- apps/leo_gateway/priv/leo_gateway.conf.orig 2016-03-29 12:43:41.000000000 +0300 ++++ apps/leo_gateway/priv/leo_gateway.conf 2016-04-09 10:29:53.029616000 +0300 +@@ -13,7 +13,7 @@ + ## about configuration parameters + + ## SASL error log path +-## sasl.sasl_error_log = ./log/sasl/sasl-error.log ++## sasl.sasl_error_log = %%LEOFS_LOGDIR%%/leo_gateway/sasl/sasl-error.log + + ## Restricts the error logging performed by the specified sasl_error_logger + ## to error reports, progress reports, or both. +@@ -22,7 +22,7 @@ + + ## Specifies in which directory the files are stored. + ## If this parameter is undefined or false, the error_logger_mf_h is not installed. +-## sasl.error_logger_mf_dir = ./log/sasl ++## sasl.error_logger_mf_dir = %%LEOFS_LOGDIR%%/leo_gateway/sasl + + ## Specifies how large each individual file can be. + ## If this parameter is undefined, the error_logger_mf_h is not installed. +@@ -36,7 +36,7 @@ + ## Manager's Node(s) + ## -------------------------------------------------------------------- + ## Name of Manager node(s) +-managers = [manager_0@127.0.0.1, manager_1@127.0.0.1] ++managers = [manager@127.0.0.1, manager_slave@127.0.0.1] + + + ## -------------------------------------------------------------------- +@@ -65,10 +65,10 @@ + ## http.ssl_port = 8443 + + ## SSL Certificate file +-## http.ssl_certfile = ./etc/server_cert.pem ++## http.ssl_certfile = %%PREFIX%%/etc/leofs/server_cert.pem + + ## SSL key +-## http.ssl_keyfile = ./etc/server_key.pem ++## http.ssl_keyfile = %%PREFIX%%/etc/leofs/server_key.pem + + ## HTTP custom header configuration file path + ## http.headers_config_file = ./etc/http_custom_header.conf +@@ -141,10 +141,10 @@ + ## cache.cache_disc_threshold_len = 1048576 + + ## Directory for the disk cache data +-## cache.cache_disc_dir_data = ./cache/data ++## cache.cache_disc_dir_data = %%LEOFS_DBDIR%%/leo_gateway/cache/data + + ## Directory for the disk cache journal +-## cache.cache_disc_dir_journal = ./cache/journal ++## cache.cache_disc_dir_journal = %%LEOFS_DBDIR%%/leo_gateway/cache/journal + + + ## +@@ -256,25 +256,25 @@ + ## log.is_enable_access_log = false + + ## Output log file(s) - Erlang's log +-## log.erlang = ./log/erlang ++## log.erlang = %%LEOFS_LOGDIR%%/leo_gateway/erlang + + ## Output log file(s) - app +-## log.app = ./log/app ++## log.app = %%LEOFS_LOGDIR%%/leo_gateway/app + + ## Output log file(s) - members of storage-cluster +-## log.member_dir = ./log/ring ++## log.member_dir = %%LEOFS_LOGDIR%%/leo_gateway/ring + + ## Output log file(s) - ring +-## log.ring_dir = ./log/ring ++## log.ring_dir = %%LEOFS_LOGDIR%%/leo_gateway/ring + + ## -------------------------------------------------------------------- + ## GATEWAY - Other Directories + ## -------------------------------------------------------------------- + ## Directory of queue for monitoring "RING" +-## queue_dir = ./work/queue ++## queue_dir = %%LEOFS_DBDIR%%/leo_gateway/queue + + ## Directory of SNMP agent configuration +-## snmp_agent = ./snmp/snmpa_gateway_0/LEO-GATEWAY ++## snmp_agent = %%PREFIX%%/lib/leofs/snmp/snmpa_gateway_0/LEO-GATEWAY + + + ## -------------------------------------------------------------------- +@@ -313,7 +313,7 @@ + ## For vm.args + ##====================================================================== + ## Name of the leofs-gateway node +-nodename = gateway_0@127.0.0.1 ++nodename = gateway@127.0.0.1 + + ## Cookie for distributed node communication. All nodes in the same cluster + ## should use the same cookie or they will not be able to communicate. +@@ -329,7 +329,7 @@ + erlang.max_ports = 64000 + + ## Set the location of crash dumps +-erlang.crash_dump = ./log/erl_crash.dump ++erlang.crash_dump = %%LEOFS_LOGDIR%%/leo_gateway/erl_crash.dump + + ## Raise the ETS table limit + erlang.max_ets_tables = 256000 +@@ -359,4 +359,4 @@ + process_limit = 1048576 + + ## Path of SNMP-agent configuration +-## snmp_conf = ./snmp/snmpa_gateway_0/leo_gateway_snmp ++snmp_conf = %%PREFIX%%/lib/leofs/snmp/snmpa_gateway/leo_gateway_snmp Property changes on: head/databases/leofs/files/patch-apps-leo_gateway-priv-leo_gateway.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-apps-leo_gateway-priv-leo_gateway.schema =================================================================== --- head/databases/leofs/files/patch-apps-leo_gateway-priv-leo_gateway.schema (nonexistent) +++ head/databases/leofs/files/patch-apps-leo_gateway-priv-leo_gateway.schema (revision 433109) @@ -0,0 +1,144 @@ +--- apps/leo_gateway/priv/leo_gateway.schema.orig 2014-08-06 05:56:49.000000000 +0300 ++++ apps/leo_gateway/priv/leo_gateway.schema 2014-08-13 23:13:17.000000000 +0300 +@@ -37,7 +37,7 @@ + "sasl.sasl_error_logger", + [ + {datatype, string}, +- {default, "./log/sasl/sasl-error.log"} ++ {default, "%%LEOFS_LOGDIR%%/leo_gateway/sasl/sasl-error.log"} + ]}. + + {translation, "sasl.sasl_error_logger", +@@ -63,7 +63,7 @@ + "sasl.error_logger_mf_dir", + "sasl.error_logger_mf_dir", + [ +- {default, "./log/sasl"} ++ {default, "%%LEOFS_LOGDIR%%/leo_gateway/sasl"} + ]}. + + %% @doc Specifies how large each individual file can be. +@@ -104,7 +104,7 @@ + Managers = cuttlefish_util:conf_get_value("managers", Conf), + case string:tokens(Managers, "[ , ]") of + [] -> +- ['manager_0@127.0.0.1', 'manager_1@127.0.0.1']; ++ ['manager@127.0.0.1', 'manager_slave@127.0.0.1']; + Tokens -> + lists:map(fun(X) -> + list_to_atom(X) +@@ -191,7 +191,7 @@ + "http.ssl_certfile", + "leo_gateway.http.ssl_certfile", + [ +- {default, "./etc/server_cert.pem"} ++ {default, "%%PREFIX%%/etc/leofs/server_cert.pem"} + ]}. + + %% @doc SSL key +@@ -199,7 +199,7 @@ + "http.ssl_keyfile", + "leo_gateway.http.ssl_keyfile", + [ +- {default, "./etc/server_key.pem"} ++ {default, "%%PREFIX%%/etc/leofs/server_key.pem"} + ]}. + + %% @doc Synchronized time of a bucket property (second) +@@ -306,7 +306,7 @@ + "cache.cache_disc_dir_data", + "leo_gateway.cache.cache_disc_dir_data", + [ +- {default, "./cache/data"} ++ {default, "%%LEOFS_DBDIR%%/leo_gateway/cache/data"} + ]}. + + %% @doc Directory for the disk cache journal +@@ -314,7 +314,7 @@ + "cache.cache_disc_dir_journal", + "leo_gateway.cache.cache_disc_dir_journal", + [ +- {default, "./cache/journal"} ++ {default, "%%LEOFS_DBDIR%%/leo_gateway/cache/journal"} + ]}. + + %% @doc Cache Expire in seconds +@@ -484,7 +484,7 @@ + "leo_gateway.log_dir", + [ + {datatype, string}, +- {default, "./log/erlang"} ++ {default, "%%LEOFS_LOGDIR%%/leo_gateway/erlang"} + ]}. + + %% @doc Output log file(s) - app +@@ -493,7 +493,7 @@ + "leo_gateway.log_appender", + [ + {datatype, string}, +- {default, "./log/app"} ++ {default, "%%LEOFS_LOGDIR%%/leo_gateway/app"} + ]}. + + {translation, "leo_gateway.log_appender", +@@ -508,7 +508,7 @@ + "leo_redundant_manager.log_dir_member", + [ + {datatype, string}, +- {default, "./log/ring"} ++ {default, "%%LEOFS_LOGDIR%%/leo_gateway/ring"} + ]}. + + %% @doc Output log file(s) - ring +@@ -517,7 +517,7 @@ + "leo_redundant_manager.log_dir_ring", + [ + {datatype, string}, +- {default, "./log/ring"} ++ {default, "%%LEOFS_LOGDIR%%/leo_gateway/ring"} + ]}. + + +@@ -529,7 +529,7 @@ + "queue_dir", + "leo_gateway.queue_dir", + [ +- {default, "./work/queue"} ++ {default, "%%LEOFS_DBDIR%%/leo_gateway/queue"} + ]}. + + %% @doc Directory of SNMP agent configuration +@@ -537,7 +537,7 @@ + "snmp_agent", + "leo_gateway.snmp_agent", + [ +- {default, "./snmp/snmpa_gateway_0/LEO-GATEWAY"} ++ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_gateway/LEO-GATEWAY"} + ]}. + + +@@ -752,7 +752,7 @@ + "nodename", + "vm_args.-name", + [ +- {default, "gateway_0@127.0.0.1"} ++ {default, "gateway@127.0.0.1"} + ]}. + + %% @doc Cookie for distributed node communication. All nodes in the same cluster +@@ -800,7 +800,7 @@ + "erlang.crash_dump", + "vm_args.-env ERL_CRASH_DUMP", + [ +- {default, "./log/erl_crash.dump"} ++ {default, "%%LEOFS_LOGDIR%%/leo_gateway/erl_crash.dump"} + ]}. + + %% @doc Raise the ETS table limit +@@ -839,5 +839,5 @@ + "snmp_conf", + "vm_args.-config", + [ +- {default, "./snmp/snmpa_gateway_0/leo_gateway_snmp"} ++ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_gateway/leo_gateway_snmp"} + ]}. Property changes on: head/databases/leofs/files/patch-apps-leo_gateway-priv-leo_gateway.schema ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-apps-leo_gateway-snmp-snmpa_gateway_0-leo_gateway_snmp.config =================================================================== --- head/databases/leofs/files/patch-apps-leo_gateway-snmp-snmpa_gateway_0-leo_gateway_snmp.config (nonexistent) +++ head/databases/leofs/files/patch-apps-leo_gateway-snmp-snmpa_gateway_0-leo_gateway_snmp.config (revision 433109) @@ -0,0 +1,11 @@ +--- apps/leo_gateway/snmp/snmpa_gateway_0/leo_gateway_snmp.config.orig 2014-06-15 22:05:33.000000000 +0300 ++++ apps/leo_gateway/snmp/snmpa_gateway_0/leo_gateway_snmp.config 2014-06-15 22:06:17.000000000 +0300 +@@ -1,6 +1,6 @@ + [{snmp, [{agent, [{versions, [v1, v2]}, +- {db_dir, "snmp/snmpa_gateway_0/db"}, +- {config, [{dir, "snmp/snmpa_gateway_0/agent/conf"}, ++ {db_dir, "%%LEOFS_DBDIR%%/snmp/snmpa_gateway"}, ++ {config, [{dir, "%%PREFIX%%/lib/leofs/snmp/snmpa_gateway/agent/conf"}, + {verbosity, silence}]}, + {net_if, [{verbosity, silence}]} + ]}, Property changes on: head/databases/leofs/files/patch-apps-leo_gateway-snmp-snmpa_gateway_0-leo_gateway_snmp.config ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_0.conf =================================================================== --- head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_0.conf (nonexistent) +++ head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_0.conf (revision 433109) @@ -0,0 +1,95 @@ +--- apps/leo_manager/priv/leo_manager_0.conf.orig 2015-04-14 10:09:26.000000000 +0300 ++++ apps/leo_manager/priv/leo_manager_0.conf 2015-05-02 21:56:17.000000000 +0300 +@@ -13,7 +13,7 @@ + ## about configuration parameters + + ## SASL error log path +-## sasl.sasl_error_log = ./log/sasl/sasl-error.log ++## sasl.sasl_error_log = %%LEOFS_LOGDIR%%/leo_manager/sasl/sasl-error.log + + ## Restricts the error logging performed by the specified sasl_error_logger + ## to error reports, progress reports, or both. +@@ -22,7 +22,7 @@ + + ## Specifies in which directory the files are stored. + ## If this parameter is undefined or false, the error_logger_mf_h is not installed. +-## sasl.error_logger_mf_dir = ./log/sasl ++## sasl.error_logger_mf_dir = %%LEOFS_LOGDIR%%/leo_manager/sasl + + ## Specifies how large each individual file can be. + ## If this parameter is undefined, the error_logger_mf_h is not installed. +@@ -36,7 +36,7 @@ + ## MANAGER + ## -------------------------------------------------------------------- + ## Partner of manager's alias +-manager.partner = manager_1@127.0.0.1 ++manager.partner = manager_slave@127.0.0.1 + + ## Manager-console accepatable port number + console.port.cui = 10010 +@@ -96,7 +96,7 @@ + ## * Store the RING and the command histories + ## -------------------------------------------------------------------- + ## Mnesia dir +-mnesia.dir = ./work/mnesia/127.0.0.1 ++mnesia.dir = %%LEOFS_DBDIR%%/leo_manager/mnesia/127.0.0.1 + + ## The write threshold for transaction log dumps + ## as the number of writes to the transaction log +@@ -113,26 +113,26 @@ + ## log.log_level = 1 + + ## Output log file(s) - Erlang's log +-## log.erlang = ./log/erlang ++## log.erlang = %%LEOFS_LOGDIR%%/leo_manager/erlang + + ## Output log file(s) - app +-## log.app = ./log/app ++## log.app = %%LEOFS_LOGDIR%%/leo_manager/app + + ## Output log file(s) - members of storage-cluster +-## log.member_dir = ./log/ring ++## log.member_dir = %%LEOFS_LOGDIR%%/leo_manager/ring + + ## Output log file(s) - ring +-## log.ring_dir = ./log/ring ++## log.ring_dir = %%LEOFS_LOGDIR%%/leo_manager/ring + + + ## -------------------------------------------------------------------- + ## MANAGER - Other Directories + ## -------------------------------------------------------------------- + ## Directory of queue for monitoring "RING" +-## queue_dir = ./work/queue ++## queue_dir = %%LEOFS_DBDIR%%/leo_manager/queue + + ## Directory of SNMP agent configuration +-## snmp_agent = ./snmp/snmpa_manager_0/LEO-MANAGER ++## snmp_agent = %%PREFIX%%/lib/leofs/snmp/snmpa_manager/LEO-MANAGER + + + ## -------------------------------------------------------------------- +@@ -177,7 +177,7 @@ + ## For vm.args + ##====================================================================== + ## Name of the LeoFS's manager node +-nodename = manager_0@127.0.0.1 ++nodename = manager@127.0.0.1 + + ## Cookie for distributed node communication. All nodes in the same cluster + ## should use the same cookie or they will not be able to communicate. +@@ -193,7 +193,7 @@ + erlang.max_ports = 64000 + + ## Set the location of crash dumps +-erlang.crash_dump = ./log/erl_crash.dump ++erlang.crash_dump = %%LEOFS_LOGDIR%%/leo_manager/erl_crash.dump + + ## Raise the ETS table limit + erlang.max_ets_tables = 256000 +@@ -202,4 +202,4 @@ + process_limit = 1048576 + + ## Path of SNMP-agent configuration +-## snmp_conf = ./snmp/snmpa_manager_0/leo_manager_snmp ++##snmp_conf = %%PREFIX%%/lib/leofs/snmp/snmpa_manager/leo_manager_snmp Property changes on: head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_0.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_0.schema =================================================================== --- head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_0.schema (nonexistent) +++ head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_0.schema (revision 433109) @@ -0,0 +1,99 @@ +--- apps/leo_manager/priv/leo_manager_0.schema.orig 2014-06-15 20:05:19.000000000 +0300 ++++ apps/leo_manager/priv/leo_manager_0.schema 2014-06-15 20:06:20.000000000 +0300 +@@ -37,7 +37,7 @@ + "sasl.sasl_error_logger", + [ + {datatype, string}, +- {default, "./log/sasl/sasl-error.log"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager/sasl/sasl-error.log"} + ]}. + + {translation, "sasl.sasl_error_logger", +@@ -63,7 +63,7 @@ + "sasl.error_logger_mf_dir", + "sasl.error_logger_mf_dir", + [ +- {default, "./log/sasl"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager/sasl"} + ]}. + + %% @doc Specifies how large each individual file can be. +@@ -286,7 +286,7 @@ + "mnesia.dir", + [ + {datatype, string}, +- {default, "./work/mnesia/127.0.0.1"} ++ {default, "%%LEOFS_DBDIR%%/leo_manager/mnesia/127.0.0.1"} + ]}. + + %% @doc The write threshold for transaction log dumps +@@ -328,7 +328,7 @@ + "leo_manager.log_dir", + [ + {datatype, string}, +- {default, "./log/erlang"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager/erlang"} + ]}. + + %% @doc Output log file(s) - app +@@ -337,7 +337,7 @@ + "leo_manager.log_appender", + [ + {datatype, string}, +- {default, "./log/app"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager/app"} + ]}. + + {translation, "leo_manager.log_appender", +@@ -352,7 +352,7 @@ + "leo_redundant_manager.log_dir_member", + [ + {datatype, string}, +- {default, "./log/ring"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager/ring"} + ]}. + + %% @doc Output log file(s) - ring +@@ -361,7 +361,7 @@ + "leo_redundant_manager.log_dir_ring", + [ + {datatype, string}, +- {default, "./log/ring"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager/ring"} + ]}. + + +@@ -373,7 +373,7 @@ + "queue_dir", + "leo_manager.queue_dir", + [ +- {default, "./work/queue"} ++ {default, "%%LEOFS_DBDIR%%/leo_manager/queue"} + ]}. + + %% @doc Directory of SNMP agent configuration +@@ -381,7 +381,7 @@ + "snmp_agent", + "leo_manager.snmp_agent", + [ +- {default, "./snmp/snmpa_manager_0/LEO-MANAGER"} ++ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_manager/LEO-MANAGER"} + ]}. + + +@@ -592,7 +592,7 @@ + "erlang.crash_dump", + "vm_args.-env ERL_CRASH_DUMP", + [ +- {default, "./log/erl_crash.dump"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager/erl_crash.dump"} + ]}. + + %% @doc Raise the ETS table limit +@@ -631,5 +631,5 @@ + "snmp_conf", + "vm_args.-config", + [ +- {default, "./snmp/snmpa_manager_0/leo_manager_snmp"} ++ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_manager/leo_manager_snmp"} + ]}. Property changes on: head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_0.schema ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_1.conf =================================================================== --- head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_1.conf (nonexistent) +++ head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_1.conf (revision 433109) @@ -0,0 +1,95 @@ +--- apps/leo_manager/priv/leo_manager_1.conf.orig 2015-04-14 10:09:26.000000000 +0300 ++++ apps/leo_manager/priv/leo_manager_1.conf 2015-05-02 21:58:23.000000000 +0300 +@@ -13,7 +13,7 @@ + ## about configuration parameters + + ## SASL error log path +-## sasl.sasl_error_log = ./log/sasl/sasl-error.log ++## sasl.sasl_error_log = %%LEOFS_LOGDIR%%/leo_manager_slave/sasl/sasl-error.log + + ## Restricts the error logging performed by the specified sasl_error_logger + ## to error reports, progress reports, or both. +@@ -22,7 +22,7 @@ + + ## Specifies in which directory the files are stored. + ## If this parameter is undefined or false, the error_logger_mf_h is not installed. +-## sasl.error_logger_mf_dir = ./log/sasl ++## sasl.error_logger_mf_dir = %%LEOFS_LOGDIR%%/leo_manager_slave/sasl + + ## Specifies how large each individual file can be. + ## If this parameter is undefined, the error_logger_mf_h is not installed. +@@ -36,7 +36,7 @@ + ## MANAGER + ## -------------------------------------------------------------------- + ## Partner of manager's alias +-manager.partner = manager_0@127.0.0.1 ++manager.partner = manager@127.0.0.1 + + ## Manager-console accepatable port number + console.port.cui = 10011 +@@ -55,7 +55,7 @@ + ## * Store the RING and the command histories + ## -------------------------------------------------------------------- + ## Mnesia dir +-mnesia.dir = ./work/mnesia/127.0.0.1 ++mnesia.dir = %%LEOFS_DBDIR%%/leo_manager_slave/mnesia/127.0.0.1 + + ## The write threshold for transaction log dumps + ## as the number of writes to the transaction log +@@ -72,26 +72,26 @@ + ## log.log_level = 1 + + ## Output log file(s) - Erlang's log +-## log.erlang = ./log/erlang ++log.erlang = %%LEOFS_LOGDIR%%/leo_manager_slave/erlang + + ## Output log file(s) - app +-## log.app = ./log/app ++log.app = %%LEOFS_LOGDIR%%/leo_manager_slave/app + + ## Output log file(s) - members of storage-cluster +-## log.member_dir = ./log/ring ++log.member_dir = %%LEOFS_LOGDIR%%/leo_manager_slave/ring + + ## Output log file(s) - ring +-## log.ring_dir = ./log/ring ++log.ring_dir = %%LEOFS_LOGDIR%%/leo_manager_slave/ring + + + ## -------------------------------------------------------------------- + ## MANAGER - Other Directories + ## -------------------------------------------------------------------- + ## Directory of queue for monitoring "RING" +-## queue_dir = ./work/queue ++## queue_dir = %%LEOFS_DBDIR%%/leo_manager_slave/queue + + ## Directory of SNMP agent configuration +-snmp_agent = ./snmp/snmpa_manager_1/LEO-MANAGER ++snmp_agent = %%PREFIX%%/lib/leofs/snmp/snmpa_manager_slave/LEO-MANAGER + + + ## -------------------------------------------------------------------- +@@ -136,7 +136,7 @@ + ## For vm.args + ##====================================================================== + ## Name of the LeoFS's manager node +-nodename = manager_1@127.0.0.1 ++nodename = manager_slave@127.0.0.1 + + ## Cookie for distributed node communication. All nodes in the same cluster + ## should use the same cookie or they will not be able to communicate. +@@ -152,7 +152,7 @@ + erlang.max_ports = 64000 + + ## Set the location of crash dumps +-erlang.crash_dump = ./log/erl_crash.dump ++erlang.crash_dump = %%LEOFS_LOGDIR%%/leo_manager_slave/erl_crash.dump + + ## Raise the ETS table limit + erlang.max_ets_tables = 256000 +@@ -161,4 +161,4 @@ + process_limit = 1048576 + + ## Path of SNMP-agent configuration +-## snmp_conf = ./snmp/snmpa_manager_1/leo_manager_snmp ++snmp_conf = %%PREFIX%%/lib/leofs/snmp/snmpa_manager_slave/leo_manager_snmp Property changes on: head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_1.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_1.schema =================================================================== --- head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_1.schema (nonexistent) +++ head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_1.schema (revision 433109) @@ -0,0 +1,108 @@ +--- apps/leo_manager/priv/leo_manager_1.schema.orig 2014-06-15 20:05:45.000000000 +0300 ++++ apps/leo_manager/priv/leo_manager_1.schema 2014-06-15 20:06:47.000000000 +0300 +@@ -37,7 +37,7 @@ + "sasl.sasl_error_logger", + [ + {datatype, string}, +- {default, "./log/sasl/sasl-error.log"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/sasl/sasl-error.log"} + ]}. + + {translation, "sasl.sasl_error_logger", +@@ -63,7 +63,7 @@ + "sasl.error_logger_mf_dir", + "sasl.error_logger_mf_dir", + [ +- {default, "./log/sasl"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/sasl"} + ]}. + + %% @doc Specifies how large each individual file can be. +@@ -167,7 +167,7 @@ + "mnesia.dir", + [ + {datatype, string}, +- {default, "./work/mnesia/127.0.0.1"} ++ {default, "%%LEOFS_DBDIR%%/leo_manager_slave/mnesia/127.0.0.1"} + ]}. + + %% @doc The write threshold for transaction log dumps +@@ -209,7 +209,7 @@ + "leo_manager.log_dir", + [ + {datatype, string}, +- {default, "./log/erlang"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/erlang"} + ]}. + + %% @doc Output log file(s) - app +@@ -218,7 +218,7 @@ + "leo_manager.log_appender", + [ + {datatype, string}, +- {default, "./log/app"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/app"} + ]}. + + {translation, "leo_manager.log_appender", +@@ -233,7 +233,7 @@ + "leo_redundant_manager.log_dir_member", + [ + {datatype, string}, +- {default, "./log/ring"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/ring"} + ]}. + + %% @doc Output log file(s) - ring +@@ -242,7 +242,7 @@ + "leo_redundant_manager.log_dir_ring", + [ + {datatype, string}, +- {default, "./log/ring"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/ring"} + ]}. + + +@@ -254,7 +254,7 @@ + "queue_dir", + "leo_manager.queue_dir", + [ +- {default, "./work/queue"} ++ {default, "%%LEOFS_DBDIR%%/leo_manager_slave/queue"} + ]}. + + %% @doc Directory of SNMP agent configuration +@@ -262,7 +262,7 @@ + "snmp_agent", + "leo_manager.snmp_agent", + [ +- {default, "./snmp/snmpa_manager_0/LEO-MANAGER"} ++ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_manager/LEO-MANAGER"} + ]}. + + +@@ -426,7 +426,7 @@ + "nodename", + "vm_args.-name", + [ +- {default, "manager_0@127.0.0.1"} ++ {default, "manager_slave@127.0.0.1"} + ]}. + + %% @doc Cookie for distributed node communication. All nodes in the same cluster +@@ -474,7 +474,7 @@ + "erlang.crash_dump", + "vm_args.-env ERL_CRASH_DUMP", + [ +- {default, "./log/erl_crash.dump"} ++ {default, "%%LEOFS_LOGDIR%%/leo_manager_slave/erl_crash.dump"} + ]}. + + %% @doc Raise the ETS table limit +@@ -513,5 +513,5 @@ + "snmp_conf", + "vm_args.-config", + [ +- {default, "./snmp/snmpa_manager_0/leo_manager_snmp"} ++ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_manager_slave/leo_manager_snmp"} + ]}. Property changes on: head/databases/leofs/files/patch-apps-leo_manager-priv-leo_manager_1.schema ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-apps-leo_manager-snmp-snmpa_manager_0-leo_manager_snmp.config =================================================================== --- head/databases/leofs/files/patch-apps-leo_manager-snmp-snmpa_manager_0-leo_manager_snmp.config (nonexistent) +++ head/databases/leofs/files/patch-apps-leo_manager-snmp-snmpa_manager_0-leo_manager_snmp.config (revision 433109) @@ -0,0 +1,11 @@ +--- apps/leo_manager/snmp/snmpa_manager_0/leo_manager_snmp.config.orig 2014-06-15 21:57:21.000000000 +0300 ++++ apps/leo_manager/snmp/snmpa_manager_0/leo_manager_snmp.config 2014-06-15 21:59:33.000000000 +0300 +@@ -1,6 +1,6 @@ + [{snmp, [{agent, [{versions, [v1, v2]}, +- {db_dir, "snmp/snmpa_manager_0/db"}, +- {config, [{dir, "snmp/snmpa_manager_0/agent/conf"}, ++ {db_dir, "%%LEOFS_DBDIR%%/snmp/snmpa_manager"}, ++ {config, [{dir, "%%PREFIX%%/lib/leofs/snmp/snmpa_manager/agent/conf"}, + {verbosity, silence}]}, + {net_if, [{verbosity, silence}]} + ]}, Property changes on: head/databases/leofs/files/patch-apps-leo_manager-snmp-snmpa_manager_0-leo_manager_snmp.config ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-apps-leo_manager-snmp-snmpa_manager_1-leo_manager_snmp.config =================================================================== --- head/databases/leofs/files/patch-apps-leo_manager-snmp-snmpa_manager_1-leo_manager_snmp.config (nonexistent) +++ head/databases/leofs/files/patch-apps-leo_manager-snmp-snmpa_manager_1-leo_manager_snmp.config (revision 433109) @@ -0,0 +1,11 @@ +--- apps/leo_manager/snmp/snmpa_manager_1/leo_manager_snmp.config.orig 2014-06-15 21:57:21.000000000 +0300 ++++ apps/leo_manager/snmp/snmpa_manager_1/leo_manager_snmp.config 2014-06-15 21:59:33.000000000 +0300 +@@ -1,6 +1,6 @@ + [{snmp, [{agent, [{versions, [v1, v2]}, +- {db_dir, "snmp/snmpa_manager_1/db"}, +- {config, [{dir, "snmp/snmpa_manager_1/agent/conf"}, ++ {db_dir, "%%LEOFS_DBDIR%%/snmp/snmpa_manager_slave"}, ++ {config, [{dir, "%%PREFIX%%/lib/leofs/snmp/snmpa_manager_slave/agent/conf"}, + {verbosity, silence}]}, + {net_if, [{verbosity, silence}]} + ]}, Property changes on: head/databases/leofs/files/patch-apps-leo_manager-snmp-snmpa_manager_1-leo_manager_snmp.config ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-apps-leo_storage-priv-leo_storage.conf =================================================================== --- head/databases/leofs/files/patch-apps-leo_storage-priv-leo_storage.conf (nonexistent) +++ head/databases/leofs/files/patch-apps-leo_storage-priv-leo_storage.conf (revision 433109) @@ -0,0 +1,103 @@ +--- apps/leo_storage/priv/leo_storage.conf.orig 2015-06-30 07:30:19.000000000 +0300 ++++ apps/leo_storage/priv/leo_storage.conf 2015-07-04 21:02:35.000000000 +0300 +@@ -13,7 +13,7 @@ + ## about configuration parameters + + ## SASL error log path +-## sasl.sasl_error_log = ./log/sasl/sasl-error.log ++## sasl.sasl_error_log = %%LEOFS_LOGDIR%%/leo_storage/sasl/sasl-error.log + + ## Restricts the error logging performed by the specified sasl_error_logger + ## to error reports, progress reports, or both. +@@ -22,7 +22,7 @@ + + ## Specifies in which directory the files are stored. + ## If this parameter is undefined or false, the error_logger_mf_h is not installed. +-## sasl.error_logger_mf_dir = ./log/sasl ++## sasl.error_logger_mf_dir = %%LEOFS_LOGDIR%%/leo_storage/sasl + + ## Specifies how large each individual file can be. + ## If this parameter is undefined, the error_logger_mf_h is not installed. +@@ -36,13 +36,13 @@ + ## Manager's Node(s) + ## -------------------------------------------------------------------- + ## Name of Manager node(s) +-managers = [manager_0@127.0.0.1, manager_1@127.0.0.1] ++managers = [manager@127.0.0.1, manager_slave@127.0.0.1] + + ## -------------------------------------------------------------------- + ## STORAGE + ## -------------------------------------------------------------------- + ## Object container +-obj_containers.path = [./avs] ++obj_containers.path = [%%LEOFS_DBDIR%%/leo_storage/avs] + obj_containers.num_of_containers = [8] + + ## e.g. Case of plural pathes +@@ -239,16 +239,16 @@ + log.log_level = 1 + + ## Output log file(s) - Erlang's log +-## log.erlang = ./log/erlang ++## log.erlang = %%LEOFS_LOGDIR%%/leo_storage/erlang + + ## Output log file(s) - app +-## log.app = ./log/app ++## log.app = %%LEOFS_LOGDIR%%/leo_storage/app + + ## Output log file(s) - members of storage-cluster +-## log.member_dir = ./log/ring ++## log.member_dir = %%LEOFS_LOGDIR%%/leo_storage/ring + + ## Output log file(s) - ring +-## log.ring_dir = ./log/ring ++## log.ring_dir = %%LEOFS_LOGDIR%%/leo_storage/ring + + ## Output data-diagnosis log + log.is_enable_diagnosis_log = true +@@ -257,10 +257,10 @@ + ## STORAGE - Other Directories + ## -------------------------------------------------------------------- + ## Directory of queue for monitoring "RING" +-## queue_dir = ./work/queue ++## queue_dir = %%LEOFS_DBDIR%%/leo_storage/queue + + ## Directory of SNMP agent configuration +-## snmp_agent = ./snmp/snmpa_storage_0/LEO-STORAGE ++## snmp_agent = %%PREFIX%%/lib/leofs/snmp/snmpa_storage/LEO-STORAGE + + + ## -------------------------------------------------------------------- +@@ -270,7 +270,7 @@ + ## leo_ordning_reda.send_after_interval = 100 + + ## Temporary directory of stacked objects +-## leo_ordning_reda.temp_stacked_dir = "work/ord_reda/" ++## leo_ordning_reda.temp_stacked_dir = %%LEOFS_DBDIR%%/leo_storage/ord_reda/ + + + ## -------------------------------------------------------------------- +@@ -344,7 +344,7 @@ + ## For vm.args + ##====================================================================== + ## Name of the leofs-storage node +-nodename = storage_0@127.0.0.1 ++nodename = storage@127.0.0.1 + + ## Cookie for distributed node communication. All nodes in the same cluster + ## should use the same cookie or they will not be able to communicate. +@@ -360,7 +360,7 @@ + erlang.max_ports = 64000 + + ## Set the location of crash dumps +-erlang.crash_dump = ./log/erl_crash.dump ++erlang.crash_dump = %%LEOFS_LOGDIR%%/leo_storage/erl_crash.dump + + ## Raise the ETS table limit + erlang.max_ets_tables = 256000 +@@ -390,4 +390,4 @@ + process_limit = 1048576 + + ## Path of SNMP-agent configuration +-## snmp_conf = ./snmp/snmpa_storage_0/leo_storage_snmp ++snmp_conf = %%PREFIX%%/lib/leofs/snmp/snmpa_storage/leo_storage_snmp Property changes on: head/databases/leofs/files/patch-apps-leo_storage-priv-leo_storage.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-apps-leo_storage-priv-leo_storage.schema =================================================================== --- head/databases/leofs/files/patch-apps-leo_storage-priv-leo_storage.schema (nonexistent) +++ head/databases/leofs/files/patch-apps-leo_storage-priv-leo_storage.schema (revision 433109) @@ -0,0 +1,117 @@ +--- apps/leo_storage/priv/leo_storage.schema.orig 2014-12-17 11:21:38.000000000 +0200 ++++ apps/leo_storage/priv/leo_storage.schema 2014-12-20 00:06:58.000000000 +0200 +@@ -37,7 +37,7 @@ + "sasl.sasl_error_logger", + [ + {datatype, string}, +- {default, "./log/sasl/sasl-error.log"} ++ {default, "%%LEOFS_LOGDIR%%/leo_storage/sasl/sasl-error.log"} + ]}. + + {translation, "sasl.sasl_error_logger", +@@ -63,7 +63,7 @@ + "sasl.error_logger_mf_dir", + "sasl.error_logger_mf_dir", + [ +- {default, "./log/sasl"} ++ {default, "%%LEOFS_LOGDIR%%/leo_storage/sasl"} + ]}. + + %% @doc Specifies how large each individual file can be. +@@ -104,7 +104,7 @@ + Managers = cuttlefish_util:conf_get_value("managers", Conf), + case string:tokens(Managers, "[ , ]") of + [] -> +- ['manager_0@127.0.0.1', 'manager_1@127.0.0.1']; ++ ['manager@127.0.0.1', 'manager_slave@127.0.0.1']; + Tokens -> + lists:map(fun(X) -> + list_to_atom(X) +@@ -146,7 +146,7 @@ + Paths = cuttlefish_util:conf_get_value("obj_containers.path", Conf), + Paths_1 = case string:tokens(Paths, "[ , ]") of + [] -> +- ["./avs"]; ++ ["%%LEOFS_DBDIR%%/leo_storage/avs"]; + Tokens_1 -> + Tokens_1 + end, +@@ -780,7 +780,7 @@ + "leo_storage.log_dir", + [ + {datatype, string}, +- {default, "./log/erlang"} ++ {default, "%%LEOFS_LOGDIR%%/leo_storage/erlang"} + ]}. + + %% @doc Output log file(s) - app +@@ -789,7 +789,7 @@ + "leo_storage.log_appender", + [ + {datatype, string}, +- {default, "./log/app"} ++ {default, "%%LEOFS_LOGDIR%%/leo_storage/app"} + ]}. + + {translation, "leo_storage.log_appender", +@@ -804,7 +804,7 @@ + "leo_redundant_manager.log_dir_member", + [ + {datatype, string}, +- {default, "./log/ring"} ++ {default, "%%LEOFS_LOGDIR%%/leo_storage/ring"} + ]}. + + %% @doc Output log file(s) - ring +@@ -813,7 +813,7 @@ + "leo_redundant_manager.log_dir_ring", + [ + {datatype, string}, +- {default, "./log/ring"} ++ {default, "%%LEOFS_LOGDIR%%/leo_storage/ring"} + ]}. + + %% @doc is enable data-diagnosis log +@@ -833,7 +833,7 @@ + "queue_dir", + "leo_storage.queue_dir", + [ +- {default, "./work/queue"} ++ {default, "%%LEOFS_DBDIR%%/leo_storage/queue"} + ]}. + + %% @doc Directory of SNMP agent configuration +@@ -841,7 +841,7 @@ + "snmp_agent", + "leo_storage.snmp_agent", + [ +- {default, "./snmp/snmpa_storage_0/LEO-STORAGE"} ++ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_storage/LEO-STORAGE"} + ]}. + + +@@ -1070,7 +1070,7 @@ + "nodename", + "vm_args.-name", + [ +- {default, "storage_0@127.0.0.1"} ++ {default, "storage@127.0.0.1"} + ]}. + + %% @doc Cookie for distributed node communication. All nodes in the same cluster +@@ -1121,7 +1121,7 @@ + "erlang.crash_dump", + "vm_args.-env ERL_CRASH_DUMP", + [ +- {default, "./log/erl_crash.dump"} ++ {default, "%%LEOFS_LOGDIR%%/leo_storage/erl_crash.dump"} + ]}. + + %% @doc Raise the ETS table limit +@@ -1202,5 +1202,5 @@ + "snmp_conf", + "vm_args.-config", + [ +- {default, "./snmp/snmpa_storage_0/leo_storage_snmp"} ++ {default, "%%PREFIX%%/lib/leofs/snmp/snmpa_storage/leo_storage_snmp"} + ]}. Property changes on: head/databases/leofs/files/patch-apps-leo_storage-priv-leo_storage.schema ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/leofs/files/patch-apps-leo_storage-snmp-snmpa_storage_0-leo_storage_snmp.config =================================================================== --- head/databases/leofs/files/patch-apps-leo_storage-snmp-snmpa_storage_0-leo_storage_snmp.config (nonexistent) +++ head/databases/leofs/files/patch-apps-leo_storage-snmp-snmpa_storage_0-leo_storage_snmp.config (revision 433109) @@ -0,0 +1,11 @@ +--- apps/leo_storage/snmp/snmpa_storage_0/leo_storage_snmp.config.orig 2014-06-15 22:07:24.000000000 +0300 ++++ apps/leo_storage/snmp/snmpa_storage_0/leo_storage_snmp.config 2014-06-15 22:08:18.000000000 +0300 +@@ -1,6 +1,6 @@ + [{snmp, [{agent, [{versions, [v1, v2]}, +- {db_dir, "snmp/snmpa_storage_0/db"}, +- {config, [{dir, "snmp/snmpa_storage_0/agent/conf"}, ++ {db_dir, "%%LEOFS_DBDIR%%/snmp/snmpa_storage"}, ++ {config, [{dir, "%%PREFIX%%/lib/leofs/snmp/snmpa_storage/agent/conf"}, + {verbosity, silence}]}, + {net_if, [{verbosity, silence}]} + ]}, Property changes on: head/databases/leofs/files/patch-apps-leo_storage-snmp-snmpa_storage_0-leo_storage_snmp.config ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property