From 9458650c1e046e1b9679256eccb0ed05b013ea83 Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 29 Sep 2020 20:23:15 +0200 Subject: [PATCH 1/2] Fix typos --- README.md | 2 +- bin/vhost-gen | 4 ++-- setup.py | 13 +++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ca956ee..307469c 100644 --- a/README.md +++ b/README.md @@ -234,7 +234,7 @@ Usage: vhost-gen -p|r -n [-l -m -c -t -o You need to choose one of the mutually exclusive arguments. diff --git a/bin/vhost-gen b/bin/vhost-gen index ae1bcba..373e2fb 100755 --- a/bin/vhost-gen +++ b/bin/vhost-gen @@ -85,7 +85,7 @@ Usage: vhost-gen -p|r -n [-l -c -t -o -d -s vhost-gen will dynamically generate vhost configuration files for Nginx, Apache 2.2 or Apache 2.4 depending on what you have set -in /etc/vhot-gen/conf.yml +in /etc/vhost-gen/conf.yml Required arguments: -p|r You need to choose one of the mutually exclusive arguments. @@ -135,7 +135,7 @@ Misc arguments: def print_version(): """Show program version.""" - print("vhost-gen v1.0.0 (2020-01-23)") + print("vhost-gen v1.0.1 (2020-09-29)") print("cytopia ") print("https://github.com/devilbox/vhost-gen") print("The MIT License (MIT)") diff --git a/setup.py b/setup.py index dd36bdd..dbe7c0a 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,4 @@ +"""Pip configuration.""" from setuptools import setup with open("README.md", "r") as fh: @@ -5,7 +6,7 @@ setup( name="vhost-gen", - version="1.0.0", + version="1.0.1", description="Configurable vHost generator for Apache 2.2, Apache 2.4 and Nginx.", license="MIT", long_description=long_description, @@ -23,18 +24,22 @@ # 4 - Beta # 5 - Production/Stable 'Development Status :: 5 - Production/Stable', - # Indicate who your project is intended for 'Intended Audience :: Developers', + "Intended Audience :: System Administrators", + # Project topics 'Topic :: Software Development :: Build Tools', - + "Topic :: System :: Systems Administration", + "Topic :: Utilities", # License "License :: OSI Approved :: MIT License", - # Specify the Python versions you support here. In particular, ensure # that you indicate whether you support Python 2, Python 3 or both. "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", + # How does it run + "Environment :: Console", + # Where does it rnu "Operating System :: OS Independent", ], ) From 732b9555727476fe27002173817cf1d748612fd5 Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 29 Sep 2020 20:23:32 +0200 Subject: [PATCH 2/2] Document requirements for manual install --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 307469c..a04ec37 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ pip install vhost-gen ``` #### From git +**Note:** When using the Makefile, ensure that `pyyaml` is installed (`pip install pyyaml`). ```bash git clone https://github.com/devilbox/vhost-gen cd vhost-gen