cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- don't install puppetdb.default which is just for Linuxen

Browse Source
This commit is contained in:
jasper 2013-06-28 09:40:10 +00:00
parent cf18fa96d4
commit fa61a1af8a
3 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
databases/puppetdb/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2013/06/28 09:30:44 jasper Exp $
# $OpenBSD: Makefile,v 1.3 2013/06/28 09:40:10 jasper Exp $
COMMENT-main= fast, scalable, and reliable data warehouse for Puppet
COMMENT-plugin= PuppetDB terminus plugin
@ -7,7 +7,7 @@ V= 1.3.2
DISTNAME= puppetdb-$V
PKGNAME-main= ${DISTNAME}
PKGNAME-plugin= puppetdb-terminus-$V
REVISION-main= 0
REVISION-main= 1
CATEGORIES= databases
HOMEPAGE= http://docs.puppetlabs.com/puppetdb/latest/
@ -38,8 +38,7 @@ NO_TEST= Yes
SCRIPTS= export foreground import ssl-setup
do-configure:
${SUBST_CMD} ${WRKSRC}/Rakefile ${WRKSRC}/tasks/install.rake \
${WRKSRC}/ext/files/puppetdb.default
${SUBST_CMD} ${WRKSRC}/Rakefile ${WRKSRC}/tasks/install.rake
.for s in ${SCRIPTS}
${SUBST_CMD} ${WRKSRC}/ext/files/puppetdb-$s
.endfor
@ -52,8 +51,6 @@ do-install:
.for c in config.ini database.ini jetty.ini repl.ini
cat ${WRKSRC}/ext/files/$c >> ${PREFIX}/share/examples/puppetdb/puppetdb.conf
.endfor
${INSTALL_DATA} ${WRKSRC}/ext/files/puppetdb.default \
${PREFIX}/share/examples/puppetdb/
${INSTALL_DATA} ${WRKSRC}/ext/files/log4j.properties \
${PREFIX}/share/examples/puppetdb/
${INSTALL_DATA} ${WRKSRC}/puppetdb.jar ${PREFIX}/share/puppetdb/

20
databases/puppetdb/patches/patch-ext_files_puppetdb_default
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-ext_files_puppetdb_default,v 1.1.1.1 2013/06/28 09:13:09 jasper Exp $
--- ext/files/puppetdb.default.orig Thu Jun 27 15:13:22 2013
+++ ext/files/puppetdb.default Thu Jun 27 15:13:25 2013
@@ -3,12 +3,12 @@
###########################################
# Location of your Java binary (version 6 or higher)
-JAVA_BIN="/usr/bin/java"
+JAVA_BIN==$(${LOCALBASE}/bin/javaPathHelper -c puppetdb)
# Modify this if you'd like to change the memory allocation, enable JMX, etc
JAVA_ARGS="-Xmx192m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/puppetdb/puppetdb-oom.hprof "
# These normally shouldn't need to be edited if using OS packages
-USER="puppetdb"
-INSTALL_DIR="/usr/share/puppetdb"
-CONFIG="/etc/puppetdb/conf.d"
+USER="_puppetdb"
+INSTALL_DIR="${PREFIX}/share/puppetdb"
+CONFIG="${SYSCONFDIR}/puppetdb/conf.d"

4
databases/puppetdb/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2013/06/28 09:13:09 jasper Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2013/06/28 09:40:10 jasper Exp $
@newgroup _puppetdb:719
@newuser _puppetdb:719:719:daemon:PuppetDB user:/nonexistent:/sbin/nologin
@extraunexec rm -rf /var/log/puppetdb/*
@ -13,8 +13,6 @@ share/examples/puppetdb/puppetdb.conf
@sample ${SYSCONFDIR}/puppetdb/conf.d/puppetdb.conf
share/examples/puppetdb/log4j.properties
@sample ${SYSCONFDIR}/puppetdb/log4j.properties
share/examples/puppetdb/puppetdb.default
@sample ${SYSCONFDIR}/puppetdb/conf.d/puppetdb
share/puppetdb/
share/puppetdb/db
share/puppetdb/mq