From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DC9FB138224 for ; Tue, 1 Jan 2013 15:54:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C2C4E05CB; Tue, 1 Jan 2013 15:54:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D093E05CB for ; Tue, 1 Jan 2013 15:54:38 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C8BB33D3DE for ; Tue, 1 Jan 2013 15:54:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 102C6E5439 for ; Tue, 1 Jan 2013 15:54:36 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1357055701.5824ec48d42cbd332aee573b37ca8b49ea551e72.prometheanfire@gentoo> Subject: [gentoo-commits] dev/prometheanfire:master commit in: sys-cluster/swift/, sys-cluster/swift/files/ X-VCS-Repository: dev/prometheanfire X-VCS-Files: sys-cluster/swift/Manifest sys-cluster/swift/files/swift-account.initd sys-cluster/swift/files/swift-container.initd sys-cluster/swift/files/swift-object.initd sys-cluster/swift/files/swift-proxy-server.initd sys-cluster/swift/files/swift-proxy.initd sys-cluster/swift/files/swift-storage-server.confd sys-cluster/swift/files/swift-storage-server.initd sys-cluster/swift/swift-1.7.4.ebuild X-VCS-Directories: sys-cluster/swift/ sys-cluster/swift/files/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 5824ec48d42cbd332aee573b37ca8b49ea551e72 X-VCS-Branch: master Date: Tue, 1 Jan 2013 15:54:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 167ef2dd-81e7-418e-bcd4-00e7cc4345f9 X-Archives-Hash: 2d540d34da505c77bcc57bd2d80b82b2 commit: 5824ec48d42cbd332aee573b37ca8b49ea551e72 Author: Matthew Thode mthode org> AuthorDate: Tue Jan 1 15:55:01 2013 +0000 Commit: Matt Thode gentoo org> CommitDate: Tue Jan 1 15:55:01 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=5824ec48 should work :D --- sys-cluster/swift/Manifest | 8 + sys-cluster/swift/files/swift-account.initd | 36 + sys-cluster/swift/files/swift-container.initd | 36 + sys-cluster/swift/files/swift-object.initd | 36 + sys-cluster/swift/files/swift-proxy-server.initd | 838 -------------------- sys-cluster/swift/files/swift-proxy.initd | 57 ++ sys-cluster/swift/files/swift-storage-server.confd | 775 ------------------ sys-cluster/swift/files/swift-storage-server.initd | 60 -- sys-cluster/swift/swift-1.7.4.ebuild | 60 +-- 9 files changed, 181 insertions(+), 1725 deletions(-) diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest new file mode 100644 index 0000000..ddb42e2 --- /dev/null +++ b/sys-cluster/swift/Manifest @@ -0,0 +1,8 @@ +AUX swift-account.initd 881 SHA256 7278241b34cea3d3544bcf3d64f406e5cc37250093f51cec160c7ec265f122a4 SHA512 f9bc66fd410cbc306075377ca89cf50c8a33630b2cf4020294f33fe83f3531eee10c08997f910c4ec6148925e6f36aab0cd56491770cdfd6ffcaaf4e8eeadffc WHIRLPOOL d51b2de925235f0973163728d1c0bec15bd201c5786c5a38ef7d655c24aef56b63a0c912e77a47e6b9afd194c9dc325695f78c45a82196558ef583a8a7800a72 +AUX swift-container.initd 891 SHA256 82d61cfbe600f782e0f408366be5283e52ecb503dfa24ef2b56080bb3fae997c SHA512 82bc22570a57620b7497368de5a4b79d5ee87599e39ab9cd6ab5a28c606646ca2d4eb70f469acfcac3d51b2f3bb58e6386f033d1aee679d13366bac98999fafc WHIRLPOOL aa1dcaf9e21acab942d463f109eaaa099f9bebb638259db75956feadad1f0f0df530661e0bc469717aa6a9524c69f40efa0103ac076a31a34df2ddb42b738e1c +AUX swift-object.initd 876 SHA256 a3ec074cd0ef70b3b641e86054519da3a4fa18a320bd91a7d6e18b9df9ef5cf0 SHA512 803165e74e1fb5326d8520444f968d2a987dca454f9b5347fd4ebe1ab5e95093641450596da2543be9485b11be350b47873c3a1887682cd025f85231cec2767a WHIRLPOOL f2fc932d4992771edb633332cc2f672c25828e25da677a0db4bd5b6c815f89fda623927a032f45c836574ee4402d632f7dc6dd41e67b2adba9882233ce106bec +AUX swift-proxy.initd 1393 SHA256 5b8cfd787dd47468fef31e261ef9529db32e9a2c540c586f9f20b829cab51a4c SHA512 f45253ff68bfb6e5149c0823c5b9692b37e9037f0e12eca32c7c1a28f8877bcdc255a0efd461e170df5bebdae427dd13f312da43525d6e946e32366371362070 WHIRLPOOL c234643758ccf75b3843cd6a65bc3679370cef072eccea7b6470440c380bbe24a687eac6381ccf9a904985e367e4b45930184d0f6a6d1bb4ee6f830f379d5da2 +DIST swift-1.7.4.tar.gz 461286 SHA256 5c927cfd6aeba38689c1b8e0d1b6fd697999ad56012f6a4aff011d6018d55cd2 SHA512 c7527593beaede09a70e92b85823eb4661992a568377aea6254c7470dddf9ab64238361c84298b1c046c05abb781507bd7634fdff05d30c1e35e465d7f86cf78 WHIRLPOOL f78325e57a02a34e3f4a052778604115df71f2225861b6b4e9516c25d9b83d7bec7251de34da98f34618b7b586eaac747948192822f2998f3ddeb23fc12f999a +EBUILD swift-1.7.4.ebuild 3147 SHA256 f113384a751927e24f1922fbfa58de8cd37a0c5842c8a7cab3fe799bcc0171ec SHA512 46ba6644a2b1bee7d551d9ed59db31f5bade28753e4a4bfaa6a0b746f50d21c4f1adc53a67ed90c54c0f1a5c1a44fefac6ffa76004f5a5ed6a20ce26094950d6 WHIRLPOOL 06148957d2d8eddd30ffb56aee611c34327e005d6c6e941c404eb2ca70f2669b480a943d0f1dc13e12c393686fa089de31142a0a5c33d676d8689202cfa84f69 +MISC ChangeLog 380 SHA256 b66d44e1c09f502aa77ecb43804d948b25876cda652c23a303fa9ba82b6575dd SHA512 c8ee612811758a02596ae00b0ad739fa3e828880a610bb60d49d8ba18f1810578f4d0cb738d43d2480ecb7a8e34bf2e642042f06d1cb9f2d1501868a2d68c52a WHIRLPOOL 30a86afe00b7365f693a22e4a1078c41f289d8d07975b157b2a1556e5bed075b08adb2d10bfb7bb38c266c0e24680bcbd978935afff686142a0c3c0c4c621625 +MISC metadata.xml 386 SHA256 7ec5608fefa5f710bb2feeee1cf65c6d5d97c215e041ff996c05ab72096a048a SHA512 58521380599a366ccad1cc1da26d75e5356f55fe7d6ff2a25a5888fe34a4e18401429296e2e24100f4d33f9ff02123f14db7a3cc04833f8970c97be7451664b1 WHIRLPOOL 0e7f1c0f6b1dd7f3d3f30a652f819ddf6588f98f0b3a1239cd7ca8ae8f3e5d166b04ed652a019106d53d8faf59c3bdbb73d37a89dd3f70c009964d6fa6727da1 diff --git a/sys-cluster/swift/files/swift-account.initd b/sys-cluster/swift/files/swift-account.initd new file mode 100644 index 0000000..6002820 --- /dev/null +++ b/sys-cluster/swift/files/swift-account.initd @@ -0,0 +1,36 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +COMMAND=/usr/bin/swift-init +PIDFILE=/var/run/swift/swift-account.pid + +depend() { + need net +} + +checkconfig() { + if [ ! -r /etc/swift/swift.conf ]; then + eerror "Missing required config file: /etc/swift/swift.conf" + return 1 + fi + if [ ! -r /etc/swift/account-server.conf ]; then + eerror "Missing required config file: /etc/swift/account-server.conf" + return 1 + fi + return 0 +} + +start() { + checkconfig || return $? + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- account start + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- account stop + eend $? +} diff --git a/sys-cluster/swift/files/swift-container.initd b/sys-cluster/swift/files/swift-container.initd new file mode 100644 index 0000000..1ac9c80 --- /dev/null +++ b/sys-cluster/swift/files/swift-container.initd @@ -0,0 +1,36 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +COMMAND=/usr/bin/swift-init +PIDFILE=/var/run/swift/swift-container.pid + +depend() { + need net +} + +checkconfig() { + if [ ! -r /etc/swift/swift.conf ]; then + eerror "Missing required config file: /etc/swift/swift.conf" + return 1 + fi + if [ ! -r /etc/swift/container-server.conf ]; then + eerror "Missing required config file: /etc/swift/container-server.conf" + return 1 + fi + return 0 +} + +start() { + checkconfig || return $? + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- container start + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- container stop + eend $? +} diff --git a/sys-cluster/swift/files/swift-object.initd b/sys-cluster/swift/files/swift-object.initd new file mode 100644 index 0000000..8092981 --- /dev/null +++ b/sys-cluster/swift/files/swift-object.initd @@ -0,0 +1,36 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +COMMAND=/usr/bin/swift-init +PIDFILE=/var/run/swift/swift-object.pid + +depend() { + need net +} + +checkconfig() { + if [ ! -r /etc/swift/swift.conf ]; then + eerror "Missing required config file: /etc/swift/swift.conf" + return 1 + fi + if [ ! -r /etc/swift/object-server.conf ]; then + eerror "Missing required config file: /etc/swift/object-server.conf" + return 1 + fi + return 0 +} + +start() { + checkconfig || return $? + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- object start + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- object stop + eend $? +} diff --git a/sys-cluster/swift/files/swift-proxy-server.initd b/sys-cluster/swift/files/swift-proxy-server.initd deleted file mode 100644 index b899a09..0000000 --- a/sys-cluster/swift/files/swift-proxy-server.initd +++ /dev/null @@ -1,838 +0,0 @@ - - - - - - - - - openstack-overlay/sys-cluster/swift/files/swift-proxy-server.initd at master · hyves-org/openstack-overlay · GitHub - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
-
- - - GitHub - GitHub - - - - - - -
- Sign up for free - Sign in -
- -
-
- - - - - - - -
-
- -
-
-
- - - - - -

- public - - - / - openstack-overlay -

-
- - - - - -
- - - - - - -
- - -
- - branch: master - - -
- -
Switch branches/tags
-
-
- - -
- -
-
-
- -

- master -

-
-
-
Nothing to show
- - -
- - - -
-
-
-
- - - -
- - - - - - - -
-
- -
- - - - - - -
- - -
- - -
- openstack-overlay / sys-cluster / swift / files / swift-proxy-server.initd -
- - - - -
- - - -
- Added reload, restart and status opts to init script -
- -
-

1 contributor

- -
- -
- - -
- -
-
- -
-
-
-
- - executable file - 65 lines (49 sloc) - 1.491 kb -
- -
-
- - - - - -
- 
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-
- 		- 
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
#
# Author: Cor Cornelisse <corcornelisse@gmail.com>

depend() {
	need net
}

opts="reload"

BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
SERVERNAME=$(echo $SVCNAME | cut -c 7-)

checkconfig() {
	if [ ! -r /etc/${BASENAME}/${SERVICENAME} ]; then
		eerror "No config file found: /etc/${BASENAME}/${SERVICENAME}"
		return 1
	fi
	return 0
}


start() {
	checkconfig || return $?

	ebegin "Starting ${SVCNAME}"
	start-stop-daemon --start --pidfile "/var/run/${BASENAME}/${SERVERNAME}.pid" \
					  --exec /usr/bin/${BASENAME}-init -- ${SERVERNAME} start
	eend $? "Failed to start ${SVCNAME}"
}

stop() {
	checkconfig || return $?

	ebegin "Stopping ${SVCNAME}"
	start-stop-daemon --stop --pidfile "/var/run/${BASENAME}/${SERVERNAME}.pid" \
					  --exec /usr/bin/${BASENAME}-init -- ${SERVERNAME} stop 
	eend $? "Failed to stop ${SVCNAME}"
}

reload() {
	checkconfig || return $?

	ebegin "Reloading ${SVCNAME}"
	start-stop-daemon --exec /usr/bin/${BASENAME}-init -- ${SERVERNAME} reload
	eend $? "Failed to reload ${SVCNAME}"
}

restart() {
	checkconfig || return $?

	ebegin "Restarting ${SVCNAME}"
	start-stop-daemon --exec /usr/bin/${BASENAME}-init -- ${SERVERNAME} restart
	eend $? "Failed to restart ${SVCNAME}"
}

status() {
	start-stop-daemon --exec /usr/bin/${BASENAME}-init -- ${SERVERNAME} status
	eend $? "Failed to get status for ${SVCNAME}"
}

-
-
- -
-
-
- - - - -
-
- - - - -
-
-
-
- - -
- - - - - - - - - -
-

Markdown Cheat Sheet

- -
- -
-
-

Format Text

-

Headers

- 
-# This is an <h1> tag
-## This is an <h2> tag
-###### This is an <h6> tag
-

Text styles

- 
-*This text will be italic*
-_This will also be italic_
-**This text will be bold**
-__This will also be bold__
-
-*You **can** combine them*
-
-
-
-

Lists

-

Unordered

- 
-* Item 1
-* Item 2
-  * Item 2a
-  * Item 2b
-

Ordered

- 
-1. Item 1
-2. Item 2
-3. Item 3
-   * Item 3a
-   * Item 3b
-
-
-

Miscellaneous

-

Images

- 
-![GitHub Logo](/images/logo.png)
-Format: ![Alt Text](url)
-
-

Links

- 
-http://github.com - automatic!
-[GitHub](http://github.com)
-

Blockquotes

- 
-As Kanye West said:
-
-> We're living the future so
-> the present is our past.
-
-
-
-
- -

Code Examples in Markdown

-
-

Syntax highlighting with GFM

- 
-```javascript
-function fancyAlert(arg) {
-  if(arg) {
-    $.facebox({div:'#foo'})
-  }
-}
-```
-
-
-

Or, indent your code 4 spaces

- 
-Here is a Python code example
-without syntax highlighting:
-
-    def foo:
-      if not bar:
-        return true
-
-
-

Inline code for comments

- 
-I think you should use an
-`<addr>` element here instead.
-
-
- -
- - - -
- - Something went wrong with that request. Please try again. - -
- - - - - - - - diff --git a/sys-cluster/swift/files/swift-proxy.initd b/sys-cluster/swift/files/swift-proxy.initd new file mode 100644 index 0000000..3dea8a0 --- /dev/null +++ b/sys-cluster/swift/files/swift-proxy.initd @@ -0,0 +1,57 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +COMMAND=/usr/bin/swift-init +PIDFILE=/var/run/swift/swift-proxy.pid + +depend() { + need net +} + +opts="reload" + +checkconfig() { + if [ ! -r /etc/swift/swift.conf ]; then + eerror "Missing required config file: /etc/swift/swift.conf" + return 1 + fi + if [ ! -r /etc/swift/proxy-server.conf ]; then + eerror "Missing required config file: /etc/swift/proxy-server.conf" + return 1 + fi + return 0 +} + +start() { + checkconfig || return $? + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- proxy start + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- proxy stop + eend $? +} + +reload() { + checkconfig || return $? + ebegin "Reloading ${SVCNAME}" + start-stop-daemon --quiet -i ${COMMAND} -- proxy reload + eend $? "Failed to reload ${SVCNAME}" +} + +restart() { + checkconfig || return $? + ebegin "Restarting ${SVCNAME}" + start-stop-daemon --quiet -i --pidfile ${PIDFILE} ${COMMAND} -- proxy restart + eend $? "Failed to restart ${SVCNAME}" +} + +status() { + start-stop-daemon --quiet -i ${COMMAND} -- proxy status + eend $? "Failed to get status for ${SVCNAME}" +} diff --git a/sys-cluster/swift/files/swift-storage-server.confd b/sys-cluster/swift/files/swift-storage-server.confd deleted file mode 100644 index 625dcf5..0000000 --- a/sys-cluster/swift/files/swift-storage-server.confd +++ /dev/null @@ -1,775 +0,0 @@ - - - - - - - - - openstack-overlay/sys-cluster/swift/files/swift-storage-server.confd at master · hyves-org/openstack-overlay · GitHub - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
-
- - - GitHub - GitHub - - - - - - -
- Sign up for free - Sign in -
- -
-
- - - - - - - -
-
- -
-
-
- - - - - -

- public - - - / - openstack-overlay -

-
- - - - - -
- - - - - - -
- - -
- - branch: master - - -
- -
Switch branches/tags
-
-
- - -
- -
-
-
- -

- master -

-
-
-
Nothing to show
- - -
- - - -
-
-
-
- - - -
- - - - - - - -
-
- -
- - - - - - -
- - -
- - -
- openstack-overlay / sys-cluster / swift / files / swift-storage-server.confd -
- - - - -
- - - -
- New ebuild for swift version 1.4.5, includes init scripting, dependin… -
- -
-

0 contributors

- -
- -
- - -
- -
-
- -
-
-
-
- - file - 6 lines (4 sloc) - 0.182 kb -
- -
-
- - - - - -
- 
1
-2
-3
-4
-5
-
- 		- 
SERVERS="account container object"

ACCOUNTSERVICE="server replicator auditor"
CONTAINERSERVICE="server replicator updater auditor"
OBJECTSERVICE="server replicator updater auditor"
-
-
- -
-
-
- - - - -
-
- - - - -
-
-
-
- - -
- - - - - - - - - -
-

Markdown Cheat Sheet

- -
- -
-
-

Format Text

-

Headers

- 
-# This is an <h1> tag
-## This is an <h2> tag
-###### This is an <h6> tag
-

Text styles

- 
-*This text will be italic*
-_This will also be italic_
-**This text will be bold**
-__This will also be bold__
-
-*You **can** combine them*
-
-
-
-

Lists

-

Unordered

- 
-* Item 1
-* Item 2
-  * Item 2a
-  * Item 2b
-

Ordered

- 
-1. Item 1
-2. Item 2
-3. Item 3
-   * Item 3a
-   * Item 3b
-
-
-

Miscellaneous

-

Images

- 
-![GitHub Logo](/images/logo.png)
-Format: ![Alt Text](url)
-
-

Links

- 
-http://github.com - automatic!
-[GitHub](http://github.com)
-

Blockquotes

- 
-As Kanye West said:
-
-> We're living the future so
-> the present is our past.
-
-
-
-
- -

Code Examples in Markdown

-
-

Syntax highlighting with GFM

- 
-```javascript
-function fancyAlert(arg) {
-  if(arg) {
-    $.facebox({div:'#foo'})
-  }
-}
-```
-
-
-

Or, indent your code 4 spaces

- 
-Here is a Python code example
-without syntax highlighting:
-
-    def foo:
-      if not bar:
-        return true
-
-
-

Inline code for comments

- 
-I think you should use an
-`<addr>` element here instead.
-
-
- -
- - - -
- - Something went wrong with that request. Please try again. - -
- - - - - - - - diff --git a/sys-cluster/swift/files/swift-storage-server.initd b/sys-cluster/swift/files/swift-storage-server.initd deleted file mode 100644 index 58d1251..0000000 --- a/sys-cluster/swift/files/swift-storage-server.initd +++ /dev/null @@ -1,60 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ -# -# Author: Cor Cornelisse - -depend() { - need net -} - -BASENAME=$(echo $SVCNAME | cut -d '-' -f 1) - -checkconfig() { - if [ ! -r /etc/${BASENAME}/${BASENAME}.conf ]; then - eerror "Missing required config file: /etc/${BASENAME}/${BASENAME}.conf" - return 1 - fi - for server in ${SERVERS}; do - if [ ! -r /etc/${BASENAME}/${server}-server.conf ]; then - eerror "Missing required config file: /etc/${BASENAME}/${SERVER}-server.conf" - return 1 - fi - done - return 0 -} - -start() { - checkconfig || return $? - - einfo "Starting all ${BASENAME} services:" - - for server in ${SERVERS}; do - for service in $(eval "echo \$${server^^}SERVICE"); do - ebegin "Starting $server-$service" - start-stop-daemon --start --pidfile \ - "/var/run/${BASENAME}/$server-$service.pid" \ - --exec /usr/bin/${BASENAME}-init \ - -- $server-$service start - eend $? "Failed to start $server-$service" - done - done -} - -stop() { - checkconfig || return $? - - einfo "Stopping all ${BASENAME} services:" - - for server in ${SERVERS}; do - for service in $(eval "echo \$${server^^}SERVICE"); do - ebegin "Stopping $server-$service" - start-stop-daemon --stop --pidfile \ - "/var/run/${BASENAME}/$server-$service.pid" \ - --exec /usr/bin/${BASENAME}-init \ - -- $server-$service stop - eend $? "Failed to stop $server-$service" - done - done -} diff --git a/sys-cluster/swift/swift-1.7.4.ebuild b/sys-cluster/swift/swift-1.7.4.ebuild index 73a6131..78c98b0 100644 --- a/sys-cluster/swift/swift-1.7.4.ebuild +++ b/sys-cluster/swift/swift-1.7.4.ebuild @@ -2,13 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 +RESTRICT="test" +PYTHON_COMPAT=( python2_5 python2_6 python2_7 ) -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit distutils eutils linux-info +inherit distutils-r1 eutils linux-info DESCRIPTION="Swift is a highly available, distributed, eventually consistent object/blob store" @@ -46,14 +44,12 @@ CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR ~ZFS" pkg_setup() { - python_pkg_setup enewuser swift enewgroup swift } -src_install() { - distutils_src_install - +python_install() { + distutils-r1_python_install keepdir /etc/swift insinto /etc/swift @@ -67,11 +63,10 @@ src_install() { if use proxy; then newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy" - newins "etc/proxy-server.conf-sample" "proxy-server.conf" fi if use account; then - newinitd "${FILESDIR}/swift-container.initd" "swift-account" + newinitd "${FILESDIR}/swift-account.initd" "swift-account" newins "etc/account-server.conf-sample" "account-server.conf" fi if use container; then @@ -81,7 +76,7 @@ src_install() { if use object; then newinitd "${FILESDIR}/swift-object.initd" "swift-obect" newins "etc/object-server.conf-sample" "object-server.conf" - newins "object-expirer.conf-sample" "object-expirer.conf" + newins "etc/object-expirer.conf-sample" "object-expirer.conf" fi fowners swift:swift "/etc/swift" || die "fowners failed" @@ -93,45 +88,6 @@ pkg_postinst() { elog "in /etc/swift/cert.key. These can be created with the following:" elog " * cd /etc/swift" elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key" - - if use proxy; then - elog "" - elog "The storage rings must be created with the following three" - elog "commands:" - elog " * cd /etc/swift" - elog " * swift-ring-builder account.builder create SIZE REPLICAS HOURS" - elog " * swift-ring-builder container.builder create SIZE REPLICAS HOURS" - elog " * swift-ring-builder object.builder create SIZE REPLICAS HOURS" - elog "" - elog "The ring building commands take three arguments: SIZE, REPLICAS," - elog "HOURS. Where SIZE is used to determine the total storage you" - elog "expect your swift cluster to use (e.g. 2^SIZE); REPLICAS is the" - elog "number of replicas to keep in the cluster of any piece of data;" - elog "and HOURS is the number of hours to restrict moving a partition" - elog "more than once." - elog "" - elog "Add zones to the rings with the following commands:" - elog " * swift-ring-builder account.builder add zZONE-IP:6002/DEV WEIGHT" - elog " * swift-ring-builder container.builder add zZONE-IP:6001/DEV WEIGHT" - elog " * swift-ring-builder object.builder add zZONE-IP:6000/DEV WEIGHT" - elog "" - elog "The zone parameters (ZONE, IP, DEV, and WEIGHT) dictate how the" - elog "zone is utilized in the cluster. ZONE is a unique number for the" - elog "zone being created. Every grouping of three commands run must" - elog "increment ZONE. IP is the IP of this proxy node. DEV is the" - elog "device to use for storage (e.g. sdb1, sda4, etc). WEIGHT is the" - elog "preference to utilize this device over others. Higher numbers" - elog "are higher preference and should be reserved for bigger or faster" - elog "disks." - elog "" - elog "Once this has all been done, the rings must be rebalanced:" - elog " * swift-ring-builder account.builder rebalance" - elog " * swift-ring-builder container.builder rebalance" - elog " * swift-ring-builder object.builder rebalance" - elog "" - elog "Copy the account.ring.gz, container.ring.gz, and object.ring.gz" - elog "files to all the proxy and swift nodes" - fi } #src_install()