Attachment 183118 Details for Bug 219700 – svn diff patch

[patch] svn diff patch

mongodb34-rocks-runpath-fix.svn-diff.txt (text/plain), 2.79 KB, created by Šimun Mikecin on 2017-06-01 08:27:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Šimun Mikecin

Created: 2017-06-01 08:27:06 UTC

Size: 2.79 KB

patch

obsolete

>Index: mongodb34-rocks/Makefile
>===================================================================
>--- mongodb34-rocks/Makefile	(revision 442277)
>+++ mongodb34-rocks/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> PORTNAME=	mongodb
> PORTVERSION=	3.4.4
> DISTVERSIONPREFIX=	r
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	databases net
> MASTER_SITES=	https://fastdl.mongodb.org/src/:main \
> 		http://fastdl.mongodb.org/src/:main \
>Index: mongodb34-rocks/files/mongod.in
>===================================================================
>--- mongodb34-rocks/files/mongod.in	(revision 442277)
>+++ mongodb34-rocks/files/mongod.in	(working copy)
>@@ -31,12 +31,13 @@
> : ${mongod_limits="NO"}
> : ${mongod_dbpath="/var/db/mongodb"}
> : ${mongod_logpath="/var/log/mongodb"}
>+: ${mongod_runpath="/var/run/mongodb"}
> : ${mongod_flags="--logpath ${mongod_logpath}/mongod.log --logappend"}
> : ${mongod_user="mongodb"}
> : ${mongod_group="mongodb"}
> : ${mongod_config="%%PREFIX%%/etc/mongod.conf"}
> 
>-pidfile="/var/run/mongodb/mongod.pid"
>+pidfile="${mongod_runpath}/mongod.pid"
> command=%%PREFIX%%/bin/${name}
> command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
> start_precmd="${name}_prestart"
>@@ -43,9 +44,9 @@
> 
> mongod_create_dbpath()
> {
>-        mkdir ${mongod_dbpath} >/dev/null 2>/dev/null
>-        mkdir ${mongod_logpath} >/dev/null 2>/dev/null
>-        [ $? -eq 0 ] && chown -R ${mongod_user}:${mongod_group} ${mongod_dbpath} ${mongod_logpath}
>+	install -d -g ${mongod_group} -o ${mongod_user} -m 755 ${mongod_dbpath}
>+	install -d -g ${mongod_group} -o ${mongod_user} -m 755 ${mongod_logpath}
>+	install -d -g ${mongod_group} -o ${mongod_user} -m 755 ${mongod_runpath}
> }
> 
> mongod_prestart()
>Index: mongodb34-rocks/files/mongos.in
>===================================================================
>--- mongodb34-rocks/files/mongos.in	(revision 442277)
>+++ mongodb34-rocks/files/mongos.in	(working copy)
>@@ -28,12 +28,13 @@
> : ${mongos_enable="NO"}
> : ${mongos_limits="NO"}
> : ${mongos_logpath="/var/log/mongodb"}
>+: ${mongos_runpath="/var/run/mongodb"}
> : ${mongos_flags="--logpath ${mongos_logpath}/mongos.log --logappend"}
> : ${mongos_user="mongodb"}
> : ${mongos_group="mongodb"}
> : ${mongos_config="%%PREFIX%%/etc/mongos.conf"}
> 
>-pidfile="/var/run/mongodb/mongos.pid"
>+pidfile="${mongos_runpath}/mongos.pid"
> command=%%PREFIX%%/bin/${name}
> command_args="--config $mongos_config --fork >/dev/null 2>/dev/null"
> start_precmd="${name}_prestart"
>@@ -40,8 +41,8 @@
> 
> mongos_create_dbpath()
> {
>-        mkdir ${mongos_logpath} >/dev/null 2>/dev/null
>-        [ $? -eq 0 ] && chown -R ${mongos_user}:${mongos_group} ${mongos_logpath}
>+        install -d -g ${mongos_group} -o ${mongos_user} -m 755 ${mongos_logpath}
>+        install -d -g ${mongos_group} -o ${mongos_user} -m 755 ${mongos_runpath}
> }
> 
> mongos_prestart()

Flags:

numisemis: maintainer-approval+

Actions: View | Diff

Attachments on bug 219700: 183118