diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-17 23:04:46 -0700 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-17 23:04:46 -0700 |
| commit | 2d5124c3f2c6e4e78dc09eb8f38cb125641b9b1c (patch) | |
| tree | a207db163ce38ece237ec21f0f544906c48446fc /debian | |
| parent | 9e023095e303f096ac0d2914ed427d2a37d1444d (diff) | |
| download | nova-2d5124c3f2c6e4e78dc09eb8f38cb125641b9b1c.tar.gz nova-2d5124c3f2c6e4e78dc09eb8f38cb125641b9b1c.tar.xz nova-2d5124c3f2c6e4e78dc09eb8f38cb125641b9b1c.zip | |
Remove s3_internal_port setting.
Objectstore should be able to handle the beatings now.
As such, nginx is no longer needed, so it's removed from the dependencies and the configuration files are removed.
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/; - } -} - |