Index: head/databases/puppetdb/Makefile =================================================================== --- head/databases/puppetdb/Makefile (revision 382679) +++ head/databases/puppetdb/Makefile (revision 382680) @@ -1,53 +1,53 @@ # $FreeBSD$ PORTNAME= puppetdb -PORTVERSION= 2.2.0 +PORTVERSION= 2.2.2 CATEGORIES= databases java MASTER_SITES= http://downloads.puppetlabs.com/puppetdb/ MAINTAINER= xaque208@gmail.com COMMENT= PuppetDB storeconfigs backend RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ puppet>=0:${PORTSDIR}/sysutils/puppet BUILD_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake USE_RC_SUBR= puppetdb USES= shebangfix SHEBANG_FILES= ext/files/puppetdb \ ext/files/puppetdb-anonymize \ ext/files/puppetdb-export \ ext/files/puppetdb-foreground \ ext/files/puppetdb-import \ ext/files/puppetdb-legacy \ ext/files/puppetdb-ssl-setup USE_JAVA= yes USE_RUBY= yes USE_RAKE= yes NO_BUILD= yes JAVA_VERSION= 1.7+ USERS= puppetdb GROUPS= puppetdb SUB_LIST= JAVA_HOME=${JAVA_HOME} SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message .include post-patch: .for file in tasks/install.rake ext/files/config.ini ext/files/puppetdb \ ext/files/puppetdb-import ext/files/puppetdb-anonymize \ ext/files/database.ini ext/files/puppetdb-ssl-setup \ ext/files/puppetdb-export ext/files/puppetdb-foreground Rakefile @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file} .endfor do-install: @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} rake install .include Index: head/databases/puppetdb/distinfo =================================================================== --- head/databases/puppetdb/distinfo (revision 382679) +++ head/databases/puppetdb/distinfo (revision 382680) @@ -1,2 +1,2 @@ -SHA256 (puppetdb-2.2.0.tar.gz) = 3a177568e67eda3191f52509c91ca1fdf989a21437dfbaf21fa024790eac93d6 -SIZE (puppetdb-2.2.0.tar.gz) = 21787873 +SHA256 (puppetdb-2.2.2.tar.gz) = b2921a97e985ee2bf3cf8c6294cfd27e8080637e7d575895001c3949199b2142 +SIZE (puppetdb-2.2.2.tar.gz) = 21797613 Index: head/databases/puppetdb/files/puppetdb.in =================================================================== --- head/databases/puppetdb/files/puppetdb.in (revision 382679) +++ head/databases/puppetdb/files/puppetdb.in (revision 382680) @@ -1,85 +1,85 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: puppetdb # REQUIRE: LOGIN # KEYWORD: shutdown # # Configuration settings for puppetdb in /etc/rc.conf: # # puppetdb_enable (bool): # Set to "NO" by default. # Set it to "YES" to enable puppetdb # # puppetdb_args (str): # Extra arguments passed to start command # # puppetdb_java_home (str): # Set to "%%JAVA_HOME%%" by default. # Set the Java virtual machine to run puppetdb # # puppetdb_java_opts (str): # Set to "" by default. # Java VM args to use. # # puppetdb_user (str): # Set to "puppetdb" by default. # User to run puppetdb as. # # puppetdb_group (str): # Set to "puppetdb" by default. # Group for data file ownership. # # puppetdb_log_file (str): -# Set to "%%PUPPETDB_LOG_FILE%%" by default. +# Set to "/var/log/puppetdb/puppetdb.log" by default. # Log file location. # . /etc/rc.subr name="puppetdb" rcvar=puppetdb_enable load_rc_config "${name}" : ${puppetdb_enable="NO"} : ${puppetdb_args="services -c %%PREFIX%%/etc/puppetdb/conf.d"} : ${puppetdb_java_home="%%JAVA_HOME%%"} : ${puppetdb_user="puppetdb"} : ${puppetdb_group="puppetdb"} -: ${puppetdb_log_file="%%PUPPETDB_LOG_FILE%%"} +: ${puppetdb_log_file="/var/log/puppetdb/puppetdb.log"} pidfile="/var/run/puppetdb/puppetdb.pid" command="/usr/sbin/daemon" java_cmd="${puppetdb_java_home}/bin/java" procname="${java_cmd}" command_args="-p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core ${puppetdb_args} > ${puppetdb_log_file} 2>&1" required_files="${java_cmd}" start_precmd="puppetdb_prestart" puppetdb_prestart() { if [ ! -f "${puppetdb_log_file}" ]; then touch "${puppetdb_log_file}" chown "${puppetdb_user}:${puppetdb_group}" "${puppetdb_log_file}" chmod 640 "${puppetdb_log_file}" fi if [ ! -d "/var/run/puppetdb" ]; then install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/run/puppetdb" fi chown -R "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/conf.d" chmod 0750 "%%PREFIX%%/etc/puppetdb/conf.d" chown "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/logback.xml" chmod 0640 "%%PREFIX%%/etc/puppetdb/logback.xml" chown -R "${puppetdb_user}:${puppetdb_group}" "/var/db/puppetdb" chmod 0750 "/var/db/puppetdb" } run_rc_command "$1" Index: head/databases/puppetdb/pkg-plist =================================================================== --- head/databases/puppetdb/pkg-plist (revision 382679) +++ head/databases/puppetdb/pkg-plist (revision 382680) @@ -1,27 +1,27 @@ %%ETCDIR%%/logback.xml etc/newsyslog.conf.d/puppetdb libexec/puppetdb/puppetdb-anonymize libexec/puppetdb/puppetdb-export libexec/puppetdb/puppetdb-foreground libexec/puppetdb/puppetdb-import libexec/puppetdb/puppetdb-ssl-setup sbin/puppetdb-anonymize sbin/puppetdb-export sbin/puppetdb-foreground sbin/puppetdb-import sbin/puppetdb-ssl-setup sbin/puppetdb %%DATADIR%%/puppetdb.jar @group puppetdb @sample etc/puppetdb/conf.d/config.ini.sample @sample etc/puppetdb/conf.d/database.ini.sample @sample etc/puppetdb/conf.d/jetty.ini.sample @sample etc/puppetdb/conf.d/repl.ini.sample @group @mode 0750 @dir /var/db/puppetdb/state @dir /var/db/puppetdb/db @dir /var/db/puppetdb/mq @dir /var/db/puppetdb @mode -@dir(puppetdb,,) /var/log/puppetdb +@dir(puppetdb,puppetdb,) /var/log/puppetdb Index: head/databases/puppetdb-terminus/Makefile =================================================================== --- head/databases/puppetdb-terminus/Makefile (revision 382679) +++ head/databases/puppetdb-terminus/Makefile (revision 382680) @@ -1,24 +1,24 @@ # $FreeBSD$ PORTNAME= puppetdb-terminus -PORTVERSION= 2.2.0 +PORTVERSION= 2.2.2 CATEGORIES= databases ruby MASTER_SITES= http://downloads.puppetlabs.com/puppetdb/ DISTNAME= puppetdb-${PORTVERSION} MAINTAINER= freebsd@geoffgarside.co.uk COMMENT= PuppetDB storeconfigs backend terminus module LICENSE= APACHE20 BUILD_DEPENDS= puppet>=0:${PORTSDIR}/sysutils/puppet USE_RUBY= yes NO_BUILD= yes do-install: ${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet (cd ${WRKSRC}/ext/master/lib/puppet && ${COPYTREE_SHARE} . \ ${STAGEDIR}${RUBY_SITELIBDIR}/puppet) .include Index: head/databases/puppetdb-terminus/distinfo =================================================================== --- head/databases/puppetdb-terminus/distinfo (revision 382679) +++ head/databases/puppetdb-terminus/distinfo (revision 382680) @@ -1,2 +1,2 @@ -SHA256 (puppetdb-2.2.0.tar.gz) = 3a177568e67eda3191f52509c91ca1fdf989a21437dfbaf21fa024790eac93d6 -SIZE (puppetdb-2.2.0.tar.gz) = 21787873 +SHA256 (puppetdb-2.2.2.tar.gz) = b2921a97e985ee2bf3cf8c6294cfd27e8080637e7d575895001c3949199b2142 +SIZE (puppetdb-2.2.2.tar.gz) = 21797613 Index: head/databases/puppetdb-terminus/pkg-plist =================================================================== --- head/databases/puppetdb-terminus/pkg-plist (revision 382679) +++ head/databases/puppetdb-terminus/pkg-plist (revision 382680) @@ -1,17 +1,16 @@ %%RUBY_SITELIBDIR%%/puppet/application/storeconfigs.rb %%RUBY_SITELIBDIR%%/puppet/face/node/deactivate.rb %%RUBY_SITELIBDIR%%/puppet/face/node/status.rb %%RUBY_SITELIBDIR%%/puppet/face/storeconfigs.rb %%RUBY_SITELIBDIR%%/puppet/indirector/catalog/puppetdb.rb %%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb.rb %%RUBY_SITELIBDIR%%/puppet/indirector/facts/puppetdb_apply.rb %%RUBY_SITELIBDIR%%/puppet/indirector/node/puppetdb.rb %%RUBY_SITELIBDIR%%/puppet/indirector/resource/puppetdb.rb %%RUBY_SITELIBDIR%%/puppet/reports/puppetdb.rb %%RUBY_SITELIBDIR%%/puppet/util/puppetdb.rb %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/blacklist.rb %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/char_encoding.rb %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command.rb %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/command_names.rb %%RUBY_SITELIBDIR%%/puppet/util/puppetdb/config.rb -%%RUBY_SITELIBDIR%%/puppet/util/puppetdb/global_check.rb