From e498777d02e9712812a43c6de6243d5720c45beb Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Tue, 27 Jan 2015 17:06:40 +0100
Subject: [PATCH 1/2] force symlink creation for enable_web_vhost

- add '-f' parameter to ln invocation
- add changelog entry
---
 docs/changelog.rst       | 3 +++
 gvaweb/webtasks/tasks.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f8aaef4..b3d997c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+* :bugfix:`-` force symlink creation for enable_web_vhost task to make it
+  idempotent
+
 * :release:`0.1.0 <2015-01-27>`
 * :feature:`-` add tasks to setup and delete per user PHP5 FPM pool
   configurations
diff --git a/gvaweb/webtasks/tasks.py b/gvaweb/webtasks/tasks.py
index 38a112f..608ae8c 100644
--- a/gvaweb/webtasks/tasks.py
+++ b/gvaweb/webtasks/tasks.py
@@ -137,7 +137,7 @@ def enable_web_vhost(sitename):
     """
     try:
         subprocess.check_output([
-            SUDO_CMD, LN_CMD, '-s',
+            SUDO_CMD, LN_CMD, '-s', '-f',
             _build_vhost_config_path(sitename),
             _build_enabled_vhost_path(sitename)],
             stderr=subprocess.STDOUT)

From 090ec570622897e1295833f9f6eb6a63c708dc1b Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Tue, 27 Jan 2015 17:29:10 +0100
Subject: [PATCH 2/2] add version number to changelog, update release in
 conf.py

---
 docs/changelog.rst | 3 ++-
 docs/conf.py       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b3d997c..4ca1479 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,7 +1,8 @@
 Changelog
 =========
 
-* :bugfix:`-` force symlink creation for enable_web_vhost task to make it
+* :release:`0.1.1 <2015-01-27>`
+* :bug:`-` force symlink creation for enable_web_vhost task to make it
   idempotent
 
 * :release:`0.1.0 <2015-01-27>`
diff --git a/docs/conf.py b/docs/conf.py
index e7955e7..f4c0ce5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -62,7 +62,7 @@ copyright = u'2015, Jan Dittberner'
 # The short X.Y version.
 version = '0.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.0'
+release = '0.1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.