Date: Thu, 9 Jun 2016 11:06:28 +0000 (UTC) From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= <romain@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416588 - in head/databases: . puppetdb puppetdb-terminus puppetdb-terminus3 puppetdb-terminus4 puppetdb3 puppetdb3/files puppetdb4 Message-ID: <201606091106.u59B6SoU023447@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: romain Date: Thu Jun 9 11:06:28 2016 New Revision: 416588 URL: https://svnweb.freebsd.org/changeset/ports/416588 Log: New ports for PuppetDB 3.x - databases/puppetdb3 [1] - databases/puppetdb-terminus3 [2] Also add conflicts with the puppetdb 2.x and 4.x ports. PR: 204074 [1], 206594 [2] Submitted by: freebsd@zleslie.info [1, 2] Added: head/databases/puppetdb-terminus3/ head/databases/puppetdb-terminus3/Makefile (contents, props changed) head/databases/puppetdb-terminus3/distinfo (contents, props changed) head/databases/puppetdb-terminus3/pkg-descr (contents, props changed) head/databases/puppetdb-terminus3/pkg-plist (contents, props changed) head/databases/puppetdb3/ head/databases/puppetdb3/Makefile (contents, props changed) head/databases/puppetdb3/distinfo (contents, props changed) head/databases/puppetdb3/files/ head/databases/puppetdb3/files/patch-ext__bin__puppetdb (contents, props changed) head/databases/puppetdb3/files/patch-ext__config__conf.d__config.ini (contents, props changed) head/databases/puppetdb3/files/patch-ext__config__conf.d__database.ini (contents, props changed) head/databases/puppetdb3/files/patch-ext__config__logback.xml (contents, props changed) head/databases/puppetdb3/files/patch-ext__config__request-logging.xml (contents, props changed) head/databases/puppetdb3/files/pkg-message.in (contents, props changed) head/databases/puppetdb3/files/puppetdb.in (contents, props changed) head/databases/puppetdb3/pkg-descr (contents, props changed) head/databases/puppetdb3/pkg-plist (contents, props changed) Modified: head/databases/Makefile head/databases/puppetdb-terminus/Makefile head/databases/puppetdb-terminus4/Makefile head/databases/puppetdb/Makefile head/databases/puppetdb4/Makefile Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Thu Jun 9 11:01:55 2016 (r416587) +++ head/databases/Makefile Thu Jun 9 11:06:28 2016 (r416588) @@ -707,7 +707,9 @@ SUBDIR += proftpd-mod_sql_tds SUBDIR += puppetdb SUBDIR += puppetdb-terminus + SUBDIR += puppetdb-terminus3 SUBDIR += puppetdb-terminus4 + SUBDIR += puppetdb3 SUBDIR += puppetdb4 SUBDIR += pure-sql3 SUBDIR += puredb Modified: head/databases/puppetdb-terminus/Makefile ============================================================================== --- head/databases/puppetdb-terminus/Makefile Thu Jun 9 11:01:55 2016 (r416587) +++ head/databases/puppetdb-terminus/Makefile Thu Jun 9 11:06:28 2016 (r416588) @@ -14,7 +14,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= puppet38>=0:sysutils/puppet38 -CONFLICTS_INSTALL= puppetdb-terminus4-* +CONFLICTS_INSTALL= puppetdb-terminus3-* puppetdb-terminus4-* USE_RUBY= yes NO_BUILD= yes Added: head/databases/puppetdb-terminus3/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb-terminus3/Makefile Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +1,25 @@ +# $FreeBSD$ + +PORTNAME= puppetdb-terminus3 +PORTVERSION= 3.2.4 +CATEGORIES= databases ruby +MASTER_SITES= http://downloads.puppetlabs.com/puppetdb/ +DISTNAME= puppetdb-${PORTVERSION} + +MAINTAINER= freebsd@zleslie.info +COMMENT= PuppetDB storeconfigs backend terminus module + +LICENSE= APACHE20 + +BUILD_DEPENDS= puppet:${PORTSDIR}/sysutils/puppet4 + +CONFLICTS_INSTALL= puppetdb-terminus-* puppetdb-terminus4-* +USE_RUBY= yes +NO_BUILD= yes + +do-install: + ${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet + (cd ${WRKSRC}/puppet && ${COPYTREE_SHARE} . \ + ${STAGEDIR}${RUBY_SITELIBDIR}/puppet) + +.include <bsd.port.mk> Added: head/databases/puppetdb-terminus3/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb-terminus3/distinfo Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +1,2 @@ +SHA256 (puppetdb-3.2.4.tar.gz) = 580d25ace29b61d7504dfc2650fd7e1c6a14e77421cbfafed14703d857996d84 +SIZE (puppetdb-3.2.4.tar.gz) = 25695565 Added: head/databases/puppetdb-terminus3/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb-terminus3/pkg-descr Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +1,3 @@ +The PuppetDB storeconfigs backend terminus module. + +WWW: https://docs.puppetlabs.com/puppetdb/latest/ Added: head/databases/puppetdb-terminus3/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb-terminus3/pkg-plist Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +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/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/http.rb Modified: head/databases/puppetdb-terminus4/Makefile ============================================================================== --- head/databases/puppetdb-terminus4/Makefile Thu Jun 9 11:01:55 2016 (r416587) +++ head/databases/puppetdb-terminus4/Makefile Thu Jun 9 11:06:28 2016 (r416588) @@ -14,7 +14,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= puppet4>=0:sysutils/puppet4 -CONFLICTS_INSTALL= puppetdb-terminus-* +CONFLICTS_INSTALL= puppetdb-terminus-* puppetdb-terminus3-* USE_RUBY= yes NO_BUILD= yes USES= gmake Modified: head/databases/puppetdb/Makefile ============================================================================== --- head/databases/puppetdb/Makefile Thu Jun 9 11:01:55 2016 (r416587) +++ head/databases/puppetdb/Makefile Thu Jun 9 11:06:28 2016 (r416588) @@ -18,7 +18,7 @@ BUILD_DEPENDS= rubygem-facter>=0:sysutil USE_RC_SUBR= puppetdb -CONFLICTS_INSTALL= puppetdb4-* +CONFLICTS_INSTALL= puppetdb3-* puppetdb4-* USES= shebangfix SHEBANG_FILES= ext/files/puppetdb \ ext/files/puppetdb-anonymize \ Added: head/databases/puppetdb3/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb3/Makefile Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +1,78 @@ +# $FreeBSD$ + +PORTNAME= puppetdb +PORTVERSION= 3.2.4 +CATEGORIES= databases java +MASTER_SITES= http://downloads.puppetlabs.com/puppetdb/ +PKGNAMESUFFIX= 3 + +MAINTAINER= freebsd@zleslie.info +COMMENT= PuppetDB storeconfigs backend + +LICENSE= APACHE20 + +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ + puppet:${PORTSDIR}/sysutils/puppet4 +BUILD_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ + rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake + +USE_RC_SUBR= puppetdb + +CONFLICTS_INSTALL= puppetdb-* puppetdb4-* +USE_JAVA= 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 <bsd.port.pre.mk> + +post-patch: +.for file in ext/config/bootstrap.cfg ext/config/logback.xml \ + ext/config/request-logging.xml ext/config/conf.d/config.ini \ + ext/config/conf.d/database.ini ext/config/conf.d/jetty.ini \ + ext/config/conf.d/repl.ini ext/bin/puppetdb + @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file} + @${REINPLACE_CMD} -e "s|%%JAVA%%|${JAVA}|" ${WRKSRC}/${file} + @${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/${file} + @${REINPLACE_CMD} -e "s|%%ETCDIR%%|${ETCDIR}|" ${WRKSRC}/${file} +.endfor + +.for file in ext/cli/anonymize ext/cli/config-migration \ + ext/cli/export ext/cli/foreground ext/cli/import \ + ext/cli/ssl-setup + @${REINPLACE_CMD} -e 's|/etc/puppetlabs/puppetdb|${ETCDIR}|g' ${WRKSRC}/${file} + @${REINPLACE_CMD} -e 's|/bin/bash|${PREFIX}/bin/bash|g' ${WRKSRC}/${file} +.endfor + +do-install: + ${MKDIR} ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${DATADIR}/cli + ${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps + ${MKDIR} ${STAGEDIR}${ETCDIR} + ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d + ${MKDIR} ${STAGEDIR}/var/log/puppetdb + ${MKDIR} ${STAGEDIR}/var/db/puppetdb + ${INSTALL_DATA} ${WRKSRC}/puppetdb.jar ${STAGEDIR}${DATADIR}/puppetdb.jar + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/config.ini ${STAGEDIR}${ETCDIR}/conf.d/config.ini.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/database.ini ${STAGEDIR}${ETCDIR}/conf.d/database.ini.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/jetty.ini ${STAGEDIR}${ETCDIR}/conf.d/jetty.ini.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/repl.ini ${STAGEDIR}${ETCDIR}/conf.d/repl.ini.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/bootstrap.cfg ${STAGEDIR}${ETCDIR}/bootstrap.cfg.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample + ${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml.sample + ${INSTALL_DATA} ${WRKSRC}/ext/cli/anonymize ${STAGEDIR}${DATADIR}/cli/apps/anonymize + ${INSTALL_DATA} ${WRKSRC}/ext/cli/config-migration ${STAGEDIR}${DATADIR}/cli/apps/config-migration + ${INSTALL_DATA} ${WRKSRC}/ext/cli/export ${STAGEDIR}${DATADIR}/cli/apps/export + ${INSTALL_DATA} ${WRKSRC}/ext/cli/foreground ${STAGEDIR}${DATADIR}/cli/apps/foreground + ${INSTALL_DATA} ${WRKSRC}/ext/cli/import ${STAGEDIR}${DATADIR}/cli/apps/import + ${INSTALL_DATA} ${WRKSRC}/ext/cli/ssl-setup ${STAGEDIR}${DATADIR}/cli/apps/ssl-setup + ${INSTALL_DATA} ${WRKSRC}/ext/bin/puppetdb ${STAGEDIR}${PREFIX}/sbin/puppetdb + +.include <bsd.port.post.mk> Added: head/databases/puppetdb3/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb3/distinfo Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +1,2 @@ +SHA256 (puppetdb-3.2.4.tar.gz) = 580d25ace29b61d7504dfc2650fd7e1c6a14e77421cbfafed14703d857996d84 +SIZE (puppetdb-3.2.4.tar.gz) = 25695565 Added: head/databases/puppetdb3/files/patch-ext__bin__puppetdb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb3/files/patch-ext__bin__puppetdb Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +1,21 @@ +--- ext/bin/puppetdb.orig 2016-01-25 03:46:10.797703384 +0000 ++++ ext/bin/puppetdb 2016-01-25 04:12:10.048976423 +0000 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!%%PREFIX%%/bin/bash + + set -a + if [ -r "/etc/default/puppetdb" ] ; then +@@ -11,6 +11,12 @@ + USER="_puppetdb" + INSTALL_DIR="/opt/puppetlabs/server/apps/puppetdb" + CONFIG="/etc/puppetlabs/puppetdb/conf.d" ++elif [ `uname` == "FreeBSD" ] ; then ++ JAVA_BIN="%%JAVA%%" ++ JAVA_ARGS="-Xmx192m" ++ USER="puppetdb" ++ INSTALL_DIR="%%DATADIR%%" ++ CONFIG="%%PREFIX%%/%%ETCDIR%%/conf.d" + else + echo "You seem to be missing some important configuration files; could not find /etc/default/puppetdb or /etc/sysconfig/puppetdb" >&2 + exit 1 Added: head/databases/puppetdb3/files/patch-ext__config__conf.d__config.ini ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb3/files/patch-ext__config__conf.d__config.ini Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +1,15 @@ +--- ext/config/conf.d/config.ini.orig 2016-02-25 00:02:56 UTC ++++ ext/config/conf.d/config.ini +@@ -3,10 +3,10 @@ + + [global] + # Store mq/db data in a custom directory +-vardir = /opt/puppetlabs/server/data/puppetdb ++vardir = /var/db/puppetdb + + # Use an external logback config file +-logging-config = /etc/puppetlabs/puppetdb/logback.xml ++logging-config = /usr/local/etc/puppetdb/logback.xml + + [command-processing] + # How many command-processing threads to use, defaults to (CPUs / 2) Added: head/databases/puppetdb3/files/patch-ext__config__conf.d__database.ini ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb3/files/patch-ext__config__conf.d__database.ini Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +1,11 @@ +--- ext/config/conf.d/database.ini.orig 2016-02-25 00:02:56 UTC ++++ ext/config/conf.d/database.ini +@@ -12,7 +12,7 @@ subprotocol = hsqldb + # For the embedded DB: file:/path/to/database;hsqldb.tx=mvcc;sql.syntax_pgs=true + # For PostgreSQL: //host:port/databaseName + # Defaults to embedded DB located in <vardir>/db +-subname = file:/opt/puppetlabs/server/data/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true ++subname = file:/var/db/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true + + # Connect as a specific user + # username = foobar Added: head/databases/puppetdb3/files/patch-ext__config__logback.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb3/files/patch-ext__config__logback.xml Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +1,15 @@ +--- ext/config/logback.xml.orig 2016-02-25 00:02:56 UTC ++++ ext/config/logback.xml +@@ -6,10 +6,10 @@ + </appender> + + <appender name="F1" class="ch.qos.logback.core.rolling.RollingFileAppender"> +- <file>/var/log/puppetlabs/puppetdb/puppetdb.log</file> ++ <file>/var/log/puppetdb/puppetdb.log</file> + + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> +- <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-%d{yyyy-MM-dd}.log.gz</fileNamePattern> ++ <fileNamePattern>/var/log/puppetdb/puppetdb-%d{yyyy-MM-dd}.log.gz</fileNamePattern> + <maxHistory>90</maxHistory> + </rollingPolicy> + <encoder> Added: head/databases/puppetdb3/files/patch-ext__config__request-logging.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb3/files/patch-ext__config__request-logging.xml Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +1,10 @@ +--- ext/config/request-logging.xml.orig 2016-02-25 00:02:56 UTC ++++ ext/config/request-logging.xml +@@ -1,6 +1,6 @@ + <configuration debug="false"> + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> +- <file>/var/log/puppetlabs/puppetdb/puppetdb-access.log</file> ++ <file>/var/log/puppetdb/puppetdb-access.log</file> + <encoder> + <pattern>combined</pattern> + <!-- To have the same "combined" pattern with elapsedTime ('%D') Added: head/databases/puppetdb3/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb3/files/pkg-message.in Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +1,9 @@ +If this is a new installation, please run the follow to setup your SSL/puppetdb +server: + +%%PREFIX%%/sbin/puppetdb ssl-setup + +Add puppetdb_enable="YES" into your rc.conf to enable. + +To enable communication from a FreeBSD Puppet master, install the +puppetdb-terminus package on the master. Added: head/databases/puppetdb3/files/puppetdb.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb3/files/puppetdb.in Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +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 "/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="--config %%PREFIX%%/etc/puppetdb/conf.d -b %%PREFIX%%/etc/puppetdb/bootstrap.cfg"} +: ${puppetdb_java_home="%%JAVA_HOME%%"} +: ${puppetdb_user="puppetdb"} +: ${puppetdb_group="puppetdb"} +: ${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 puppetlabs.puppetdb.main ${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" Added: head/databases/puppetdb3/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb3/pkg-descr Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +1,3 @@ +The PuppetDB storeconfigs backend + +WWW: https://docs.puppetlabs.com/puppetdb/latest/ Added: head/databases/puppetdb3/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/puppetdb3/pkg-plist Thu Jun 9 11:06:28 2016 (r416588) @@ -0,0 +1,21 @@ +@sample %%ETCDIR%%/logback.xml.sample +@sample %%ETCDIR%%/bootstrap.cfg.sample +@sample %%ETCDIR%%/request-logging.xml.sample +@sample %%ETCDIR%%/conf.d/config.ini.sample +@sample %%ETCDIR%%/conf.d/database.ini.sample +@sample %%ETCDIR%%/conf.d/jetty.ini.sample +@sample %%ETCDIR%%/conf.d/repl.ini.sample +%%DATADIR%%/puppetdb.jar +@group puppetdb +@group +@mode 0750 +%%DATADIR%%/cli/apps/anonymize +%%DATADIR%%/cli/apps/config-migration +%%DATADIR%%/cli/apps/export +%%DATADIR%%/cli/apps/foreground +%%DATADIR%%/cli/apps/import +%%DATADIR%%/cli/apps/ssl-setup +sbin/puppetdb +@mode +@dir(puppetdb,puppetdb,) /var/log/puppetdb +@dir(puppetdb,puppetdb,) /var/db/puppetdb Modified: head/databases/puppetdb4/Makefile ============================================================================== --- head/databases/puppetdb4/Makefile Thu Jun 9 11:01:55 2016 (r416587) +++ head/databases/puppetdb4/Makefile Thu Jun 9 11:06:28 2016 (r416588) @@ -17,7 +17,7 @@ RUN_DEPENDS= bash:shells/bash \ USE_RC_SUBR= puppetdb -CONFLICTS_INSTALL= puppetdb-* +CONFLICTS_INSTALL= puppetdb-* puppetdb3-* USES= shebangfix SHEBANG_FILES= ext/bin/puppetdb \ ext/cli/anonymize \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606091106.u59B6SoU023447>