From 19bcc316a7197f49b9e21fe3c35a8adf2740e13e Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@canonical.com>
Date: Mon, 28 Jan 2013 16:41:52 -0800
Subject: [PATCH] Update grizzly swift-proxy.conf template for new location of
 keystone middleware module.

---
 hooks/templates/grizzly/proxy-server.conf | 65 ++++++++++++++++++++++-
 revision                                  |  2 +-
 2 files changed, 65 insertions(+), 2 deletions(-)
 mode change 120000 => 100644 hooks/templates/grizzly/proxy-server.conf

diff --git a/hooks/templates/grizzly/proxy-server.conf b/hooks/templates/grizzly/proxy-server.conf
deleted file mode 120000
index 695f6f6..0000000
--- a/hooks/templates/grizzly/proxy-server.conf
+++ /dev/null
@@ -1 +0,0 @@
-../essex/proxy-server.conf
\ No newline at end of file
diff --git a/hooks/templates/grizzly/proxy-server.conf b/hooks/templates/grizzly/proxy-server.conf
new file mode 100644
index 0000000..0c37f22
--- /dev/null
+++ b/hooks/templates/grizzly/proxy-server.conf
@@ -0,0 +1,64 @@
+[DEFAULT]
+bind_port = {{ bind_port }}
+workers = {{ workers }}
+user = swift
+{% if ssl %}
+cert_file = {{ ssl_cert }}
+key_file = {{ ssl_key }}
+{% endif %}
+
+{% if auth_type == 'keystone' %}
+[pipeline:main]
+pipeline =  healthcheck cache swift3 s3token authtoken keystone proxy-server
+{% else %}
+[pipeline:main]
+pipeline = healthcheck cache tempauth proxy-server
+{% endif %}
+
+[app:proxy-server]
+use = egg:swift#proxy
+allow_account_management = true
+{% if auth_type == 'keystone' %}account_autocreate = true{% endif %}
+
+[filter:tempauth]
+use = egg:swift#tempauth
+user_system_root = testpass .admin https://{{ proxy_ip }}:8080/v1/AUTH_system
+
+[filter:healthcheck]
+use = egg:swift#healthcheck
+
+[filter:cache]
+use = egg:swift#memcache
+memcache_servers = {{ proxy_ip }}:11211
+
+{% if auth_type == 'keystone' %}
+[filter:keystone]
+paste.filter_factory = swift.common.middleware.keystoneauth:filter_factory
+operator_roles = {{ operator_roles }}
+
+[filter:authtoken]
+paste.filter_factory = keystone.middleware.auth_token:filter_factory
+auth_host = {{ keystone_host }}
+auth_port = {{ auth_port }}
+auth_protocol = {{ auth_protocol }}
+auth_uri = {{ auth_protocol }}://{{ keystone_host }}:{{ service_port }}
+admin_tenant_name = {{ service_tenant }}
+admin_user = {{ service_user }}
+admin_password = {{ service_password }}
+{% if os_release != 'essex' %}signing_dir = /etc/swift{% endif %}
+
+
+[filter:s3token]
+paste.filter_factory = keystone.middleware.s3_token:filter_factory
+service_host = {{ keystone_host }}
+service_port = {{ service_port }}
+auth_port = {{ auth_port }}
+auth_host = {{ keystone_host }}
+auth_protocol = {{ auth_protocol }}
+auth_token = {{ admin_token }}
+admin_token = {{ admin_token }}
+
+[filter:swift3]
+{% if os_release == 'essex' %}use = egg:swift#swift3{% else %}use = egg:swift3#swift3
+{% endif %}
+{% endif %}
diff --git a/revision b/revision
index 3b20426..e2a9fee 100644
--- a/revision
+++ b/revision
@@ -1 +1 @@
-108
+109