From b493ed2f5d26f9993338c24f8f8f8f846398ed7f Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 14 Jul 2010 10:15:25 -0500 Subject: [PATCH] Moved sample conf file install into docs rather than directly into etc. --- debian/rules | 2 -- debian/swift-account.docs | 1 + debian/swift-account.install | 1 - debian/swift-auth.docs | 1 + debian/swift-auth.install | 1 - debian/swift-container.docs | 1 + debian/swift-container.install | 1 - debian/swift-object.docs | 2 ++ debian/swift-object.install | 2 -- debian/swift-proxy.docs | 1 + debian/swift-proxy.install | 1 - debian/swift.docs | 2 ++ debian/swift.install | 2 -- setup.py | 4 +++- 14 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 debian/swift-account.docs create mode 100644 debian/swift-auth.docs create mode 100644 debian/swift-container.docs create mode 100644 debian/swift-object.docs create mode 100644 debian/swift-proxy.docs create mode 100644 debian/swift.docs diff --git a/debian/rules b/debian/rules index cad0224b92..641f1b4afd 100755 --- a/debian/rules +++ b/debian/rules @@ -15,8 +15,6 @@ clean: find . -name "*\.pyc" -delete install: build - mkdir -p $(CURDIR)/debian/swift/etc/swift - cp $(CURDIR)/etc/* $(CURDIR)/debian/swift/etc/swift dh install 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 index bd8a4f48bb..f4a30a9ab5 100644 --- a/debian/swift-account.install +++ b/debian/swift-account.install @@ -1,4 +1,3 @@ -etc/swift/account-server.conf-sample usr/bin/swift-account-server usr/bin/swift-account-replicator usr/bin/swift-account-auditor 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 index 2d82d52b96..1365dfc167 100644 --- a/debian/swift-auth.install +++ b/debian/swift-auth.install @@ -1,4 +1,3 @@ -etc/swift/auth-server.conf-sample usr/bin/swift-auth-server usr/bin/swift-auth-create-account usr/bin/swift-auth-recreate-accounts 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 index be8057fdfa..aa5ed3d95b 100644 --- a/debian/swift-container.install +++ b/debian/swift-container.install @@ -1,4 +1,3 @@ -etc/swift/container-server.conf-sample usr/bin/swift-container-server usr/bin/swift-container-replicator usr/bin/swift-container-auditor 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 index c6984cd14d..22b22ac1d2 100644 --- a/debian/swift-object.install +++ b/debian/swift-object.install @@ -1,5 +1,3 @@ -etc/swift/object-server.conf-sample -etc/swift/rsyncd.conf-sample usr/bin/swift-object-server usr/bin/swift-object-replicator usr/bin/swift-object-auditor 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 index bd40123414..8ff447032b 100644 --- a/debian/swift-proxy.install +++ b/debian/swift-proxy.install @@ -1,2 +1 @@ -etc/swift/proxy-server.conf-sample usr/bin/swift-proxy-server 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 index 116635325d..0076b29a32 100644 --- a/debian/swift.install +++ b/debian/swift.install @@ -1,5 +1,3 @@ -etc/swift/stats.conf-sample -etc/swift/drive-audit.conf-sample usr/bin/swift-init usr/bin/swift-ring-builder usr/bin/swift-get-nodes diff --git a/setup.py b/setup.py index 641f5e74ae..22952e02e0 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,9 @@ setup( '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-server', + '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']