Attachment 167892 Details for Bug 204074 – Remove extra file

Remove extra file

puppetdb3.shar (text/plain), 12.28 KB, created by Zach Leslie on 2016-03-09 04:13:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zach Leslie

Created: 2016-03-09 04:13:24 UTC

Size: 12.28 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	databases/puppetdb3
>#	databases/puppetdb3/distinfo
>#	databases/puppetdb3/Makefile
>#	databases/puppetdb3/pkg-descr
>#	databases/puppetdb3/files
>#	databases/puppetdb3/files/pkg-message.in
>#	databases/puppetdb3/files/patch-ext__bin__puppetdb
>#	databases/puppetdb3/files/puppetdb.in
>#	databases/puppetdb3/files/patch-ext__config__conf.d__config.ini
>#	databases/puppetdb3/files/patch-ext__config__conf.d__database.ini
>#	databases/puppetdb3/files/patch-ext__config__logback.xml
>#	databases/puppetdb3/files/patch-ext__config__request-logging.xml
>#	databases/puppetdb3/pkg-plist
>#
>echo c - databases/puppetdb3
>mkdir -p databases/puppetdb3 > /dev/null 2>&1
>echo x - databases/puppetdb3/distinfo
>sed 's/^X//' >databases/puppetdb3/distinfo << '2be9069db2337bd7adc018dfb20107f8'
>XSHA256 (puppetdb-3.2.4.tar.gz) = 580d25ace29b61d7504dfc2650fd7e1c6a14e77421cbfafed14703d857996d84
>XSIZE (puppetdb-3.2.4.tar.gz) = 25695565
>2be9069db2337bd7adc018dfb20107f8
>echo x - databases/puppetdb3/Makefile
>sed 's/^X//' >databases/puppetdb3/Makefile << 'ac4e3e772e1cae37af0a84650dc1363d'
>X# $FreeBSD$
>X
>XPORTNAME=	puppetdb
>XPORTVERSION=	3.2.4
>XCATEGORIES=	databases java
>XMASTER_SITES=	http://downloads.puppetlabs.com/puppetdb/
>XPKGNAMESUFFIX=	3
>X
>XMAINTAINER=	freebsd@zleslie.info
>XCOMMENT=	PuppetDB storeconfigs backend
>X
>XLICENSE=	APACHE20
>X
>XRUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
>X		puppet:${PORTSDIR}/sysutils/puppet4
>XBUILD_DEPENDS=	rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
>X		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
>X
>XUSE_RC_SUBR=	puppetdb
>X
>XUSE_JAVA=	yes
>XNO_BUILD=	yes
>XJAVA_VERSION=	1.7+
>X
>XUSERS=		puppetdb
>XGROUPS=		puppetdb
>X
>XSUB_LIST=	JAVA_HOME=${JAVA_HOME}
>XSUB_FILES=	pkg-message
>X
>XPKGMESSAGE=	${WRKDIR}/pkg-message
>X
>X.include <bsd.port.pre.mk>
>X
>Xpost-patch:
>X.for file in ext/config/bootstrap.cfg ext/config/logback.xml \
>X	ext/config/request-logging.xml ext/config/conf.d/config.ini \
>X	ext/config/conf.d/database.ini ext/config/conf.d/jetty.ini \
>X	ext/config/conf.d/repl.ini ext/bin/puppetdb
>X	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
>X	@${REINPLACE_CMD} -e "s|%%JAVA%%|${JAVA}|" ${WRKSRC}/${file}
>X	@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/${file}
>X	@${REINPLACE_CMD} -e "s|%%ETCDIR%%|${ETCDIR}|" ${WRKSRC}/${file}
>X.endfor
>X
>X.for file in ext/cli/anonymize ext/cli/config-migration \
>X	ext/cli/export ext/cli/foreground ext/cli/import \
>X	ext/cli/ssl-setup
>X	@${REINPLACE_CMD} -e 's|/etc/puppetlabs/puppetdb|${ETCDIR}|g' ${WRKSRC}/${file}
>X	@${REINPLACE_CMD} -e 's|/bin/bash|${PREFIX}/bin/bash|g' ${WRKSRC}/${file}
>X.endfor
>X
>Xdo-install:
>X	${MKDIR} ${STAGEDIR}${DATADIR}
>X	${MKDIR} ${STAGEDIR}${DATADIR}/cli
>X	${MKDIR} ${STAGEDIR}${DATADIR}/cli/apps
>X	${MKDIR} ${STAGEDIR}${ETCDIR}
>X	${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
>X	${MKDIR} ${STAGEDIR}/var/log/puppetdb
>X	${MKDIR} ${STAGEDIR}/var/db/puppetdb
>X	${INSTALL_DATA} ${WRKSRC}/puppetdb.jar ${STAGEDIR}${DATADIR}/puppetdb.jar
>X	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/config.ini ${STAGEDIR}${ETCDIR}/conf.d/config.ini
>X	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/database.ini ${STAGEDIR}${ETCDIR}/conf.d/database.ini
>X	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/jetty.ini ${STAGEDIR}${ETCDIR}/conf.d/jetty.ini
>X	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/repl.ini ${STAGEDIR}${ETCDIR}/conf.d/repl.ini
>X	${INSTALL_DATA} ${WRKSRC}/ext/config/bootstrap.cfg ${STAGEDIR}${ETCDIR}/bootstrap.cfg
>X	${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml
>X	${INSTALL_DATA} ${WRKSRC}/ext/config/request-logging.xml ${STAGEDIR}${ETCDIR}/request-logging.xml
>X	${INSTALL_DATA} ${WRKSRC}/ext/cli/anonymize ${STAGEDIR}${DATADIR}/cli/apps/anonymize
>X	${INSTALL_DATA} ${WRKSRC}/ext/cli/config-migration ${STAGEDIR}${DATADIR}/cli/apps/config-migration
>X	${INSTALL_DATA} ${WRKSRC}/ext/cli/export ${STAGEDIR}${DATADIR}/cli/apps/export
>X	${INSTALL_DATA} ${WRKSRC}/ext/cli/foreground ${STAGEDIR}${DATADIR}/cli/apps/foreground
>X	${INSTALL_DATA} ${WRKSRC}/ext/cli/import ${STAGEDIR}${DATADIR}/cli/apps/import
>X	${INSTALL_DATA} ${WRKSRC}/ext/cli/ssl-setup ${STAGEDIR}${DATADIR}/cli/apps/ssl-setup
>X	${INSTALL_DATA} ${WRKSRC}/ext/bin/puppetdb ${STAGEDIR}${PREFIX}/sbin/puppetdb
>X
>X.include <bsd.port.post.mk>
>ac4e3e772e1cae37af0a84650dc1363d
>echo x - databases/puppetdb3/pkg-descr
>sed 's/^X//' >databases/puppetdb3/pkg-descr << '1c96e461c0e3b16ca9534edebb9efc44'
>XThe PuppetDB storeconfigs backend
>X
>XWWW: https://docs.puppetlabs.com/puppetdb/latest/
>1c96e461c0e3b16ca9534edebb9efc44
>echo c - databases/puppetdb3/files
>mkdir -p databases/puppetdb3/files > /dev/null 2>&1
>echo x - databases/puppetdb3/files/pkg-message.in
>sed 's/^X//' >databases/puppetdb3/files/pkg-message.in << '2542d2211c6f71b286745fb33069a7bf'
>XIf this is a new installation, please run the follow to setup your SSL/puppetdb
>Xserver:
>X
>X%%PREFIX%%/sbin/puppetdb ssl-setup
>X
>XAdd puppetdb_enable="YES" into your rc.conf to enable.
>X
>XTo enable communication from a FreeBSD Puppet master, install the
>Xpuppetdb-terminus package on the master.
>2542d2211c6f71b286745fb33069a7bf
>echo x - databases/puppetdb3/files/patch-ext__bin__puppetdb
>sed 's/^X//' >databases/puppetdb3/files/patch-ext__bin__puppetdb << '7e31ef5391764a524bef339f8678de47'
>X--- ext/bin/puppetdb.orig	2016-01-25 03:46:10.797703384 +0000
>X+++ ext/bin/puppetdb	2016-01-25 04:12:10.048976423 +0000
>X@@ -1,4 +1,4 @@
>X-#!/bin/bash
>X+#!%%PREFIX%%/bin/bash
>X 
>X set -a
>X if [ -r "/etc/default/puppetdb" ] ; then
>X@@ -11,6 +11,12 @@
>X     USER="_puppetdb"
>X     INSTALL_DIR="/opt/puppetlabs/server/apps/puppetdb"
>X     CONFIG="/etc/puppetlabs/puppetdb/conf.d"
>X+elif [ `uname` == "FreeBSD" ] ; then
>X+    JAVA_BIN="%%JAVA%%"
>X+    JAVA_ARGS="-Xmx192m"
>X+    USER="puppetdb"
>X+    INSTALL_DIR="%%DATADIR%%"
>X+    CONFIG="%%PREFIX%%/%%ETCDIR%%/conf.d"
>X else
>X     echo "You seem to be missing some important configuration files; could not find /etc/default/puppetdb or /etc/sysconfig/puppetdb" >&2
>X     exit 1
>7e31ef5391764a524bef339f8678de47
>echo x - databases/puppetdb3/files/puppetdb.in
>sed 's/^X//' >databases/puppetdb3/files/puppetdb.in << 'aea55f86afacd5213f9b22ab22444ed1'
>X#!/bin/sh
>X
>X# $FreeBSD$
>X#
>X# PROVIDE: puppetdb
>X# REQUIRE: LOGIN
>X# KEYWORD: shutdown
>X
>X#
>X# Configuration settings for puppetdb in /etc/rc.conf:
>X#
>X# puppetdb_enable (bool):
>X#   Set to "NO" by default.
>X#   Set it to "YES" to enable puppetdb
>X#
>X# puppetdb_args (str):
>X#   Extra arguments passed to start command
>X#
>X# puppetdb_java_home (str):
>X#   Set to "%%JAVA_HOME%%" by default.
>X#   Set the Java virtual machine to run puppetdb
>X#
>X# puppetdb_java_opts (str):
>X#   Set to "" by default.
>X#   Java VM args to use.
>X#
>X# puppetdb_user (str):
>X#   Set to "puppetdb" by default.
>X#   User to run puppetdb as.
>X#
>X# puppetdb_group (str):
>X#   Set to "puppetdb" by default.
>X#   Group for data file ownership.
>X#
>X# puppetdb_log_file (str):
>X#   Set to "/var/log/puppetdb/puppetdb.log" by default.
>X#   Log file location.
>X#
>X
>X. /etc/rc.subr
>X
>Xname="puppetdb"
>Xrcvar=puppetdb_enable
>X
>Xload_rc_config "${name}"
>X
>X: ${puppetdb_enable="NO"}
>X: ${puppetdb_args="--config %%PREFIX%%/etc/puppetdb/conf.d -b %%PREFIX%%/etc/puppetdb/bootstrap.cfg"}
>X: ${puppetdb_java_home="%%JAVA_HOME%%"}
>X: ${puppetdb_user="puppetdb"}
>X: ${puppetdb_group="puppetdb"}
>X: ${puppetdb_log_file="/var/log/puppetdb/puppetdb.log"}
>X
>Xpidfile="/var/run/puppetdb/puppetdb.pid"
>Xcommand="/usr/sbin/daemon"
>Xjava_cmd="${puppetdb_java_home}/bin/java"
>Xprocname="${java_cmd}"
>Xcommand_args="-p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.main ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
>X
>X
>Xrequired_files="${java_cmd}"
>X
>Xstart_precmd="puppetdb_prestart"
>X
>Xpuppetdb_prestart() {
>X  if [ ! -f "${puppetdb_log_file}" ]; then
>X    touch "${puppetdb_log_file}"
>X    chown "${puppetdb_user}:${puppetdb_group}" "${puppetdb_log_file}"
>X    chmod 640 "${puppetdb_log_file}"
>X  fi
>X  if [ ! -d "/var/run/puppetdb" ]; then
>X    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/run/puppetdb"
>X  fi
>X
>X  chown -R "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/conf.d"
>X  chmod 0750 "%%PREFIX%%/etc/puppetdb/conf.d"
>X
>X  chown "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/logback.xml"
>X  chmod 0640 "%%PREFIX%%/etc/puppetdb/logback.xml"
>X
>X  chown -R "${puppetdb_user}:${puppetdb_group}" "/var/db/puppetdb"
>X  chmod 0750 "/var/db/puppetdb"
>X}
>X
>Xrun_rc_command "$1"
>aea55f86afacd5213f9b22ab22444ed1
>echo x - databases/puppetdb3/files/patch-ext__config__conf.d__config.ini
>sed 's/^X//' >databases/puppetdb3/files/patch-ext__config__conf.d__config.ini << '7957fe6c8fbb0c6fed0cd7b6a542aeb4'
>X--- ext/config/conf.d/config.ini.orig	2015-10-27 20:09:57 UTC
>X+++ ext/config/conf.d/config.ini
>X@@ -3,10 +3,10 @@
>X 
>X [global]
>X # Store mq/db data in a custom directory
>X-vardir = /opt/puppetlabs/server/data/puppetdb
>X+vardir = /var/db/puppetdb
>X 
>X # Use an external logback config file
>X-logging-config = /etc/puppetlabs/puppetdb/logback.xml
>X+logging-config = %%PREFIX%%/etc/puppetdb/logback.xml
>X 
>X [command-processing]
>X # How many command-processing threads to use, defaults to (CPUs / 2)
>7957fe6c8fbb0c6fed0cd7b6a542aeb4
>echo x - databases/puppetdb3/files/patch-ext__config__conf.d__database.ini
>sed 's/^X//' >databases/puppetdb3/files/patch-ext__config__conf.d__database.ini << '0aa18643d343e425c0b9234a076cc83e'
>X--- ext/config/conf.d/database.ini.orig	2015-10-27 20:23:12 UTC
>X+++ ext/config/conf.d/database.ini
>X@@ -12,7 +12,7 @@
>X # For the embedded DB: file:/path/to/database;hsqldb.tx=mvcc;sql.syntax_pgs=true
>X # For PostgreSQL: //host:port/databaseName
>X # Defaults to embedded DB located in <vardir>/db
>X-subname = file:/opt/puppetlabs/server/data/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true
>X+subname = file:/var/db/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true
>X 
>X # Connect as a specific user
>X # username = foobar
>0aa18643d343e425c0b9234a076cc83e
>echo x - databases/puppetdb3/files/patch-ext__config__logback.xml
>sed 's/^X//' >databases/puppetdb3/files/patch-ext__config__logback.xml << 'd6adf6063cb9fb2526a1c55f3d0f53da'
>X--- ext/config/logback.xml.orig	2015-10-27 20:09:15 UTC
>X+++ ext/config/logback.xml
>X@@ -6,10 +6,10 @@
>X     </appender>
>X 
>X     <appender name="F1" class="ch.qos.logback.core.rolling.RollingFileAppender">
>X-        <file>/var/log/puppetlabs/puppetdb/puppetdb.log</file>
>X+        <file>/var/log/puppetdb/puppetdb.log</file>
>X 
>X         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
>X-            <fileNamePattern>/var/log/puppetlabs/puppetdb/puppetdb-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
>X+            <fileNamePattern>/var/log/puppetdb/puppetdb-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
>X             <maxHistory>90</maxHistory>
>X         </rollingPolicy>
>X         <encoder>
>d6adf6063cb9fb2526a1c55f3d0f53da
>echo x - databases/puppetdb3/files/patch-ext__config__request-logging.xml
>sed 's/^X//' >databases/puppetdb3/files/patch-ext__config__request-logging.xml << '80ba84912ef1ef1d41c8b556b3b4b22a'
>X--- ext/config/request-logging.xml.orig	2015-10-27 20:08:53 UTC
>X+++ ext/config/request-logging.xml
>X@@ -1,6 +1,6 @@
>X <configuration debug="false">
>X     <appender name="FILE" class="ch.qos.logback.core.FileAppender">
>X-        <file>/var/log/puppetlabs/puppetdb/puppetdb-access.log</file>
>X+        <file>/var/log/puppetdb/puppetdb-access.log</file>
>X         <encoder>
>X             <pattern>combined</pattern>
>X             <!-- To have the same "combined" pattern with elapsedTime ('%D')
>80ba84912ef1ef1d41c8b556b3b4b22a
>echo x - databases/puppetdb3/pkg-plist
>sed 's/^X//' >databases/puppetdb3/pkg-plist << 'ddfe25bf3410b14d73cffeb8e30f90cc'
>X%%ETCDIR%%/logback.xml
>X%%ETCDIR%%/bootstrap.cfg
>X%%ETCDIR%%/request-logging.xml
>X%%ETCDIR%%/conf.d/config.ini
>X%%ETCDIR%%/conf.d/database.ini
>X%%ETCDIR%%/conf.d/jetty.ini
>X%%ETCDIR%%/conf.d/repl.ini
>X%%DATADIR%%/puppetdb.jar
>X@group puppetdb
>X@group
>X@mode 0750
>X%%DATADIR%%/cli/apps/anonymize
>X%%DATADIR%%/cli/apps/config-migration
>X%%DATADIR%%/cli/apps/export
>X%%DATADIR%%/cli/apps/foreground
>X%%DATADIR%%/cli/apps/import
>X%%DATADIR%%/cli/apps/ssl-setup
>Xsbin/puppetdb
>X@mode
>X@dir(puppetdb,puppetdb,) /var/log/puppetdb
>X@dir(puppetdb,puppetdb,) /var/db/puppetdb
>ddfe25bf3410b14d73cffeb8e30f90cc
>exit
>

Actions: View

Attachments on bug 204074: 162513 | 166073 | 166080 | 167002 | 167890 | 167891 | 167892 | 168709 | 170538