svn commit: r415311 - in head/databases: mongodb/files mongodb32/files

[Kurt Jaeger]

Author: pi
Date: Mon May 16 06:44:13 2016
New Revision: 415311
URL: https://svnweb.freebsd.org/changeset/ports/415311

Log:
  databases/mongodb{32}: allows to change the config location from rc.conf
  
  PR:		198212
  Submitted by:	Daniel Ylitalo
  Approved by:	ale (maintainer timeout)

Modified:
  head/databases/mongodb/files/mongod.in
  head/databases/mongodb32/files/mongod.in

Modified: head/databases/mongodb/files/mongod.in
==============================================================================
--- head/databases/mongodb/files/mongod.in	Mon May 16 06:34:32 2016	(r415310)
+++ head/databases/mongodb/files/mongod.in	Mon May 16 06:44:13 2016	(r415311)
@@ -16,6 +16,8 @@
 #                        Base database directory.
 # mongod_flags (str):    Custom additional arguments to be passed to mongod.
 #                        Default to "--logpath ${mongod_dbpath}/mongod.log --logappend".
+# mongod_config (str):	 Default to "%%PREFIX%%/etc/mongodb.conf"
+#                        Path to config file
 #
 
 . /etc/rc.subr
@@ -31,10 +33,11 @@ load_rc_config $name
 : ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend"}
 : ${mongod_user="mongodb"}
 : ${mongod_group="mongodb"}
+: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"}
 
 pidfile="${mongod_dbpath}/mongod.lock"
 command=%%PREFIX%%/bin/${name}
-command_args="--config %%PREFIX%%/etc/mongodb.conf --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
+command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
 start_precmd="${name}_prestart"
 
 mongod_create_dbpath()

Modified: head/databases/mongodb32/files/mongod.in
==============================================================================
--- head/databases/mongodb32/files/mongod.in	Mon May 16 06:34:32 2016	(r415310)
+++ head/databases/mongodb32/files/mongod.in	Mon May 16 06:44:13 2016	(r415311)
@@ -16,6 +16,8 @@
 #                        Base database directory.
 # mongod_flags (str):    Custom additional arguments to be passed to mongod.
 #                        Default to "--logpath ${mongod_dbpath}/mongod.log --logappend".
+# mongod_config (str):	 Default to "%%PREFIX%%/etc/mongodb.conf"
+#                        Path to config file
 #
 
 . /etc/rc.subr
@@ -31,10 +33,11 @@ load_rc_config $name
 : ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend"}
 : ${mongod_user="mongodb"}
 : ${mongod_group="mongodb"}
+: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"}
 
 pidfile="${mongod_dbpath}/mongod.lock"
 command=%%PREFIX%%/bin/${name}
-command_args="--config %%PREFIX%%/etc/mongodb.conf --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
+command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
 start_precmd="${name}_prestart"
 
 mongod_create_dbpath()