diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-19 14:45:39 -0500 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-19 14:45:39 -0500 |
| commit | 19a8556917ffebf9f85e68df4a841e1ea97124d2 (patch) | |
| tree | 3e45898c6f4a58fd17759ad29d8117294d4914ad /debian | |
| parent | 5d647826d6345bfdd87bad10995319679f39679f (diff) | |
| parent | d52925f1f3293a4ad1692bd1aab846c713f7c3de (diff) | |
| download | nova-19a8556917ffebf9f85e68df4a841e1ea97124d2.tar.gz nova-19a8556917ffebf9f85e68df4a841e1ea97124d2.tar.xz nova-19a8556917ffebf9f85e68df4a841e1ea97124d2.zip | |
merged trunk
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/nova-objectstore.install | 1 | ||||
| -rw-r--r-- | debian/nova-objectstore.links | 1 | ||||
| -rw-r--r-- | debian/nova-objectstore.nginx.conf | 17 |
4 files changed, 1 insertions, 20 deletions
diff --git a/debian/control b/debian/control index 17414bb7a..a6d12f36e 100644 --- a/debian/control +++ b/debian/control @@ -91,7 +91,7 @@ Description: Nova Cloud Computing - API frontend Package: nova-objectstore Architecture: all -Depends: nova-common (= ${binary:Version}), nginx, ${python:Depends}, ${misc:Depends} +Depends: nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends} Description: Nova Cloud Computing - object store Nova is a cloud computing fabric controller (the main part of an IaaS system) built to match the popular AWS EC2 and S3 APIs. It is written in diff --git a/debian/nova-objectstore.install b/debian/nova-objectstore.install index 3ed93ff37..c5b3d997a 100644 --- a/debian/nova-objectstore.install +++ b/debian/nova-objectstore.install @@ -1,3 +1,2 @@ bin/nova-objectstore usr/bin debian/nova-objectstore.conf etc/nova -debian/nova-objectstore.nginx.conf etc/nginx/sites-available diff --git a/debian/nova-objectstore.links b/debian/nova-objectstore.links deleted file mode 100644 index 38e33948e..000000000 --- a/debian/nova-objectstore.links +++ /dev/null @@ -1 +0,0 @@ -/etc/nginx/sites-available/nova-objectstore.nginx.conf /etc/nginx/sites-enabled/nova-objectstore.nginx.conf diff --git a/debian/nova-objectstore.nginx.conf b/debian/nova-objectstore.nginx.conf deleted file mode 100644 index b63424150..000000000 --- a/debian/nova-objectstore.nginx.conf +++ /dev/null @@ -1,17 +0,0 @@ -server { - listen 3333 default; - server_name localhost; - client_max_body_size 10m; - - access_log /var/log/nginx/localhost.access.log; - - location ~ /_images/.+ { - root /var/lib/nova/images; - rewrite ^/_images/(.*)$ /$1 break; - } - - location / { - proxy_pass http://localhost:3334/; - } -} - |