From 1d426b428fb70a4ead86c9447082d65002b2c2b0 Mon Sep 17 00:00:00 2001
From: Miguel Martinez <miguel@bitnami.com>
Date: Wed, 20 May 2015 17:51:53 -0700
Subject: [PATCH] Adding Nginx conf generation

---
 bitnami/nginx/Dockerfile    | 10 +++++++---
 bitnami/nginx/entrypoint.sh |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/bitnami/nginx/Dockerfile b/bitnami/nginx/Dockerfile
index 58f88c71a9e0..e4ffc00f58ea 100644
--- a/bitnami/nginx/Dockerfile
+++ b/bitnami/nginx/Dockerfile
@@ -10,14 +10,18 @@ RUN apt-get update -q && DEBIAN_FRONTEND=noninteractive apt-get install -qy wget
     DEBIAN_FRONTEND=noninteractive apt-get --purge autoremove -qy wget && apt-get clean && rm -rf /var/lib/apt && rm -rf /var/cache/apt/archives/*
 
 RUN mv /opt/bitnami/nginx/conf /opt/bitnami/nginx/conf.defaults && \
- ln -s /opt/bitnami/nginx/conf/ /config && \
- ln -s /opt/bitnami/nginx/logs/ /logs
+    mv /opt/bitnami/nginx/html /opt/bitnami/nginx/html.defaults && \
+    ln -s /opt/bitnami/nginx/conf/ /conf && \
+    ln -s /opt/bitnami/nginx/logs/ /logs && \
+    ln -s /opt/bitnami/nginx/html/ /app && \
+    ln -sf /dev/stdout /opt/bitnami/nginx/logs/access.log && \
+    ln -sf /dev/stderr /opt/bitnami/nginx/logs/error.log
 
 
 ENV PATH /opt/bitnami/nginx/sbin:/opt/bitnami/common/bin:$PATH
 
 EXPOSE 80 443
-VOLUME ["/logs", "/config"]
+VOLUME ["/logs", "/conf", "/app"]
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/bitnami/nginx/entrypoint.sh b/bitnami/nginx/entrypoint.sh
index 7733fa8814dc..098775ca34aa 100755
--- a/bitnami/nginx/entrypoint.sh
+++ b/bitnami/nginx/entrypoint.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 
-if [ ! "$(ls -A /config)" ]; then
+if [ ! "$(ls -A /conf)" ]; then
   cp -r /opt/bitnami/nginx/conf.defaults/* /opt/bitnami/nginx/conf
 fi
+
+if [ ! "$(ls -A /app)" ]; then
+  cp -r /opt/bitnami/nginx/html.defaults/* /opt/bitnami/nginx/html
+fi
 exec "$@"