diff --git a/bin/st.py b/bin/st similarity index 100% rename from bin/st.py rename to bin/st diff --git a/bin/swift-account-audit.py b/bin/swift-account-audit similarity index 100% rename from bin/swift-account-audit.py rename to bin/swift-account-audit diff --git a/bin/swift-account-auditor.py b/bin/swift-account-auditor similarity index 100% rename from bin/swift-account-auditor.py rename to bin/swift-account-auditor diff --git a/bin/swift-account-reaper.py b/bin/swift-account-reaper similarity index 100% rename from bin/swift-account-reaper.py rename to bin/swift-account-reaper diff --git a/bin/swift-account-replicator.py b/bin/swift-account-replicator similarity index 100% rename from bin/swift-account-replicator.py rename to bin/swift-account-replicator diff --git a/bin/swift-account-server.py b/bin/swift-account-server similarity index 100% rename from bin/swift-account-server.py rename to bin/swift-account-server diff --git a/bin/swift-auth-create-account.py b/bin/swift-auth-create-account similarity index 100% rename from bin/swift-auth-create-account.py rename to bin/swift-auth-create-account diff --git a/bin/swift-auth-recreate-accounts.py b/bin/swift-auth-recreate-accounts similarity index 100% rename from bin/swift-auth-recreate-accounts.py rename to bin/swift-auth-recreate-accounts diff --git a/bin/swift-auth-server.py b/bin/swift-auth-server similarity index 100% rename from bin/swift-auth-server.py rename to bin/swift-auth-server diff --git a/bin/swift-container-auditor.py b/bin/swift-container-auditor similarity index 100% rename from bin/swift-container-auditor.py rename to bin/swift-container-auditor diff --git a/bin/swift-container-replicator.py b/bin/swift-container-replicator similarity index 100% rename from bin/swift-container-replicator.py rename to bin/swift-container-replicator diff --git a/bin/swift-container-server.py b/bin/swift-container-server similarity index 100% rename from bin/swift-container-server.py rename to bin/swift-container-server diff --git a/bin/swift-container-updater.py b/bin/swift-container-updater similarity index 100% rename from bin/swift-container-updater.py rename to bin/swift-container-updater diff --git a/bin/swift-drive-audit.py b/bin/swift-drive-audit similarity index 100% rename from bin/swift-drive-audit.py rename to bin/swift-drive-audit diff --git a/bin/swift-get-nodes.py b/bin/swift-get-nodes similarity index 100% rename from bin/swift-get-nodes.py rename to bin/swift-get-nodes diff --git a/bin/swift-init.py b/bin/swift-init similarity index 100% rename from bin/swift-init.py rename to bin/swift-init diff --git a/bin/swift-object-auditor.py b/bin/swift-object-auditor similarity index 100% rename from bin/swift-object-auditor.py rename to bin/swift-object-auditor diff --git a/bin/swift-object-info.py b/bin/swift-object-info similarity index 100% rename from bin/swift-object-info.py rename to bin/swift-object-info diff --git a/bin/swift-object-replicator.py b/bin/swift-object-replicator similarity index 100% rename from bin/swift-object-replicator.py rename to bin/swift-object-replicator diff --git a/bin/swift-object-server.py b/bin/swift-object-server similarity index 100% rename from bin/swift-object-server.py rename to bin/swift-object-server diff --git a/bin/swift-object-updater.py b/bin/swift-object-updater similarity index 100% rename from bin/swift-object-updater.py rename to bin/swift-object-updater diff --git a/bin/swift-proxy-server.py b/bin/swift-proxy-server similarity index 100% rename from bin/swift-proxy-server.py rename to bin/swift-proxy-server diff --git a/bin/swift-ring-builder.py b/bin/swift-ring-builder similarity index 100% rename from bin/swift-ring-builder.py rename to bin/swift-ring-builder diff --git a/bin/swift-stats-populate.py b/bin/swift-stats-populate similarity index 100% rename from bin/swift-stats-populate.py rename to bin/swift-stats-populate diff --git a/bin/swift-stats-report.py b/bin/swift-stats-report similarity index 100% rename from bin/swift-stats-report.py rename to bin/swift-stats-report diff --git a/debian/changelog b/debian/changelog index eb9c5cf152..bc8b5b4479 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ swift (1.0.0-1) unstable; urgency=low + [ Michael Barton ] * Initial release - -- Michael Barton Wed, 07 Jul 2010 19:37:44 +0000 + [ Monty Taylor ] + * Added docs to doc system. + + -- Monty Taylor Wed, 14 Jul 2010 10:41:11 -0500 diff --git a/debian/control b/debian/control index 25b1dab0d4..70ca96b1ff 100644 --- a/debian/control +++ b/debian/control @@ -70,3 +70,14 @@ Description: The swift auth server. The swift auth server. . Homepage: https://launchpad.net/swift + +Package: swift-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Description: The swift documentation. + Sphinx documentation for Swift. + . + Homepage: https://launchpad.net/swift + + diff --git a/debian/rules b/debian/rules index eeca56ba7d..aee0db5acb 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ PYTHON = "/usr/bin/python" build: dh build + python setup.py build_sphinx clean: dh clean @@ -16,88 +17,6 @@ clean: install: build dh install - mkdir -p $(CURDIR)/debian/swift/etc/swift - mkdir -p $(CURDIR)/debian/swift/usr/bin - - # Copy files into binary package directories - install -m 755 $(CURDIR)/bin/swift-init.py \ - $(CURDIR)/debian/swift/usr/bin/swift-init - install -m 755 $(CURDIR)/bin/swift-ring-builder.py \ - $(CURDIR)/debian/swift/usr/bin/swift-ring-builder - install -m 755 $(CURDIR)/bin/swift-get-nodes.py \ - $(CURDIR)/debian/swift/usr/bin/swift-get-nodes - install -m 755 $(CURDIR)/bin/swift-stats-populate.py \ - $(CURDIR)/debian/swift/usr/bin/swift-stats-populate - install -m 755 $(CURDIR)/bin/swift-stats-report.py \ - $(CURDIR)/debian/swift/usr/bin/swift-stats-report - install -m 644 $(CURDIR)/etc/stats.conf-sample \ - $(CURDIR)/debian/swift/etc/swift - install -m 755 $(CURDIR)/bin/swift-account-audit.py \ - $(CURDIR)/debian/swift/usr/bin/swift-account-audit - install -m 755 $(CURDIR)/bin/st.py \ - $(CURDIR)/debian/swift/usr/bin/st - - # drive-audit - install -m 644 $(CURDIR)/etc/drive-audit.conf-sample \ - $(CURDIR)/debian/swift-object/etc/swift - install -m 755 $(CURDIR)/bin/swift-drive-audit.py \ - $(CURDIR)/debian/swift-object/usr/bin/swift-drive-audit - - # swift-object - install -m 644 $(CURDIR)/etc/object-server.conf-sample \ - $(CURDIR)/debian/swift-object/etc/swift - install -m 755 $(CURDIR)/bin/swift-object-server.py \ - $(CURDIR)/debian/swift-object/usr/bin/swift-object-server - install -m 755 $(CURDIR)/bin/swift-object-replicator.py \ - $(CURDIR)/debian/swift-object/usr/bin/swift-object-replicator - install -m 644 $(CURDIR)/etc/rsyncd.conf-sample \ - $(CURDIR)/debian/swift-object/etc/swift - install -m 755 $(CURDIR)/bin/swift-object-auditor.py \ - $(CURDIR)/debian/swift-object/usr/bin/swift-object-auditor - install -m 755 $(CURDIR)/bin/swift-object-updater.py \ - $(CURDIR)/debian/swift-object/usr/bin/swift-object-updater - install -m 755 $(CURDIR)/bin/swift-object-info.py \ - $(CURDIR)/debian/swift-object/usr/bin/swift-object-info - - # swift-proxy - install -m 644 $(CURDIR)/etc/proxy-server.conf-sample \ - $(CURDIR)/debian/swift-proxy/etc/swift - install -m 755 $(CURDIR)/bin/swift-proxy-server.py \ - $(CURDIR)/debian/swift-proxy/usr/bin/swift-proxy-server - - # swift-container - install -m 644 $(CURDIR)/etc/container-server.conf-sample \ - $(CURDIR)/debian/swift-container/etc/swift - install -m 755 $(CURDIR)/bin/swift-container-server.py \ - $(CURDIR)/debian/swift-container/usr/bin/swift-container-server - install -m 755 $(CURDIR)/bin/swift-container-replicator.py \ - $(CURDIR)/debian/swift-container/usr/bin/swift-container-replicator - install -m 755 $(CURDIR)/bin/swift-container-auditor.py \ - $(CURDIR)/debian/swift-container/usr/bin/swift-container-auditor - install -m 755 $(CURDIR)/bin/swift-container-updater.py \ - $(CURDIR)/debian/swift-container/usr/bin/swift-container-updater - - # swift-account - install -m 644 $(CURDIR)/etc/account-server.conf-sample \ - $(CURDIR)/debian/swift-account/etc/swift - install -m 755 $(CURDIR)/bin/swift-account-server.py \ - $(CURDIR)/debian/swift-account/usr/bin/swift-account-server - install -m 755 $(CURDIR)/bin/swift-account-replicator.py \ - $(CURDIR)/debian/swift-account/usr/bin/swift-account-replicator - install -m 755 $(CURDIR)/bin/swift-account-auditor.py \ - $(CURDIR)/debian/swift-account/usr/bin/swift-account-auditor - install -m 755 $(CURDIR)/bin/swift-account-reaper.py \ - $(CURDIR)/debian/swift-account/usr/bin/swift-account-reaper - - # swift-auth - install -m 644 $(CURDIR)/etc/auth-server.conf-sample \ - $(CURDIR)/debian/swift-auth/etc/swift - install -m 755 $(CURDIR)/bin/swift-auth-server.py \ - $(CURDIR)/debian/swift-auth/usr/bin/swift-auth-server - install -m 755 $(CURDIR)/bin/swift-auth-create-account.py \ - $(CURDIR)/debian/swift-auth/usr/bin/swift-auth-create-account - install -m 755 $(CURDIR)/bin/swift-auth-recreate-accounts.py \ - $(CURDIR)/debian/swift-auth/usr/bin/swift-auth-recreate-accounts binary-arch: install diff --git a/debian/swift-account.dirs b/debian/swift-account.dirs deleted file mode 100644 index 2adfef1f44..0000000000 --- a/debian/swift-account.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -etc/swift diff --git a/debian/swift-account.docs b/debian/swift-account.docs new file mode 100644 index 0000000000..0a2d5db159 --- /dev/null +++ b/debian/swift-account.docs @@ -0,0 +1 @@ +etc/account-server.conf-sample diff --git a/debian/swift-account.install b/debian/swift-account.install new file mode 100644 index 0000000000..f4a30a9ab5 --- /dev/null +++ b/debian/swift-account.install @@ -0,0 +1,4 @@ +usr/bin/swift-account-server +usr/bin/swift-account-replicator +usr/bin/swift-account-auditor +usr/bin/swift-account-reaper diff --git a/debian/swift-auth.dirs b/debian/swift-auth.dirs deleted file mode 100644 index 2adfef1f44..0000000000 --- a/debian/swift-auth.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -etc/swift diff --git a/debian/swift-auth.docs b/debian/swift-auth.docs new file mode 100644 index 0000000000..bab46d5275 --- /dev/null +++ b/debian/swift-auth.docs @@ -0,0 +1 @@ +etc/auth-server.conf-sample diff --git a/debian/swift-auth.install b/debian/swift-auth.install new file mode 100644 index 0000000000..1365dfc167 --- /dev/null +++ b/debian/swift-auth.install @@ -0,0 +1,3 @@ +usr/bin/swift-auth-server +usr/bin/swift-auth-create-account +usr/bin/swift-auth-recreate-accounts diff --git a/debian/swift-container.dirs b/debian/swift-container.dirs deleted file mode 100644 index 2adfef1f44..0000000000 --- a/debian/swift-container.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -etc/swift diff --git a/debian/swift-container.docs b/debian/swift-container.docs new file mode 100644 index 0000000000..5a3110f449 --- /dev/null +++ b/debian/swift-container.docs @@ -0,0 +1 @@ +etc/container-server.conf-sample diff --git a/debian/swift-container.install b/debian/swift-container.install new file mode 100644 index 0000000000..aa5ed3d95b --- /dev/null +++ b/debian/swift-container.install @@ -0,0 +1,4 @@ +usr/bin/swift-container-server +usr/bin/swift-container-replicator +usr/bin/swift-container-auditor +usr/bin/swift-container-updater diff --git a/debian/swift-doc.doc-base b/debian/swift-doc.doc-base new file mode 100644 index 0000000000..6be55bcafa --- /dev/null +++ b/debian/swift-doc.doc-base @@ -0,0 +1,9 @@ +Document: swift-doc +Title: Swift Documentation +Author: OpenStack +Abstract: Sphinx documentation for Swift +Section: Network/File Transfer + +Format: HTML +Index: /usr/share/doc/swift-doc/html/index.html +Files: /usr/share/doc/swift-doc/html/* diff --git a/debian/swift-doc.docs b/debian/swift-doc.docs new file mode 100644 index 0000000000..8137b041cf --- /dev/null +++ b/debian/swift-doc.docs @@ -0,0 +1 @@ +doc/build/html diff --git a/debian/swift-object.dirs b/debian/swift-object.dirs deleted file mode 100644 index 2adfef1f44..0000000000 --- a/debian/swift-object.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -etc/swift diff --git a/debian/swift-object.docs b/debian/swift-object.docs new file mode 100644 index 0000000000..9b0eb04287 --- /dev/null +++ b/debian/swift-object.docs @@ -0,0 +1,2 @@ +etc/object-server.conf-sample +etc/rsyncd.conf-sample diff --git a/debian/swift-object.install b/debian/swift-object.install new file mode 100644 index 0000000000..22b22ac1d2 --- /dev/null +++ b/debian/swift-object.install @@ -0,0 +1,5 @@ +usr/bin/swift-object-server +usr/bin/swift-object-replicator +usr/bin/swift-object-auditor +usr/bin/swift-object-updater +usr/bin/swift-object-info diff --git a/debian/swift-proxy.dirs b/debian/swift-proxy.dirs deleted file mode 100644 index 2adfef1f44..0000000000 --- a/debian/swift-proxy.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -etc/swift diff --git a/debian/swift-proxy.docs b/debian/swift-proxy.docs new file mode 100644 index 0000000000..ce73a6e6ea --- /dev/null +++ b/debian/swift-proxy.docs @@ -0,0 +1 @@ +etc/proxy-server.conf-sample diff --git a/debian/swift-proxy.install b/debian/swift-proxy.install new file mode 100644 index 0000000000..8ff447032b --- /dev/null +++ b/debian/swift-proxy.install @@ -0,0 +1 @@ +usr/bin/swift-proxy-server diff --git a/debian/swift.dirs b/debian/swift.dirs deleted file mode 100644 index 9c4a05dc87..0000000000 --- a/debian/swift.dirs +++ /dev/null @@ -1 +0,0 @@ -etc/swift diff --git a/debian/swift.docs b/debian/swift.docs new file mode 100644 index 0000000000..2b58967af4 --- /dev/null +++ b/debian/swift.docs @@ -0,0 +1,2 @@ +etc/stats.conf-sample +etc/drive-audit.conf-sample diff --git a/debian/swift.install b/debian/swift.install new file mode 100644 index 0000000000..0076b29a32 --- /dev/null +++ b/debian/swift.install @@ -0,0 +1,8 @@ +usr/bin/swift-init +usr/bin/swift-ring-builder +usr/bin/swift-get-nodes +usr/bin/swift-stats-populate +usr/bin/swift-stats-report +usr/bin/swift-account-audit +usr/bin/st +usr/bin/swift-drive-audit diff --git a/setup.py b/setup.py index 7a402653ca..22952e02e0 100644 --- a/setup.py +++ b/setup.py @@ -40,18 +40,20 @@ setup( 'Programming Language :: Python :: 2.6', 'Environment :: No Input/Output (Daemon)', ], - scripts=['bin/st.py', 'bin/swift-account-auditor.py', - 'bin/swift-account-audit.py', 'bin/swift-account-reaper.py', - 'bin/swift-account-replicator.py', 'bin/swift-account-server.py', - 'bin/swift-auth-create-account.py', - 'bin/swift-auth-recreate-accounts.py', 'bin/swift-auth-server.py', - 'bin/swift-container-auditor.py', - 'bin/swift-container-replicator.py', - 'bin/swift-container-server.py', 'bin/swift-container-updater.py', - 'bin/swift-drive-audit.py', 'bin/swift-get-nodes.py', - 'bin/swift-init.py', 'bin/swift-object-auditor.py', - 'bin/swift-object-info.py', 'bin/swift-object-server.py', - 'bin/swift-object-updater.py', 'bin/swift-proxy-server.py', - 'bin/swift-ring-builder.py', 'bin/swift-stats-populate.py', - 'bin/swift-stats-report.py'] + scripts=['bin/st', 'bin/swift-account-auditor', + 'bin/swift-account-audit', 'bin/swift-account-reaper', + 'bin/swift-account-replicator', 'bin/swift-account-server', + 'bin/swift-auth-create-account', + 'bin/swift-auth-recreate-accounts', 'bin/swift-auth-server', + 'bin/swift-container-auditor', + 'bin/swift-container-replicator', + 'bin/swift-container-server', 'bin/swift-container-updater', + 'bin/swift-drive-audit', 'bin/swift-get-nodes', + 'bin/swift-init', 'bin/swift-object-auditor', + 'bin/swift-object-info', + 'bin/swift-object-replicator', + 'bin/swift-object-server', + 'bin/swift-object-updater', 'bin/swift-proxy-server', + 'bin/swift-ring-builder', 'bin/swift-stats-populate', + 'bin/swift-stats-report'] )