From ad63a3e7521dcbc8e39e610a534c8c1728ecf3da Mon Sep 17 00:00:00 2001
From: Andrei Belov <defan@nginx.com>
Date: Thu, 28 Dec 2017 20:38:35 +0300
Subject: [PATCH] Packages: added support for Ubuntu 17.10.

---
 docs/changes.xml                              | 26 ++++++++++
 pkg/deb/Makefile                              |  9 ++++
 pkg/deb/Makefile.go19                         | 48 +++++++++++++++++++
 pkg/deb/Makefile.python36                     | 44 +++++++++++++++++
 .../debian.module/unit.example-go1.9-config   | 15 ++++++
 .../unit.example-python3.6-config             | 17 +++++++
 6 files changed, 159 insertions(+)
 create mode 100644 pkg/deb/Makefile.go19
 create mode 100644 pkg/deb/Makefile.python36
 create mode 100644 pkg/deb/debian.module/unit.example-go1.9-config
 create mode 100644 pkg/deb/debian.module/unit.example-python3.6-config

diff --git a/docs/changes.xml b/docs/changes.xml
index 9b7490b9..14ccc261 100644
--- a/docs/changes.xml
+++ b/docs/changes.xml
@@ -5,6 +5,32 @@
 <change_log title="unit">
 
 
+<changes apply="unit-go1.9" ver="0.3" rev="1"
+         date="2017-12-28" time="18:00:00 +0300"
+         packager="Andrei Belov &lt;defan@nginx.com&gt;">
+
+<change>
+<para>
+Initial release of Go 1.9 module for NGINX Unit.
+</para>
+</change>
+
+</changes>
+
+
+<changes apply="unit-python3.6" ver="0.3" rev="1"
+         date="2017-12-28" time="18:00:00 +0300"
+         packager="Andrei Belov &lt;defan@nginx.com&gt;">
+
+<change>
+<para>
+Initial release of Python 3.6 module for NGINX Unit.
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="unit-go" ver="0.3" rev="1"
          date="2017-12-28" time="18:00:00 +0300"
          packager="Andrei Belov &lt;defan@nginx.com&gt;">
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index f18e356a..a8eb7102 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -16,6 +16,15 @@ BUILD_DEPENDS = debhelper devscripts libxml2-utils lintian lsb-release xsltproc
 
 MODULES=
 
+# Ubuntu 17.10
+ifeq ($(CODENAME),artful)
+include Makefile.php
+include Makefile.python27
+include Makefile.python36
+include Makefile.go18
+include Makefile.go19
+endif
+
 # Ubuntu 17.04
 ifeq ($(CODENAME),zesty)
 include Makefile.php
diff --git a/pkg/deb/Makefile.go19 b/pkg/deb/Makefile.go19
new file mode 100644
index 00000000..7be967d8
--- /dev/null
+++ b/pkg/deb/Makefile.go19
@@ -0,0 +1,48 @@
+MODULES+=		go19
+MODULE_SUFFIX_go19=	go1.9
+
+MODULE_SUMMARY_go19=	Go 1.9 module for NGINX Unit
+
+MODULE_VERSION_go19=	$(VERSION)
+MODULE_RELEASE_go19=	1
+
+MODULE_CONFARGS_go19=	go --go=/usr/lib/go-1.9/bin/go --go-path=/usr/share/gocode
+MODULE_MAKEARGS_go19=	/usr/lib/go-1.9/bin/go
+MODULE_INSTARGS_go19=	/usr/lib/go-1.9/bin/go-install
+
+MODULE_SOURCES_go19=	unit.example-go-app \
+			unit.example-go1.9-config
+
+BUILD_DEPENDS+=		golang-1.9
+
+MODULE_BUILD_DEPENDS_go19=,golang-1.9
+MODULE_DEPENDS_go19=,golang-1.9
+
+MODULE_NOARCH_go19=	true
+
+define MODULE_PREINSTALL_go19
+	mkdir -p debian/unit-go1.9/usr/share/doc/unit-go1.9/examples/go-app
+	install -m 644 -p debian/unit.example-go-app debian/unit-go1.9/usr/share/doc/unit-go1.9/examples/go-app/let-my-people.go
+	install -m 644 -p debian/unit.example-go1.9-config debian/unit-go1.9/usr/share/doc/unit-go1.9/examples/unit.config
+endef
+export MODULE_PREINSTALL_go19
+
+define MODULE_POST_go19
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_go19) has been installed.
+
+To check out the sample app, run these commands:
+
+ GOPATH=/usr/share/gocode /usr/lib/go-1.9/bin/go build -o /tmp/go1.9-app /usr/share/doc/unit-go1.9/examples/go-app/let-my-people.go
+ sudo service unit restart
+ sudo service unit loadconfig /usr/share/doc/unit-go1.9/examples/unit.config
+ curl http://localhost:8500/
+
+Online documentation is available at https://unit.nginx.org
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_go19
diff --git a/pkg/deb/Makefile.python36 b/pkg/deb/Makefile.python36
new file mode 100644
index 00000000..232687f2
--- /dev/null
+++ b/pkg/deb/Makefile.python36
@@ -0,0 +1,44 @@
+MODULES+=			python36
+MODULE_SUFFIX_python36=		python3.6
+
+MODULE_SUMMARY_python36=	Python 3.6 module for NGINX Unit
+
+MODULE_VERSION_python36=	$(VERSION)
+MODULE_RELEASE_python36=	1
+
+MODULE_CONFARGS_python36=	python --config=python3.6-config
+MODULE_MAKEARGS_python36=	python3.6
+MODULE_INSTARGS_python36=	python3.6-install
+
+MODULE_SOURCES_python36=	unit.example-python-app \
+				unit.example-python3.6-config
+
+BUILD_DEPENDS+=		python3.6-dev
+
+MODULE_BUILD_DEPENDS_python36=,python3.6-dev
+
+define MODULE_PREINSTALL_python36
+	mkdir -p debian/unit-python3.6/usr/share/doc/unit-python3.6/examples/python-app
+	install -m 644 -p debian/unit.example-python-app debian/unit-python3.6/usr/share/doc/unit-python3.6/examples/python-app/wsgi.py
+	install -m 644 -p debian/unit.example-python3.6-config debian/unit-python3.6/usr/share/doc/unit-python3.6/examples/unit.config
+endef
+export MODULE_PREINSTALL_python36
+
+define MODULE_POST_python36
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_python36) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ sudo service unit loadconfig /usr/share/doc/unit-python3.6/examples/unit.config
+ curl http://localhost:8400/
+
+Online documentation is available at https://unit.nginx.org
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_python36
diff --git a/pkg/deb/debian.module/unit.example-go1.9-config b/pkg/deb/debian.module/unit.example-go1.9-config
new file mode 100644
index 00000000..4074df3b
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-go1.9-config
@@ -0,0 +1,15 @@
+{
+	"applications": {
+		"example_go": {
+			"type": "go",
+			"user": "nobody",
+			"executable": "/tmp/go1.9-app"
+		}
+	},
+
+	"listeners": {
+		"*:8500": {
+			"application": "example_go"
+		}
+	}
+}
diff --git a/pkg/deb/debian.module/unit.example-python3.6-config b/pkg/deb/debian.module/unit.example-python3.6-config
new file mode 100644
index 00000000..a17e333b
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-python3.6-config
@@ -0,0 +1,17 @@
+{
+	"applications": {
+		"example_python": {
+			"type": "python",
+			"user": "nobody",
+			"workers": 2,
+			"path": "/usr/share/doc/unit-python3.6/examples/python-app",
+			"module": "wsgi"
+		}
+	},
+
+	"listeners": {
+		"*:8400": {
+			"application": "example_python"
+		}
+	}
+}