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

Collapse All | Expand All

(-)puppetdb/Makefile (+68 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
PORTNAME=		puppetdb
4
PORTVERSION=		2.1.0
5
PORTREVISION=		4
6
CATEGORIES=		databases java
7
MASTER_SITES=		http://downloads.puppetlabs.com/puppetdb/
8
9
MAINTAINER=		xaque208@gmail.com
10
COMMENT=		The PuppetDB storeconfigs backend
11
12
RUN_DEPENDS=		bash>=0:${PORTSDIR}/shells/bash
13
BUILD_DEPENDS=		rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
14
			rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
15
16
USE_RC_SUBR=		puppetdb
17
18
#LICENSE=		Apache-2.0
19
20
USE_JAVA=		yes
21
USE_RUBY=		yes
22
USE_RAKE=		yes
23
NO_BUILD=		yes
24
JAVA_VERSION=		1.7+
25
26
PUPPETDB_USER?=		puppet
27
PUPPETDB_GROUP?=	puppet
28
PUPPETDB_LOG_FILE?=	/var/log/puppetdb/puppetdb.log
29
30
.if ${PUPPETDB_USER} == "puppet"
31
USERS=	"puppet"
32
.endif
33
.if ${PUPPETDB_GROUP} == "puppet"
34
GROUPS=	"puppet"
35
.endif
36
37
SUB_LIST+=		JAVA_HOME=${JAVA_HOME} \
38
			PUPPETDB_USER=${PUPPETDB_USER} \
39
			PUPPETDB_GROUP=${PUPPETDB_GROUP} \
40
			PUPPETDB_LOG_FILE=${PUPPETDB_LOG_FILE}
41
42
PLIST_SUB+=		PUPPETDB_USER=${PUPPETDB_USER} \
43
			PUPPETDB_GROUP=${PUPPETDB_GROUP}
44
45
.include <bsd.port.pre.mk>
46
47
post-patch:
48
.for file in ext/files/puppetdb ext/files/puppetdb-anonymize ext/files/puppetdb-export \
49
	ext/files/puppetdb-foreground ext/files/puppetdb-import ext/files/puppetdb-legacy \
50
	ext/files/puppetdb-ssl-setup ext/files/config.ini ext/files/database.ini Rakefile
51
52
	@${REINPLACE_CMD} -e 's|/bin/bash|${PREFIX}/bin/bash|' \
53
		-e 's|/usr/bin/java|${JAVA}|g' \
54
		-e 's|su puppetdb|su ${PUPPETDB_USER}|' \
55
		-e 's|user=puppetdb|user=${PUPPETDB_USER}|' \
56
		-e 's|/usr/libexec/puppetdb|${PREFIX}/libexec/puppetdb|' \
57
		-e 's|/usr/share/puppetdb|${DATADIR}|' \
58
		-e 's|/etc/puppetdb|${ETCDIR}|' \
59
		-e 's|/etc/puppetlabs/puppetdb|${PREFIX}/etc/puppetlabs/puppetdb|' \
60
		-e 's|/var/lib/puppetdb|/var/puppetdb|' \
61
		-e 's|/usr/sbin|${PREFIX}/sbin|' \
62
		${WRKSRC}/${file}
63
.endfor
64
65
do-install:
66
	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} rake install
67
68
.include <bsd.port.post.mk>
(-)puppetdb/distinfo (+2 lines)
Line 0 Link Here
1
SHA256 (puppetdb-2.1.0.tar.gz) = 44faed745e4e75380005a65a088e5eb13d58e2ac71f41526aa7d4ab0fd1e5974
2
SIZE (puppetdb-2.1.0.tar.gz) = 21752730
(-)puppetdb/files/patch-Rakefile (+29 lines)
Line 0 Link Here
1
--- Rakefile.orig	2014-08-17 17:15:01.000000000 -0700
2
+++ Rakefile	2014-08-17 17:15:40.000000000 -0700
3
@@ -80,7 +80,7 @@
4
     @java_bin = "/opt/puppet/bin/java"
5
 else
6
     @install_dir = case @osfamily
7
-      when /openbsd/
8
+      when /openbsd/, /freebsd/
9
         "/usr/local/share/puppetdb"
10
       else
11
         "/usr/share/puppetdb"
12
@@ -89,7 +89,7 @@
13
     @config_dir = "/etc/puppetdb/conf.d"
14
     @lib_dir = "/var/lib/puppetdb"
15
     @libexec_dir = case @osfamily
16
-      when /openbsd/
17
+      when /openbsd/, /freebsd/
18
         "/usr/local/libexec/puppetdb"
19
       when /redhat/, /suse/, /darwin/, /bsd/
20
         "/usr/libexec/puppetdb"
21
@@ -129,6 +129,8 @@
22
     @plibdir = @pe ? PE_SITELIBDIR : (%x(ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']").chomp)
23
   when /openbsd/
24
     @plibdir = @pe ? PE_SITELIBDIR : '/usr/local/lib/ruby/site_ruby/1.9.1'
25
+  when /freebsd/
26
+    @plibdir = @pe ? PE_SITELIBDIR : Facter.value(:rubysitedir).chomp
27
   when /archlinux/
28
     @plibdir = @pe ? PE_SITELIBDIR : (%x(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]').chomp)
29
 end
(-)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
(-)puppetdb/files/patch-tasks__install.rake (+71 lines)
Line 0 Link Here
1
--- tasks/install.rake.orig	2014-08-17 18:02:57.000000000 -0700
2
+++ tasks/install.rake	2014-08-19 21:47:26.000000000 -0700
3
@@ -14,9 +14,10 @@
4
   @osfamily = Facter.value(:osfamily).downcase
5
   mkdir_p "#{DESTDIR}/#{@install_dir}"
6
   mkdir_p "#{DESTDIR}/#{@config_dir}"
7
-  mkdir_p "#{DESTDIR}/#{@config_dir}/.."
8
   mkdir_p "#{DESTDIR}/#{@log_dir}"
9
-  mkdir_p "#{DESTDIR}/etc/init.d/"
10
+  unless @osfamily =~ /freebsd/
11
+    mkdir_p "#{DESTDIR}/etc/init.d/"
12
+  end
13
   mkdir_p "#{DESTDIR}/#{@lib_dir}"
14
   mkdir_p "#{DESTDIR}/#{@libexec_dir}"
15
   mkdir_p "#{DESTDIR}/#{@sbin_dir}"
16
@@ -25,13 +26,10 @@
17
   ln_sf @log_dir, "#{DESTDIR}/#{@install_dir}/log"
18
 
19
   unless @pe
20
-    mkdir_p "#{DESTDIR}/var/lib/puppetdb/state"
21
-    mkdir_p "#{DESTDIR}/var/lib/puppetdb/db"
22
-    mkdir_p "#{DESTDIR}/var/lib/puppetdb/mq"
23
-    ln_sf "#{@lib_dir}/state", "#{DESTDIR}#{@link}/state"
24
-    ln_sf "#{@lib_dir}/db", "#{DESTDIR}#{@link}/db"
25
-    ln_sf "#{@lib_dir}/mq", "#{DESTDIR}#{@link}/mq"
26
-    mkdir_p "#{DESTDIR}/etc/puppetdb"
27
+    mkdir_p "#{DESTDIR}#{@lib_dir}/state"
28
+    mkdir_p "#{DESTDIR}#{@lib_dir}/db"
29
+    mkdir_p "#{DESTDIR}#{@lib_dir}/mq"
30
+    mkdir_p "#{DESTDIR}#{@etc_dir}"
31
   else
32
     mkdir_p "#{DESTDIR}#{@lib_dir}/state"
33
     mkdir_p "#{DESTDIR}#{@lib_dir}/db"
34
@@ -40,10 +38,10 @@
35
   end
36
 
37
   cp_p JAR_FILE, "#{DESTDIR}/#{@install_dir}"
38
-  cp_pr "ext/files/config.ini", "#{DESTDIR}/#{@config_dir}"
39
-  cp_pr "ext/files/database.ini", "#{DESTDIR}/#{@config_dir}"
40
-  cp_pr "ext/files/jetty.ini", "#{DESTDIR}/#{@config_dir}"
41
-  cp_pr "ext/files/repl.ini", "#{DESTDIR}/#{@config_dir}"
42
+  cp_pr "ext/files/config.ini", "#{DESTDIR}/#{@config_dir}/config.ini.sample"
43
+  cp_pr "ext/files/database.ini", "#{DESTDIR}/#{@config_dir}/database.ini.sample"
44
+  cp_pr "ext/files/jetty.ini", "#{DESTDIR}/#{@config_dir}/jetty.ini.sample"
45
+  cp_pr "ext/files/repl.ini", "#{DESTDIR}/#{@config_dir}/repl.ini.sample"
46
   cp_pr "ext/files/puppetdb.logrotate", "#{DESTDIR}/etc/logrotate.d/#{@name}"
47
   cp_pr "ext/files/logback.xml", "#{DESTDIR}/#{@config_dir}/.."
48
   cp_pr "ext/files/puppetdb", "#{DESTDIR}/#{@sbin_dir}"
49
@@ -100,6 +98,11 @@
50
     cp_p "ext/files/puppetdb.openbsd.init", "#{DESTDIR}/etc/rc.d/#{@name}.rc"
51
     cp_p "ext/files/puppetdb.env", "#{DESTDIR}/#{@libexec_dir}/#{@name}.env"
52
     chmod 0755, "#{DESTDIR}/etc/rc.d/#{@name}.rc"
53
+  elsif @osfamily == "freebsd"
54
+    #mkdir_p "#{DESTDIR}/etc/rc.d/"
55
+    #cp_p "ext/files/puppetdb.openbsd.init", "#{DESTDIR}/etc/rc.d/#{@name}.rc"
56
+    #cp_p "ext/files/puppetdb.env", "#{DESTDIR}/#{@libexec_dir}/#{@name}.env"
57
+    #chmod 0755, "#{DESTDIR}/etc/rc.d/#{@name}.rc"
58
   elsif @osfamily == "archlinux"
59
     #systemd!
60
     mkdir_p "#{DESTDIR}/etc/sysconfig"
61
@@ -113,10 +116,5 @@
62
   end
63
   chmod 0750, "#{DESTDIR}/#{@config_dir}"
64
   chmod 0640, "#{DESTDIR}/#{@config_dir}/../logback.xml"
65
-  chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-ssl-setup"
66
-  chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-foreground"
67
-  chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-import"
68
-  chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-export"
69
-  chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb-anonymize"
70
   chmod 0700, "#{DESTDIR}/#{@sbin_dir}/puppetdb"
71
 end
(-)puppetdb/files/puppetdb.in (+85 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} -cp %%DATADIR%%/puppetdb.jar clojure.main -m com.puppetlabs.puppetdb.core ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
59
60
61
required_files="${java_cmd}"
62
63
start_precmd="puppetdb_prestart"
64
65
puppetdb_prestart() {
66
  if [ ! -f "${puppetdb_log_file}" ]; then
67
    touch "${puppetdb_log_file}"
68
    chown "${puppetdb_user}:${puppetdb_group}" "${puppetdb_log_file}"
69
    chmod 640 "${puppetdb_log_file}"
70
  fi
71
  if [ ! -d "/var/run/puppetdb" ]; then
72
    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/run/puppetdb"
73
  fi
74
75
  chown -R "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/conf.d"
76
  chmod 0750 "%%PREFIX%%/etc/puppetdb/conf.d"
77
78
  chown "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/logback.xml"
79
  chmod 0640 "%%PREFIX%%/etc/puppetdb/logback.xml"
80
81
  chown -R "${puppetdb_user}:${puppetdb_group}" "/var/puppetdb"
82
  chmod 0750 "/var/puppetdb"
83
}
84
85
run_rc_command "$1"
(-)puppetdb/pkg-descr (+2 lines)
Line 0 Link Here
1
The PuppetDB storeconfigs backend
2
WWW: https://docs.puppetlabs.com/puppetdb/latest/
(-)puppetdb/pkg-message (+6 lines)
Line 0 Link Here
1
If this is a new installation, please run the follow to setup your SSL/puppetdb
2
server:
3
4
/usr/local/sbin/puppetdb ssl-setup
5
6
Please also remember to add puppetdb_enable="YES" into your rc.conf.
(-)puppetdb/pkg-plist (+66 lines)
Line 0 Link Here
1
/etc/logrotate.d/puppetdb
2
%%ETCDIR%%/logback.xml
3
libexec/puppetdb/puppetdb-anonymize
4
libexec/puppetdb/puppetdb-export
5
libexec/puppetdb/puppetdb-foreground
6
libexec/puppetdb/puppetdb-import
7
libexec/puppetdb/puppetdb-ssl-setup
8
9
sbin/puppetdb-anonymize
10
sbin/puppetdb-export
11
sbin/puppetdb-foreground
12
sbin/puppetdb-import
13
sbin/puppetdb-ssl-setup
14
15
sbin/puppetdb
16
%%DATADIR%%/puppetdb.jar
17
%%DATADIR%%/log
18
/var/%%PUPPETDB_USER%%db/config
19
20
@group %%PUPPETDB_GROUP%%
21
@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
22
etc/puppetdb/conf.d/config.ini.sample
23
@exec if [ ! -f %D/etc/puppetdb/conf.d/config.ini ] ; then cp -p %D/%F %B/config.ini; fi
24
@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
25
etc/puppetdb/conf.d/database.ini.sample
26
@exec if [ ! -f %D/etc/puppetdb/conf.d/database.ini ] ; then cp -p %D/%F %B/database.ini; fi
27
@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
28
etc/puppetdb/conf.d/jetty.ini.sample
29
@exec if [ ! -f %D/etc/puppetdb/conf.d/jetty.ini ] ; then cp -p %D/%F %B/jetty.ini; fi
30
@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
31
etc/puppetdb/conf.d/repl.ini.sample
32
@exec if [ ! -f %D/etc/puppetdb/conf.d/repl.ini ] ; then cp -p %D/%F %B/repl.ini; fi
33
34
@owner %%PUPPETDB_USER%%
35
@exec mkdir -p /var/log/puppetdb
36
@dirrmtry /var/log/puppetdb
37
38
@mode 0750
39
@exec mkdir -p /var/puppetdb
40
@mode
41
42
@exec mkdir -p /var/puppetdb/state
43
@dirrmtry /var/puppetdb/state
44
@exec mkdir -p /var/puppetdb/db
45
@dirrmtry /var/puppetdb/db
46
@exec mkdir -p /var/puppetdb/mq
47
@dirrmtry /var/puppetdb/mq
48
@dirrmtry /var/puppetdb
49
50
@owner
51
@group
52
53
@unexec rm -f %D/share/puppetdb/state
54
@exec ln -s /var/puppetdb/state %D/share/puppetdb/state
55
@unexec rm -f %D/share/puppetdb/mq
56
@exec ln -s /var/puppetdb/mq %D/share/puppetdb/mq
57
@unexec rm -f %D/share/puppetdb/db
58
@exec ln -s /var/puppetdb/db %D/share/puppetdb/db
59
@unexec rm -f %D/share/puppetdb/log/puppetdb
60
61
@dirrmtry etc/puppetdb/conf.d
62
@dirrmtry etc/puppetdb
63
@dirrm libexec/puppetdb
64
65
@dirrm %%DATADIR%%
66
@dirrmtry /etc/logrotate.d

Return to bug 187517