gnuviech/gvaweb
1
0
Fork 0
Code Issues 3 Pull requests Releases Wiki Activity

Merge branch 'release/0.1.1' into production

Browse source 
* release/0.1.1:
  add version number to changelog, update release in conf.py
  force symlink creation for enable_web_vhost
This commit is contained in:
Jan Dittberner 2015-01-27 17:29:54 +01:00
commit 39512961b0
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/changelog.rst
View file

@ -1,6 +1,10 @@
Changelog Changelog
========= =========
* :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>` * :release:`0.1.0 <2015-01-27>`
* :feature:`-` add tasks to setup and delete per user PHP5 FPM pool * :feature:`-` add tasks to setup and delete per user PHP5 FPM pool
configurations configurations

2
docs/conf.py
View file

@ -62,7 +62,7 @@ copyright = u'2015, Jan Dittberner'
# The short X.Y version. # The short X.Y version.
version = '0.1' version = '0.1'
# The full version, including alpha/beta/rc tags. # 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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

2
gvaweb/webtasks/tasks.py
View file

@ -137,7 +137,7 @@ def enable_web_vhost(sitename):
""" """
try: try:
subprocess.check_output([ subprocess.check_output([
SUDO_CMD, LN_CMD, '-s', SUDO_CMD, LN_CMD, '-s', '-f',
_build_vhost_config_path(sitename), _build_vhost_config_path(sitename),
_build_enabled_vhost_path(sitename)], _build_enabled_vhost_path(sitename)],
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT)