From bc0be0a37395656c08182b0a80849920f846ba4d Mon Sep 17 00:00:00 2001
From: Adam Paterson <hello@adampaterson.co.uk>
Date: Fri, 17 Feb 2017 11:10:20 +0000
Subject: [PATCH 1/2] Fix docker-compose example

---
 docker-compose-build.yml | 6 ++++++
 docker-compose.yml       | 7 +++++--
 nginx/etc/vhost.conf     | 8 ++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/docker-compose-build.yml b/docker-compose-build.yml
index 6cbf948..3128630 100644
--- a/docker-compose-build.yml
+++ b/docker-compose-build.yml
@@ -3,8 +3,14 @@ services:
   web:
     build:
       context: nginx/
+    environment:
+      - VIRTUAL_HOST=dev.kickasscommerce.com
+      - VIRTUAL_PORT=80
+      - HTTPS_METHOD=noredirect
     ports:
       - 80
+    links:
+      - fpm
     volumes_from:
       - appdata
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 6d49337..0e6ccd6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,16 @@
 version: "2"
 services:
   web:
-    image: kickasscommerce/kickass-nginx:latest
+    image: kickasscommerce/kickass-nginx:1.9
+    hostname: dev.kickasscommerce.com
     environment:
-      - VIRTUAL_HOST=kickasscommerce.docker
+      - VIRTUAL_HOST=dev.kickasscommerce.com
       - VIRTUAL_PORT=80
       - HTTPS_METHOD=noredirect
+      - CERT_NAME=default
     ports:
       - 80
+      - 443
     links:
       - fpm
     volumes_from:
diff --git a/nginx/etc/vhost.conf b/nginx/etc/vhost.conf
index a7997cc..e999299 100644
--- a/nginx/etc/vhost.conf
+++ b/nginx/etc/vhost.conf
@@ -4,14 +4,14 @@ upstream fastcgi_backend {
 
 server {
    listen 80;
-   listen [::]:80 ipv6only=on;
+
+   server_name localhost;
 
    set $APP_ROOT !APP_ROOT!;
 
-   root $APP_ROOT;
+   root $APP_ROOT/public;
    index index.php index.html index.htm;
-
-   server_name localhost;
+   autoindex off;
 
    location / {
       try_files $uri $uri/ /index.php?$query_string;

From 73d593ecf4298a3df4315fe09995bee985078517 Mon Sep 17 00:00:00 2001
From: Adam Paterson <hello@adampaterson.co.uk>
Date: Fri, 17 Feb 2017 11:11:56 +0000
Subject: [PATCH 2/2] Changelog

---
 CHANGELOG.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8619f61..b329342 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,24 @@ All Notable changes to `KickAssDocker` will be documented in this file.
 
 Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## 0.1.1 - 2017-02-17
+
+### Added
+- Nothing
+
+### Deprecated
+- Nothing
+
+### Fixed
+- Nginx vhost template
+- `docker-compose.yml` example
+
+### Removed
+- Nothing
+
+### Security
+- Nothing
+
 ## 0.1.0 - 2017-02-16
 
 ### Added