diff options
| author |   Peter Volkov <pva@gentoo.org> | 2013-05-13 10:32:29 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2013-05-13 10:32:29 +0000 |
| commit | e051765950ba9964a9bf2867c5a0e4be4492078e (patch) | |
| tree | 4bfe3c8e66ea804e4e63cfbbd4d088ed0cfecff3 /www-apps/redmine | |
| parent | Initial commit. (diff) | |
| download | gentoo-2-e051765950ba9964a9bf2867c5a0e4be4492078e.tar.gz gentoo-2-e051765950ba9964a9bf2867c5a0e4be4492078e.tar.bz2 gentoo-2-e051765950ba9964a9bf2867c5a0e4be4492078e.zip | |
Use /run instead of /var/run, suggested by Coacher in bug #444936
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key F1989B07)
Diffstat (limited to 'www-apps/redmine')
| -rw-r--r-- | www-apps/redmine/ChangeLog | 6 | ||||
| -rw-r--r-- | www-apps/redmine/files/redmine-2.initd | 11 | ||||
| -rw-r--r-- | www-apps/redmine/files/redmine.initd | 10 |
3 files changed, 18 insertions, 9 deletions
diff --git a/www-apps/redmine/ChangeLog b/www-apps/redmine/ChangeLog index 6489772c4f09..d555587ef260 100644 --- a/www-apps/redmine/ChangeLog +++ b/www-apps/redmine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-apps/redmine # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.34 2013/05/11 21:29:22 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/ChangeLog,v 1.35 2013/05/13 10:32:28 pva Exp $ + + 13 May 2013; Peter Volkov <pva@gentoo.org> files/redmine-2.initd, + files/redmine.initd: + Use /run instead of /var/run, suggested by Coacher in bug #444936 *redmine-2.2.4 (11 May 2013) *redmine-1.4.7 (11 May 2013) diff --git a/www-apps/redmine/files/redmine-2.initd b/www-apps/redmine/files/redmine-2.initd index 1c73258ed3e6..f4fcdb20512a 100644 --- a/www-apps/redmine/files/redmine-2.initd +++ b/www-apps/redmine/files/redmine-2.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine-2.initd,v 1.2 2013/05/11 21:29:22 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine-2.initd,v 1.3 2013/05/13 10:32:29 pva Exp $ RAILS_ENV=${RAILS_ENV:-production} REDMINE_DIR=${REDMINE_DIR:-/var/lib/redmine} @@ -9,7 +9,7 @@ REDMINE_ADDRESS=${REDMINE_ADDRESS:-localhost} REDMINE_PORT=${REDMINE_PORT:-3000} REDMINE_USER=${REDMINE_USER:-redmine} REDMINE_GROUP=${REDMINE_GROUP:-redmine} -REDMINE_PIDFILE="/var/run/redmine/server.pid" +REDMINE_PIDFILE="/run/redmine/server.pid" depend() { use apache2 git-daemon mysql net postgresql svnserve @@ -23,8 +23,9 @@ start_pre() { eerror return 1 fi - if [ ! -d /var/run/redmine ]; then - checkpath -q -d -m 0755 -o redmine:redmine /var/run/redmine + + if [ ! -d /run/redmine ]; then + checkpath -q -d -m 0755 -o redmine:redmine /run/redmine fi } @@ -36,7 +37,7 @@ start() { --exec /usr/bin/ruby "${REDMINE_DIR}"/script/rails server -- \ --daemon --environment=${RAILS_ENV} \ --binding=${REDMINE_ADDRESS} --port=${REDMINE_PORT} \ - --pid /var/run/redmine/server.pid \ + --pid "${REDMINE_PIDFILE}" \ ${REDMINE_OPTS} eend $? } diff --git a/www-apps/redmine/files/redmine.initd b/www-apps/redmine/files/redmine.initd index 1368da6ade50..49d59301492d 100644 --- a/www-apps/redmine/files/redmine.initd +++ b/www-apps/redmine/files/redmine.initd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine.initd,v 1.4 2012/03/12 16:41:05 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine.initd,v 1.5 2013/05/13 10:32:29 pva Exp $ RAILS_ENV=${RAILS_ENV:-production} REDMINE_DIR=${REDMINE_DIR:-/var/lib/redmine} @@ -9,7 +9,7 @@ REDMINE_ADDRESS=${REDMINE_ADDRESS:-localhost} REDMINE_PORT=${REDMINE_PORT:-3000} REDMINE_USER=${REDMINE_USER:-redmine} REDMINE_GROUP=${REDMINE_GROUP:-redmine} -REDMINE_PIDFILE="${REDMINE_DIR}/tmp/pids/server.pid" +REDMINE_PIDFILE="/run/redmine/server.pid" depend() { use apache2 git-daemon mysql net postgresql svnserve @@ -23,6 +23,10 @@ start_pre() { eerror return 1 fi + + if [ ! -d /run/redmine ]; then + checkpath -q -d -m 0755 -o redmine:redmine /run/redmine + fi } start() { |