summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2009-11-04 02:29:23 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2009-11-04 02:29:23 +0000
commit3276a0a479adfa4479e487db455529f942c43862 (patch)
treee5679c5c7a7024ff58706d25dd29519b6c82637f /dev-perl
parentVersion bump, now with official Postgres support. (diff)
downloadgentoo-2-3276a0a479adfa4479e487db455529f942c43862.tar.gz
gentoo-2-3276a0a479adfa4479e487db455529f942c43862.tar.bz2
gentoo-2-3276a0a479adfa4479e487db455529f942c43862.zip
Cleanup and also ensure that mogilefsd only starts after postgres in case that is the backend in use.
(Portage version: 2.2_rc48/cvs/Linux x86_64)
Diffstat (limited to 'dev-perl')
-rw-r--r--dev-perl/mogilefs-server/ChangeLog10
-rw-r--r--dev-perl/mogilefs-server/files/mogilefs-server-2.16-Use-saner-name-in-process-listing.patch78
-rw-r--r--dev-perl/mogilefs-server/files/mogilefsd-init.d-2.166
-rw-r--r--dev-perl/mogilefs-server/files/mogilefsd.conf-2.1635
-rw-r--r--dev-perl/mogilefs-server/files/mogstored-conf.d-2.165
-rw-r--r--dev-perl/mogilefs-server/files/mogstored-init.d-2.1626
-rw-r--r--dev-perl/mogilefs-server/files/mogstored-init.d-2.303
-rw-r--r--dev-perl/mogilefs-server/mogilefs-server-2.20.ebuild78
8 files changed, 13 insertions, 228 deletions
diff --git a/dev-perl/mogilefs-server/ChangeLog b/dev-perl/mogilefs-server/ChangeLog
index f4274967afb4..fd672326620d 100644
--- a/dev-perl/mogilefs-server/ChangeLog
+++ b/dev-perl/mogilefs-server/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-perl/mogilefs-server
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/ChangeLog,v 1.8 2009/11/04 02:20:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/ChangeLog,v 1.9 2009/11/04 02:29:22 robbat2 Exp $
+
+ 04 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
+ files/mogilefsd-init.d-2.16, -files/mogilefsd.conf-2.16,
+ -files/mogstored-conf.d-2.16, -files/mogstored-init.d-2.16,
+ -files/mogilefs-server-2.16-Use-saner-name-in-process-listing.patch,
+ -mogilefs-server-2.20.ebuild, files/mogstored-init.d-2.30:
+ Cleanup and also ensure that mogilefsd only starts after postgres in case
+ that is the backend in use.
*mogilefs-server-2.32 (04 Nov 2009)
diff --git a/dev-perl/mogilefs-server/files/mogilefs-server-2.16-Use-saner-name-in-process-listing.patch b/dev-perl/mogilefs-server/files/mogilefs-server-2.16-Use-saner-name-in-process-listing.patch
deleted file mode 100644
index 55eba2def58f..000000000000
--- a/dev-perl/mogilefs-server/files/mogilefs-server-2.16-Use-saner-name-in-process-listing.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From d532647546d36ac5bc269d3437a01a50054370fc Mon Sep 17 00:00:00 2001
-From: Robin H. Johnson <robbat2@gentoo.org>
-Date: Sat, 12 May 2007 23:36:07 -0700
-Subject: [PATCH mogilefs] Use saner name in process listing.
-
-Normally the binary will turn up in the process list as:
-/usr/bin/perl $SCRIPTNAME
-
-By adding a single line, we can make it be simply '$SCRIPTNAME'.
-This makes writing init.d scripts signficently easier.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
----
- server/mogautomount | 3 +++
- server/mogdbsetup | 3 +++
- server/mogilefsd | 3 +++
- server/mogstored | 3 +++
- 4 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/server/mogautomount b/server/mogautomount
-index 68ca723..f3cefe6 100755
---- a/server/mogautomount
-+++ b/server/mogautomount
-@@ -3,6 +3,9 @@
- use strict;
- use Getopt::Long;
-
-+# Rename binary in process list to make init scripts saner
-+$0 = $_ = $0;
-+
- my ($help, $verbose);
- usage(0) unless GetOptions(
- 'help' => \$help,
-diff --git a/server/mogdbsetup b/server/mogdbsetup
-index 155dbf9..ecf29ad 100755
---- a/server/mogdbsetup
-+++ b/server/mogdbsetup
-@@ -4,6 +4,9 @@ use Getopt::Long;
- use lib 'lib';
- use MogileFS::Store;
-
-+# Rename binary in process list to make init scripts saner
-+$0 = $_ = $0;
-+
- my %args = (
- dbhost => "localhost",
- dbname => "mogilefs",
-diff --git a/server/mogilefsd b/server/mogilefsd
-index b8224f3..2b64c32 100755
---- a/server/mogilefsd
-+++ b/server/mogilefsd
-@@ -12,6 +12,9 @@ use warnings;
- use lib 'lib';
- use MogileFS::Server;
-
-+# Rename binary in process list to make init scripts saner
-+$0 = $_ = $0;
-+
- my $s = MogileFS::Server->server;
- $s->run;
-
-diff --git a/server/mogstored b/server/mogstored
-index ccb26c4..1c7ed4a 100755
---- a/server/mogstored
-+++ b/server/mogstored
-@@ -47,6 +47,9 @@ my $default_config = "/etc/mogilefs/mogstored.conf";
- my $server = $ENV{MOGSTORED_SERVER_TYPE} || "perlbal";
- my $serverbin = "";
-
-+# Rename binary in process list to make init scripts saner
-+$0 = $_ = $0;
-+
- my %config_opts = (
- 'iostat' => \$opt_iostat,
- 'daemonize|d' => \$opt_daemonize,
---
-1.5.1.4
-
diff --git a/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16 b/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16
index 6a36e7df6dd7..af9d29844a89 100644
--- a/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16
+++ b/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16
@@ -1,5 +1,5 @@
#!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16,v 1.1 2007/05/16 11:11:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16,v 1.2 2009/11/04 02:29:23 robbat2 Exp $
NAME="mogilefsd"
BINARY="/usr/bin/mogilefsd"
@@ -7,8 +7,8 @@ MOGILE_UID="mogile"
MOGILE_GID="mogile"
depend() {
- use net
- after mysql
+ use net mysql postgresql
+ after mysql postgresql
}
start() {
diff --git a/dev-perl/mogilefs-server/files/mogilefsd.conf-2.16 b/dev-perl/mogilefs-server/files/mogilefsd.conf-2.16
deleted file mode 100644
index 3c79f0eb186e..000000000000
--- a/dev-perl/mogilefs-server/files/mogilefsd.conf-2.16
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogilefsd.conf-2.16,v 1.1 2007/05/16 11:11:17 robbat2 Exp $
-
-# System user
-user = mogile
-# These are set inside the Gentoo conf.d/mogilefsd
-#pidfile = /var/run/mogile/mogilefsd.pid
-#daemonize = 1
-
-# Database settings
-db_dsn = DBI:mysql:mogilefs
-db_user = mogile
-# You must insert your password here!
-db_pass = __PASSWORD__
-
-# Network settings
-#conf_port = 7001
-#listen = 10.0.0.1:7001,
-
-# Storage
-#mog_root = /mnt/mogilefs
-
-# Plugins
-#plugins = ...
-
-# Tuning knobs
-#query_jobs = 20
-#delete_jobs = 1
-#replicate_jobs = 1
-#monitor_jobs = 1
-#reaper_jobs = 1
-#min_free_space = 100
-#max_disk_age = 5
-#node_timeout = 2
-#old_repl_compat = 1
-#default_mindevcount = 2
diff --git a/dev-perl/mogilefs-server/files/mogstored-conf.d-2.16 b/dev-perl/mogilefs-server/files/mogstored-conf.d-2.16
deleted file mode 100644
index 965a962ee2d6..000000000000
--- a/dev-perl/mogilefs-server/files/mogstored-conf.d-2.16
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogstored-conf.d-2.16,v 1.1 2007/05/16 11:11:17 robbat2 Exp $
-#Pidfile not yet supported by upstream
-#PIDFILE="/var/run/mogile/mogstored.pid"
-MOGSTORED_OPTS="--daemonize"
-# vim: ft=gentoo-conf-d:
diff --git a/dev-perl/mogilefs-server/files/mogstored-init.d-2.16 b/dev-perl/mogilefs-server/files/mogstored-init.d-2.16
deleted file mode 100644
index 878cb6de7538..000000000000
--- a/dev-perl/mogilefs-server/files/mogstored-init.d-2.16
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogstored-init.d-2.16,v 1.1 2007/05/16 11:11:17 robbat2 Exp $
-
-NAME="mogstored"
-BINARY="/usr/bin/mogstored"
-
-depend() {
- use net
- after mysql mogilefsd
-}
-
-start() {
- ebegin "Starting $NAME"
- start-stop-daemon --start --quiet \
- --exec ${BINARY} -- ${MOGSTORED_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping $NAME"
- start-stop-daemon --stop --quiet \
- --exec ${BINARY}
- eend $?
-}
-
-# vim: ft=gentoo-init-d:
diff --git a/dev-perl/mogilefs-server/files/mogstored-init.d-2.30 b/dev-perl/mogilefs-server/files/mogstored-init.d-2.30
index bd3775cbbbeb..59090a7f880c 100644
--- a/dev-perl/mogilefs-server/files/mogstored-init.d-2.30
+++ b/dev-perl/mogilefs-server/files/mogstored-init.d-2.30
@@ -1,12 +1,11 @@
#!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogstored-init.d-2.30,v 1.1 2009/02/23 09:59:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogstored-init.d-2.30,v 1.2 2009/11/04 02:29:23 robbat2 Exp $
NAME="mogstored"
BINARY="/usr/bin/mogstored"
depend() {
use net
- after mysql
before mogilefsd
}
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.20.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.20.ebuild
deleted file mode 100644
index 4ddc42ddad8c..000000000000
--- a/dev-perl/mogilefs-server/mogilefs-server-2.20.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.20.ebuild,v 1.2 2009/02/23 10:01:04 robbat2 Exp $
-
-MODULE_AUTHOR="DORMANDO"
-inherit perl-module
-
-DESCRIPTION="Server for the MogileFS distributed file system"
-HOMEPAGE="http://www.danga.com/mogilefs/"
-
-IUSE="mysql sqlite"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-# Upstream site recommends this,
-# but it breaks Perlbal
-# dev-perl/Perlbal-XS-HTTPHeaders
-DEPEND="dev-perl/Net-Netmask
- >=dev-perl/Danga-Socket-1.57
- >=dev-perl/Sys-Syscall-0.22
- >=dev-perl/Perlbal-1.57
- dev-perl/IO-AIO
- dev-perl/Gearman-Server
- dev-perl/Gearman-Client-Async
- dev-perl/libwww-perl
- dev-perl/Cache-Memcached
- mysql? ( dev-perl/DBD-mysql )
- sqlite? ( dev-perl/DBD-SQLite )
- dev-lang/perl"
-mydoc="CHANGES TODO"
-
-# You need a local MySQL server for this
-#SRC_TEST="do"
-
-# Merged upstream
-#PATCHES="${FILESDIR}/${PN}-2.16-Use-saner-name-in-process-listing.patch"
-
-MOGILE_USER="mogile"
-
-pkg_setup() {
- # Warning! It is important that the uid is constant over Gentoo machines
- # As mogilefs may be used with non-local block devices that move!
- enewuser ${MOGILE_USER} 460 -1 -1
-}
-src_compile() {
- export MOGILE_NO_BUILTIN_DEPS=1
- perl-module_src_compile || die "perl-module_src_compile failed"
-}
-
-src_install() {
- perl-module_src_install || die "perl-module_src_install failed"
- cd "${S}"
-
- newconfd "${FILESDIR}"/mogilefsd-conf.d-2.16 mogilefsd
- newinitd "${FILESDIR}"/mogilefsd-init.d-2.16 mogilefsd
-
- newconfd "${FILESDIR}"/mogstored-conf.d-2.16 mogstored
- newinitd "${FILESDIR}"/mogstored-init.d-2.16 mogstored
-
- diropts -m 700 -o ${MOGILE_USER}
- keepdir /var/run/mogile
- keepdir /var/mogdata
- keepdir /mnt/mogilefs
- diropts -m 755 -o root
-
- dodir /etc/mogilefs
- insinto /etc/mogilefs
- insopts -m 600 -o root -g ${MOGILE_USER}
- newins "${FILESDIR}"/mogilefsd.conf-2.16 mogilefsd.conf
- newins "${FILESDIR}"/mogstored.conf-2.16 mogstored.conf
-}
-
-pkg_postinst() {
- chmod 640 "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
- chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
-}