Merge 3b66bbb into e1e4f69

opinkerfi · Oct 20, 2021 · 43784bb · 43784bb
2 parents e1e4f69 + 3b66bbb
commit 43784bb
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 14 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,6 @@
+Changes in 1.4.2-1
+    - Added template for okc-windows-check_iis
+
 Changes in 1.4.1-1
     - Automated pypi uploads with Github Actions
 

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION		= 1.4.1
+VERSION		= 1.4.2
 RELEASE		= 1
 DATE		= $(shell date)
 NEWRELEASE	= $(shell echo $$(($(RELEASE) + 1)))

diff --git a/debian.upstream/changelog b/debian.upstream/changelog
@@ -1,3 +1,9 @@
+okconfig (1.4.2-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Gardar Thorsteinsson <gardart@gmail.com>  Wed, 20 Oct 2021 11:23:51 +0000
+
 okconfig (1.4.1-1) unstable; urgency=low
 
   * New upstream version

diff --git a/okconfig.spec b/okconfig.spec
@@ -6,7 +6,7 @@
 
 Summary: Python Nagios Template management and configuration power tools
 Name: okconfig
-Version: 1.4.1
+Version: 1.4.2
 Release: %{release}%{?dist}
 Source0: https://github.com/opinkerfi/okconfig/archive/%{name}-%{version}-%{release}.tar.gz
 License: GPLv2

diff --git a/okconfig/__init__.py b/okconfig/__init__.py
@@ -30,7 +30,7 @@
 __copyright__ = "Copyright 2011, Pall Sigurdsson"
 __credits__ = ["Pall Sigurdsson"]
 __license__ = "GPL"
-__version__ = '1.4.1'
+__version__ = '1.4.2'
 __maintainer__ = "Gardar Thorsteinsson"
 __email__ = "gardar@ok.is"
 __status__ = "Development"

diff --git a/rel-eng/packages/okconfig b/rel-eng/packages/okconfig
@@ -1 +1 @@
-1.4.1-1 /
+1.4.2-1 /
diff --git a/release.sh b/release.sh
@@ -13,11 +13,6 @@ if [ -z "$EDITOR" ]; then
     EDITOR=vi
 fi
 
-#if [ -z $BASH ]; then
-#    echo "You need /bin/bash to run this script"
-#    exit 1
-#fi
-
 main() {
 
     update_changes || echo FAIL
@@ -32,7 +27,7 @@ main() {
 
     git_push || echo FAIL
 
-#    upload_to_pypi || echo FAIL
+    upload_to_pypi || echo FAIL
 
     echo "### All Done"
 }
@@ -42,10 +37,17 @@ update_changes() {
     ${EDITOR} CHANGES || return 1
 }
 
-#upload_to_pypi() {
-#    ask "Upload to pypi?" || return 0
+upload_to_pypi() {
+    ask "Upload to pypi?" || return 0
+	 	echo "To build and upload to PyPI, run the following:"
+	 	echo "pip install build"
+		echo "pip install twine"
+   	echo "python3 -m build"
+		echo "twine check dist/*"
+    echo "python3 -m twine upload --repository testpypi dist/*"
+    echo "python3 -m twine upload dist/*"
 #    python setup.py build sdist upload || return 1
-#}
+}
 
 git_push() {
     ask "Upload to github?" || return 0

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 import os
 
 NAME = "okconfig"
-VERSION = '1.4.1'
+VERSION = '1.4.2'
 SHORT_DESC = "%s - Powertools to generate Nagios configuration files" % NAME
 LONG_DESC = """
 %s contains tools and templates for enterprise quality nagios configuration.

diff --git a/usr/share/okconfig/templates/windows/services.cfg b/usr/share/okconfig/templates/windows/services.cfg
@@ -265,4 +265,11 @@ define service {
     register                        0
 }
 
+define service {
+	use                             okc-windows-service
+	name                            okc-windows-check_iis
+    service_description				IIS Websites and AppPools status
+	check_command                   okc-check_nrpe!check_iis
+    register                        0
+}