From 52a097c9f2f33561e9b7ec3a92bbdf3a12ce994a Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 14 Jul 2010 10:09:51 -0500 Subject: [PATCH] Moved things to use .install files. --- debian/rules | 84 +--------------------------------- debian/swift-account.dirs | 2 - debian/swift-account.install | 5 ++ debian/swift-auth.dirs | 2 - debian/swift-auth.install | 4 ++ debian/swift-container.dirs | 2 - debian/swift-container.install | 5 ++ debian/swift-object.dirs | 2 - debian/swift-object.install | 7 +++ debian/swift-proxy.dirs | 2 - debian/swift-proxy.install | 2 + debian/swift.dirs | 1 - debian/swift.install | 10 ++++ 13 files changed, 35 insertions(+), 93 deletions(-) delete mode 100644 debian/swift-account.dirs create mode 100644 debian/swift-account.install delete mode 100644 debian/swift-auth.dirs create mode 100644 debian/swift-auth.install delete mode 100644 debian/swift-container.dirs create mode 100644 debian/swift-container.install delete mode 100644 debian/swift-object.dirs create mode 100644 debian/swift-object.install delete mode 100644 debian/swift-proxy.dirs create mode 100644 debian/swift-proxy.install delete mode 100644 debian/swift.dirs create mode 100644 debian/swift.install diff --git a/debian/rules b/debian/rules index eeca56ba7d..cad0224b92 100755 --- a/debian/rules +++ b/debian/rules @@ -15,89 +15,9 @@ clean: find . -name "*\.pyc" -delete 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 + cp $(CURDIR)/etc/* $(CURDIR)/debian/swift/etc/swift + dh install 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.install b/debian/swift-account.install new file mode 100644 index 0000000000..bd8a4f48bb --- /dev/null +++ b/debian/swift-account.install @@ -0,0 +1,5 @@ +etc/swift/account-server.conf-sample +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.install b/debian/swift-auth.install new file mode 100644 index 0000000000..2d82d52b96 --- /dev/null +++ b/debian/swift-auth.install @@ -0,0 +1,4 @@ +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.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.install b/debian/swift-container.install new file mode 100644 index 0000000000..be8057fdfa --- /dev/null +++ b/debian/swift-container.install @@ -0,0 +1,5 @@ +etc/swift/container-server.conf-sample +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-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.install b/debian/swift-object.install new file mode 100644 index 0000000000..c6984cd14d --- /dev/null +++ b/debian/swift-object.install @@ -0,0 +1,7 @@ +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 +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.install b/debian/swift-proxy.install new file mode 100644 index 0000000000..bd40123414 --- /dev/null +++ b/debian/swift-proxy.install @@ -0,0 +1,2 @@ +etc/swift/proxy-server.conf-sample +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.install b/debian/swift.install new file mode 100644 index 0000000000..116635325d --- /dev/null +++ b/debian/swift.install @@ -0,0 +1,10 @@ +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 +usr/bin/swift-stats-populate +usr/bin/swift-stats-report +usr/bin/swift-account-audit +usr/bin/st +usr/bin/swift-drive-audit