View | Details | Raw Unified | Return to bug 187517 | Differences between
and this patch

Collapse All | Expand All

(-)databases/Makefile (+1 lines)
Lines 698-703 Link Here
698
    SUBDIR += proftpd-mod_sql_postgres
698
    SUBDIR += proftpd-mod_sql_postgres
699
    SUBDIR += proftpd-mod_sql_sqlite
699
    SUBDIR += proftpd-mod_sql_sqlite
700
    SUBDIR += proftpd-mod_sql_tds
700
    SUBDIR += proftpd-mod_sql_tds
701
    SUBDIR += puppetdb
701
    SUBDIR += pure-sql3
702
    SUBDIR += pure-sql3
702
    SUBDIR += puredb
703
    SUBDIR += puredb
703
    SUBDIR += pxlib
704
    SUBDIR += pxlib
(-)databases/puppetdb/Makefile (+67 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
PORTNAME=		puppetdb
4
PORTVERSION=		1.6.2
5
CATEGORIES=		databases java
6
MASTER_SITES=		http://downloads.puppetlabs.com/puppetdb/
7
8
MAINTAINER=		xaque208@gmail.com
9
COMMENT=		The PuppetDB storeconfigs backend
10
11
RUN_DEPENDS=		bash>=0:${PORTSDIR}/shells/bash
12
BUILD_DEPENDS=		rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
13
			rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
14
15
USE_RC_SUBR=		puppetdb
16
17
#LICENSE=		Apache-2.0
18
19
USE_JAVA=		yes
20
USE_RUBY=		yes
21
USE_RAKE=		yes
22
NO_BUILD=		yes
23
JAVA_VERSION=		1.7+
24
25
PUPPETDB_USER?=		puppet
26
PUPPETDB_GROUP?=	puppet
27
PUPPETDB_LOG_FILE?=	/var/log/puppetdb/puppetdb.log
28
29
.if ${PUPPETDB_USER} == "puppet"
30
USERS=	"puppet"
31
.endif
32
.if ${PUPPETDB_GROUP} == "puppet"
33
GROUPS=	"puppet"
34
.endif
35
36
SUB_LIST+=		JAVA_HOME=${JAVA_HOME} \
37
			PUPPETDB_USER=${PUPPETDB_USER} \
38
			PUPPETDB_GROUP=${PUPPETDB_GROUP} \
39
			PUPPETDB_LOG_FILE=${PUPPETDB_LOG_FILE}
40
41
PLIST_SUB+=		PUPPETDB_USER=${PUPPETDB_USER} \
42
			PUPPETDB_GROUP=${PUPPETDB_GROUP}
43
44
.include <bsd.port.pre.mk>
45
46
post-patch:
47
.for file in ext/files/puppetdb ext/files/puppetdb-anonymize ext/files/puppetdb-export \
48
	ext/files/puppetdb-foreground ext/files/puppetdb-import ext/files/puppetdb-legacy \
49
	ext/files/puppetdb-ssl-setup ext/files/config.ini ext/files/database.ini Rakefile
50
51
	@${REINPLACE_CMD} -e 's|/bin/bash|${PREFIX}/bin/bash|' \
52
		-e 's|/usr/bin/java|${JAVA}|g' \
53
		-e 's|su puppetdb|su ${PUPPETDB_USER}|' \
54
		-e 's|user=puppetdb|user=${PUPPETDB_USER}|' \
55
		-e 's|/usr/libexec/puppetdb|${PREFIX}/libexec/puppetdb|' \
56
		-e 's|/usr/share/puppetdb|${DATADIR}|' \
57
		-e 's|/etc/puppetdb|${ETCDIR}|' \
58
		-e 's|/etc/puppetlabs/puppetdb|${PREFIX}/etc/puppetlabs/puppetdb|' \
59
		-e 's|/var/lib/puppetdb|/var/puppetdb|' \
60
		-e 's|/usr/sbin|${PREFIX}/sbin|' \
61
		${WRKSRC}/${file}
62
.endfor
63
64
do-install:
65
	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} rake install
66
67
.include <bsd.port.post.mk>
(-)databases/puppetdb/distinfo (+2 lines)
Line 0 Link Here
1
SHA256 (puppetdb-1.6.2.tar.gz) = 884c62968877a8026edf0a60f4c82c311e2d7f2f3e9eb270d60a8dc2033ff540
2
SIZE (puppetdb-1.6.2.tar.gz) = 21340797
(-)databases/puppetdb/files/patch-Rakefile (+11 lines)
Line 0 Link Here
1
--- ./Rakefile.orig	2014-03-05 11:42:53.000000000 +0000
2
+++ ./Rakefile	2014-03-05 13:55:04.000000000 +0000
3
@@ -95,6 +95,8 @@
4
     @plibdir = @pe ? PE_SITELIBDIR : (%x(ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']").chomp)
5
   when /openbsd/
6
     @plibdir = @pe ? PE_SITELIBDIR : '/usr/local/lib/ruby/site_ruby/1.9.1'
7
+  when /freebsd/
8
+    @plibdir = @pe ? PE_SITELIBDIR : Facter.value(:rubysitedir).chomp
9
 end
10
 
11
 @heap_dump_path = "#{@log_dir}/puppetdb-oom.hprof"
(-)databases/puppetdb/files/patch-ext__files__config.ini (+10 lines)
Line 0 Link Here
1
--- ./ext/files/config.ini.orig	2014-02-06 18:05:31.000000000 +0000
2
+++ ./ext/files/config.ini	2014-03-05 09:03:55.000000000 +0000
3
@@ -17,3 +17,7 @@
4
 
5
 # Maximum amount of disk space (in MB) to allow for ActiveMQ temporary message storage
6
 # temp-usage = 51200
7
+
8
+[jetty]
9
+# Port to listen on for clear-text HTTP.
10
+port = 8080
(-)databases/puppetdb/files/patch-tasks__install.rake (+73 lines)
Line 0 Link Here
1
--- ./tasks/install.rake.orig	2014-02-06 18:04:53.000000000 +0000
2
+++ ./tasks/install.rake	2014-03-06 09:20:38.000000000 +0000
3
@@ -16,22 +16,16 @@
4
   mkdir_p "#{DESTDIR}/#{@config_dir}"
5
   mkdir_p "#{DESTDIR}/#{@config_dir}/.."
6
   mkdir_p "#{DESTDIR}/#{@log_dir}"
7
-  mkdir_p "#{DESTDIR}/etc/init.d/"
8
   mkdir_p "#{DESTDIR}/#{@lib_dir}"
9
   mkdir_p "#{DESTDIR}/#{@libexec_dir}"
10
   mkdir_p "#{DESTDIR}/#{@sbin_dir}"
11
   mkdir_p "#{DESTDIR}/etc/logrotate.d/"
12
-  ln_sf @config_dir, "#{DESTDIR}/#{@lib_dir}/config"
13
-  ln_sf @log_dir, "#{DESTDIR}/#{@install_dir}/log"
14
 
15
   unless @pe
16
-    mkdir_p "#{DESTDIR}/var/lib/puppetdb/state"
17
-    mkdir_p "#{DESTDIR}/var/lib/puppetdb/db"
18
-    mkdir_p "#{DESTDIR}/var/lib/puppetdb/mq"
19
-    ln_sf "#{@lib_dir}/state", "#{DESTDIR}#{@link}/state"
20
-    ln_sf "#{@lib_dir}/db", "#{DESTDIR}#{@link}/db"
21
-    ln_sf "#{@lib_dir}/mq", "#{DESTDIR}#{@link}/mq"
22
-    mkdir_p "#{DESTDIR}/etc/puppetdb"
23
+    mkdir_p "#{DESTDIR}#{@lib_dir}/state"
24
+    mkdir_p "#{DESTDIR}#{@lib_dir}/db"
25
+    mkdir_p "#{DESTDIR}#{@lib_dir}/mq"
26
+    mkdir_p "#{DESTDIR}#{@etc_dir}"
27
   else
28
     mkdir_p "#{DESTDIR}#{@lib_dir}/state"
29
     mkdir_p "#{DESTDIR}#{@lib_dir}/db"
30
@@ -40,19 +34,15 @@
31
   end
32
 
33
   cp_p JAR_FILE, "#{DESTDIR}/#{@install_dir}"
34
-  cp_pr "ext/files/config.ini", "#{DESTDIR}/#{@config_dir}"
35
-  cp_pr "ext/files/database.ini", "#{DESTDIR}/#{@config_dir}"
36
-  cp_pr "ext/files/jetty.ini", "#{DESTDIR}/#{@config_dir}"
37
-  cp_pr "ext/files/repl.ini", "#{DESTDIR}/#{@config_dir}"
38
+  cp_pr "ext/files/config.ini", "#{DESTDIR}/#{@config_dir}/config.ini.sample"
39
+  cp_pr "ext/files/database.ini", "#{DESTDIR}/#{@config_dir}/database.ini.sample"
40
+  cp_pr "ext/files/jetty.ini", "#{DESTDIR}/#{@config_dir}/jetty.ini.sample"
41
+  cp_pr "ext/files/repl.ini", "#{DESTDIR}/#{@config_dir}/repl.ini.sample"
42
   cp_pr "ext/files/puppetdb.logrotate", "#{DESTDIR}/etc/logrotate.d/#{@name}"
43
   cp_pr "ext/files/log4j.properties", "#{DESTDIR}/#{@config_dir}/.."
44
   cp_pr "ext/files/puppetdb", "#{DESTDIR}/#{@sbin_dir}"
45
 
46
-  # Copy legacy wrapper for deprecated hyphenated sub-commands
47
   legacy_cmds=%w|puppetdb-ssl-setup puppetdb-foreground puppetdb-import puppetdb-export puppetdb-anonymize|
48
-  legacy_cmds.each do |file|
49
-    cp_pr "ext/files/puppetdb-legacy", "#{DESTDIR}/#{@sbin_dir}/#{file}"
50
-  end
51
 
52
   # Copy internal sub-commands to libexec location
53
   internal_cmds=legacy_cmds
54
@@ -93,15 +83,14 @@
55
     mkdir_p "#{DESTDIR}/etc/rc.d/"
56
     cp_p "ext/files/puppetdb.openbsd.init", "#{DESTDIR}/etc/rc.d/#{@name}.rc"
57
     chmod 0755, "#{DESTDIR}/etc/rc.d/#{@name}.rc"
58
+  elsif @osfamily == "freebsd"
59
+    #mkdir_p "#{DESTDIR}/usr/local/etc/rc.d/"
60
+    #cp_p "ext/files/puppetdb.openbsd.init", "#{DESTDIR}/etc/rc.d/#{@name}.rc"
61
+    #chmod 0755, "#{DESTDIR}/etc/rc.d/#{@name}.rc"
62
   else
63
     raise "Unknown or unsupported osfamily: #{@osfamily}"
64
   end
65
   chmod 0750, "#{DESTDIR}/#{@config_dir}"
66
   chmod 0640, "#{DESTDIR}/#{@config_dir}/../log4j.properties"
67
-  chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-ssl-setup"
68
-  chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-foreground"
69
-  chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-import"
70
-  chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-export"
71
-  chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-anonymize"
72
   chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb"
73
 end
(-)databases/puppetdb/files/puppetdb.in (+83 lines)
Line 0 Link Here
1
#!/bin/sh
2
3
# $FreeBSD: $
4
#
5
# PROVIDE: puppetdb
6
# REQUIRE: LOGIN
7
# KEYWORD: shutdown
8
9
#
10
# Configuration settings for puppetdb in /etc/rc.conf:
11
#
12
# puppetdb_enable (bool):
13
#   Set to "NO" by default.
14
#   Set it to "YES" to enable puppetdb
15
#
16
# puppetdb_args (str):
17
#   Extra arguments passed to start command
18
#
19
# puppetdb_java_home (str):
20
#   Set to "%%JAVA_HOME%%" by default.
21
#   Set the Java virtual machine to run puppetdb
22
#
23
# puppetdb_java_opts (str):
24
#   Set to "" by default.
25
#   Java VM args to use.
26
#
27
# puppetdb_user (str):
28
#   Set to "%%PUPPETDB_USER%%" by default.
29
#   User to run puppetdb as.
30
#
31
# puppetdb_group (str):
32
#   Set to "%%PUPPETDB_GROUP%%" by default.
33
#   Group for data file ownership.
34
#
35
# puppetdb_log_file (str):
36
#   Set to "%%PUPPETDB_LOG_FILE%%" by default.
37
#   Log file location.
38
#
39
40
. /etc/rc.subr
41
42
name="puppetdb"
43
rcvar=puppetdb_enable
44
45
load_rc_config "${name}"
46
47
: ${puppetdb_enable="NO"}
48
: ${puppetdb_args="services -c %%PREFIX%%/etc/puppetdb/conf.d"}
49
: ${puppetdb_java_home="%%JAVA_HOME%%"}
50
: ${puppetdb_user="%%PUPPETDB_USER%%"}
51
: ${puppetdb_group="%%PUPPETDB_GROUP%%"}
52
: ${puppetdb_log_file="%%PUPPETDB_LOG_FILE%%"}
53
54
pidfile="/var/run/puppetdb/puppetdb.pid"
55
command="/usr/sbin/daemon"
56
java_cmd="${puppetdb_java_home}/bin/java"
57
procname="${java_cmd}"
58
command_args="-p ${pidfile} ${java_cmd} -jar %%DATADIR%%/puppetdb.jar ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
59
required_files="${java_cmd}"
60
61
start_precmd="puppetdb_prestart"
62
63
puppetdb_prestart() {
64
  if [ ! -f "${puppetdb_log_file}" ]; then
65
    touch "${puppetdb_log_file}"
66
    chown "${puppetdb_user}:${puppetdb_group}" "${puppetdb_log_file}"
67
    chmod 640 "${puppetdb_log_file}"
68
  fi
69
  if [ ! -d "/var/run/puppetdb" ]; then
70
    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/run/puppetdb"
71
  fi
72
73
  chown -R "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/conf.d"
74
  chmod 0750 "%%PREFIX%%/etc/puppetdb/conf.d"
75
76
  chown "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/log4j.properties"
77
  chmod 0640 "%%PREFIX%%/etc/puppetdb/log4j.properties"
78
79
  chown -R "${puppetdb_user}:${puppetdb_group}" "/var/puppetdb"
80
  chmod 0750 "/var/puppetdb"
81
}
82
83
run_rc_command "$1"
(-)databases/puppetdb/pkg-descr (+2 lines)
Line 0 Link Here
1
The PuppetDB storeconfigs backend
2
WWW: https://docs.puppetlabs.com/puppetdb/latest/
(-)databases/puppetdb/pkg-message (+5 lines)
Line 0 Link Here
1
Please run the follow to setup your SSL/puppetdb server:
2
3
/usr/local/sbin/puppetdb ssl-setup
4
5
Also do not forget to add puppetdb_enable="YES" into your rc.conf
(-)databases/puppetdb/pkg-plist (+58 lines)
Line 0 Link Here
1
/etc/logrotate.d/puppetdb
2
libexec/puppetdb/puppetdb-anonymize
3
libexec/puppetdb/puppetdb-export
4
libexec/puppetdb/puppetdb-foreground
5
libexec/puppetdb/puppetdb-import
6
libexec/puppetdb/puppetdb-ssl-setup
7
sbin/puppetdb
8
%%DATADIR%%/puppetdb.jar
9
10
@group %%PUPPETDB_GROUP%%
11
@unexec if cmp -s %D/etc/puppetdb/conf.d/config.ini.sample %D/etc/puppetdb/conf.d/config.ini; then rm -f %D/etc/puppetdb/conf.d/config.ini; fi
12
etc/puppetdb/conf.d/config.ini.sample
13
@exec if [ ! -f %D/etc/puppetdb/conf.d/config.ini ] ; then cp -p %D/%F %B/config.ini; fi
14
@unexec if cmp -s %D/etc/puppetdb/conf.d/database.ini.sample %D/etc/puppetdb/conf.d/database.ini; then rm -f %D/etc/puppetdb/conf.d/database.ini; fi
15
etc/puppetdb/conf.d/database.ini.sample
16
@exec if [ ! -f %D/etc/puppetdb/conf.d/database.ini ] ; then cp -p %D/%F %B/database.ini; fi
17
@unexec if cmp -s %D/etc/puppetdb/conf.d/jetty.ini.sample %D/etc/puppetdb/conf.d/jetty.ini; then rm -f %D/etc/puppetdb/conf.d/jetty.ini; fi
18
etc/puppetdb/conf.d/jetty.ini.sample
19
@exec if [ ! -f %D/etc/puppetdb/conf.d/jetty.ini ] ; then cp -p %D/%F %B/jetty.ini; fi
20
@unexec if cmp -s %D/etc/puppetdb/conf.d/repl.ini.sample %D/etc/puppetdb/conf.d/repl.ini; then rm -f %D/etc/puppetdb/conf.d/repl.ini; fi
21
etc/puppetdb/conf.d/repl.ini.sample
22
@exec if [ ! -f %D/etc/puppetdb/conf.d/repl.ini ] ; then cp -p %D/%F %B/repl.ini; fi
23
etc/puppetdb/log4j.properties
24
25
@owner %%PUPPETDB_USER%%
26
@exec mkdir -p /var/log/puppetdb
27
@dirrmtry /var/log/puppetdb
28
29
@mode 0750
30
@exec mkdir -p /var/puppetdb
31
@mode
32
33
@exec mkdir -p /var/puppetdb/state
34
@dirrmtry /var/puppetdb/state
35
@exec mkdir -p /var/puppetdb/db
36
@dirrmtry /var/puppetdb/db
37
@exec mkdir -p /var/puppetdb/mq
38
@dirrmtry /var/puppetdb/mq
39
@dirrmtry /var/puppetdb
40
41
@owner
42
@group
43
44
@unexec rm -f %D/share/puppetdb/state
45
@exec ln -s /var/puppetdb/state %D/share/puppetdb/state
46
@unexec rm -f %D/share/puppetdb/mq
47
@exec ln -s /var/puppetdb/mq %D/share/puppetdb/mq
48
@unexec rm -f %D/share/puppetdb/db
49
@exec ln -s /var/puppetdb/db %D/share/puppetdb/db
50
@unexec rm -f %D/share/puppetdb/log
51
@exec ln -s /var/log/puppetdb %D/share/puppetdb/log
52
53
@dirrmtry etc/puppetdb/conf.d
54
@dirrmtry etc/puppetdb
55
@dirrm libexec/puppetdb
56
57
@dirrm %%DATADIR%%
58
@dirrmtry /etc/logrotate.d

Return to bug 187517