From effbf9e95004e67eec3ea49bc8f6c83b0a9d2fc9 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@ubuntu.com>
Date: Mon, 28 Mar 2016 11:47:48 -0700
Subject: [PATCH] Fix permissions on /etc/nginx/sites-enabled

With the switch to rootwrap, the API service now runs as the gunicorn
user but /etc/nginx/sites-enabled is still owned by root.  This updates
the DIB element to ensure its writable by gunicorn for config rendering.

Also makes a trivial update to releasenotes to remove the UNRELEASED
flag from mitaka.

Change-Id: Ieac128e47a44dd48acd00f68cd8e3a9ca15441ec
Closes-bug: #1558577
---
 diskimage-builder/elements/nginx/element-deps                  | 1 +
 .../{99-disable-default-nginx => 99-set-nginx-sites-enabled}   | 3 +++
 releasenotes/source/mitaka.rst                                 | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)
 rename diskimage-builder/elements/nginx/post-install.d/{99-disable-default-nginx => 99-set-nginx-sites-enabled} (83%)

diff --git a/diskimage-builder/elements/nginx/element-deps b/diskimage-builder/elements/nginx/element-deps
index 7076aba..f59cb68 100644
--- a/diskimage-builder/elements/nginx/element-deps
+++ b/diskimage-builder/elements/nginx/element-deps
@@ -1 +1,2 @@
 package-installs
+astara
diff --git a/diskimage-builder/elements/nginx/post-install.d/99-disable-default-nginx b/diskimage-builder/elements/nginx/post-install.d/99-set-nginx-sites-enabled
similarity index 83%
rename from diskimage-builder/elements/nginx/post-install.d/99-disable-default-nginx
rename to diskimage-builder/elements/nginx/post-install.d/99-set-nginx-sites-enabled
index 2f09699..3c0bdf1 100755
--- a/diskimage-builder/elements/nginx/post-install.d/99-disable-default-nginx
+++ b/diskimage-builder/elements/nginx/post-install.d/99-set-nginx-sites-enabled
@@ -14,3 +14,6 @@
 # under the License.
 
 rm -rf /etc/nginx/sites-enabled/default
+
+# astara API appliance runs as gunicorn user and needs to create files here
+chown gunicorn.gunicorn /etc/nginx/sites-enabled
diff --git a/releasenotes/source/mitaka.rst b/releasenotes/source/mitaka.rst
index 07efd8a..ff9fd26 100644
--- a/releasenotes/source/mitaka.rst
+++ b/releasenotes/source/mitaka.rst
@@ -1,5 +1,5 @@
 ==========================================================
- Astara Appliance Mitaka Series Release Notes (UNRELEASED)
+ Astara Appliance Mitaka Series Release Notes
 ==========================================================
 
 .. release-notes::