Skip to content

Commit

Permalink
Merge pull request #42 from devilbox/release-1.0.1
Browse files Browse the repository at this point in the history
Release 1.0.1
  • Loading branch information
cytopia authored Sep 30, 2020
2 parents bc9090f + 732b955 commit c626aba
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -234,7 +235,7 @@ Usage: vhost-gen -p|r <str> -n <str> [-l <str> -m <str> -c <str> -t <str> -o <st
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 <str> You need to choose one of the mutually exclusive arguments.
Expand Down
4 changes: 2 additions & 2 deletions bin/vhost-gen
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Usage: vhost-gen -p|r <str> -n <str> [-l <str> -c <str> -t <str> -o <str> -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 <str> You need to choose one of the mutually exclusive arguments.
Expand Down Expand Up @@ -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 <[email protected]>")
print("https://github.com/devilbox/vhost-gen")
print("The MIT License (MIT)")
Expand Down
13 changes: 9 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
"""Pip configuration."""
from setuptools import setup

with open("README.md", "r") as fh:
long_description = fh.read()

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,
Expand All @@ -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",
],
)

0 comments on commit c626aba

Please sign in to comment.