Merge pull request #24 from devilbox/VHG-022

WIP: VHG-022 Add SSL support

.pylintrc

@@ -339,7 +339,7 @@ single-line-if-stmt=no
 [DESIGN]
 
 # Maximum number of arguments for function / method
-max-args=7
+max-args=8
 
 # Maximum number of attributes for a class (see R0902).
 max-attributes=7
@@ -348,10 +348,10 @@ max-attributes=7
 max-bool-expr=5
 
 # Maximum number of branch for function / method body
-max-branches=14
+max-branches=15
 
 # Maximum number of locals for function / method body
-max-locals=18
+max-locals=19
 
 # Maximum number of parents for a class (see R0901).
 max-parents=7

.travis.yml

@@ -16,7 +16,6 @@ language: python
 ### Python Build Matrix
 ###
 python:
-  - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"

README.md

@@ -215,7 +215,7 @@ If you are not satisfied with the `Allow from all` permissions, simply rewrite t
 #### Available command line options
 
 ```shell
-Usage: vhost_gen.py -p|r <str> -n <str> [-l <str> -c <str> -t <str> -o <str> -d -s -v]
+Usage: vhost_gen.py -p|r <str> -n <str> [-l <str> -m <str> -c <str> -t <str> -o <str> -d -s -v]
        vhost_gen.py --help
        vhost_gen.py --version
 
@@ -237,6 +237,11 @@ Required arguments:
               Note, this can also have a prefix and/or suffix to be set in conf.yml
 
 Optional arguments:
+  -m <str>    Vhost generation mode. Possible values are:
+              -m plain: Only generate http version (default)
+              -m ssl:   Only generate https version
+              -m both:  Generate http and https version
+              -m redir: Generate https version and make http redirect to https
   -c <str>    Path to global configuration file.
               If not set, the default location is /etc/vhost-gen/conf.yml
               If no config is found, a default is used with all features turned off.