Merged with the default branch.

8 files changed, 206 insertions, 1 deletions

diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index 952408cd..855dd6f7 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -16,11 +16,26 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
 
 MODULES=
 
+# Ubuntu 19.10
+ifeq ($(CODENAME),eoan)
+include Makefile.php
+include Makefile.python27
+include Makefile.python37
+include Makefile.python38
+include Makefile.go112
+include Makefile.go113
+include Makefile.perl
+include Makefile.ruby
+include Makefile.jsc-common
+include Makefile.jsc11
+endif
+
 # Ubuntu 19.04
 ifeq ($(CODENAME),disco)
 include Makefile.php
 include Makefile.python27
 include Makefile.python37
+include Makefile.python38
 include Makefile.go110
 include Makefile.go111
 include Makefile.perl
@@ -50,6 +65,7 @@ include Makefile.php
 include Makefile.python27
 include Makefile.python36
 include Makefile.python37
+include Makefile.python38
 include Makefile.go19
 include Makefile.go110
 include Makefile.perl
diff --git a/pkg/deb/Makefile.go112 b/pkg/deb/Makefile.go112
new file mode 100644
index 00000000..f64ab4c5
--- /dev/null
+++ b/pkg/deb/Makefile.go112
@@ -0,0 +1,48 @@
+MODULES+=		go112
+MODULE_SUFFIX_go112=	go1.12
+
+MODULE_SUMMARY_go112=	Go 1.12 module for NGINX Unit
+
+MODULE_VERSION_go112=	$(VERSION)
+MODULE_RELEASE_go112=	1
+
+MODULE_CONFARGS_go112=	go --go=/usr/lib/go-1.12/bin/go --go-path=/usr/share/gocode
+MODULE_MAKEARGS_go112=	/usr/lib/go-1.12/bin/go
+MODULE_INSTARGS_go112=	/usr/lib/go-1.12/bin/go-install
+
+MODULE_SOURCES_go112=	unit.example-go-app \
+			unit.example-go1.12-config
+
+BUILD_DEPENDS_go112=	golang-1.12
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_go112)
+
+MODULE_BUILD_DEPENDS_go112=,golang-1.12
+MODULE_DEPENDS_go112=,golang-1.12
+
+define MODULE_PREINSTALL_go112
+	mkdir -p debian/unit-go1.12/usr/share/doc/unit-go1.12/examples/go-app
+	install -m 644 -p debian/unit.example-go-app debian/unit-go1.12/usr/share/doc/unit-go1.12/examples/go-app/let-my-people.go
+	install -m 644 -p debian/unit.example-go1.12-config debian/unit-go1.12/usr/share/doc/unit-go1.12/examples/unit.config
+endef
+export MODULE_PREINSTALL_go112
+
+define MODULE_POST_go112
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_go112) has been installed.
+
+To check out the sample app, run these commands:
+
+ GOPATH=/usr/share/gocode /usr/lib/go-1.12/bin/go build -o /tmp/go1.12-app /usr/share/doc/unit-$(MODULE_SUFFIX_go112)/examples/go-app/let-my-people.go
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_go112)/examples
+ sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
+ curl http://localhost:8500/
+
+Online documentation is available at https://unit.nginx.org
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_go112
diff --git a/pkg/deb/Makefile.go113 b/pkg/deb/Makefile.go113
new file mode 100644
index 00000000..ded2e45a
--- /dev/null
+++ b/pkg/deb/Makefile.go113
@@ -0,0 +1,48 @@
+MODULES+=		go113
+MODULE_SUFFIX_go113=	go1.13
+
+MODULE_SUMMARY_go113=	Go 1.13 module for NGINX Unit
+
+MODULE_VERSION_go113=	$(VERSION)
+MODULE_RELEASE_go113=	1
+
+MODULE_CONFARGS_go113=	go --go=/usr/lib/go-1.13/bin/go --go-path=/usr/share/gocode
+MODULE_MAKEARGS_go113=	/usr/lib/go-1.13/bin/go
+MODULE_INSTARGS_go113=	/usr/lib/go-1.13/bin/go-install
+
+MODULE_SOURCES_go113=	unit.example-go-app \
+			unit.example-go1.13-config
+
+BUILD_DEPENDS_go113=	golang-1.13
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_go113)
+
+MODULE_BUILD_DEPENDS_go113=,golang-1.13
+MODULE_DEPENDS_go113=,golang-1.13
+
+define MODULE_PREINSTALL_go113
+	mkdir -p debian/unit-go1.13/usr/share/doc/unit-go1.13/examples/go-app
+	install -m 644 -p debian/unit.example-go-app debian/unit-go1.13/usr/share/doc/unit-go1.13/examples/go-app/let-my-people.go
+	install -m 644 -p debian/unit.example-go1.13-config debian/unit-go1.13/usr/share/doc/unit-go1.13/examples/unit.config
+endef
+export MODULE_PREINSTALL_go113
+
+define MODULE_POST_go113
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_go113) has been installed.
+
+To check out the sample app, run these commands:
+
+ GOPATH=/usr/share/gocode /usr/lib/go-1.13/bin/go build -o /tmp/go1.13-app /usr/share/doc/unit-$(MODULE_SUFFIX_go113)/examples/go-app/let-my-people.go
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_go113)/examples
+ sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
+ curl http://localhost:8500/
+
+Online documentation is available at https://unit.nginx.org
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_go113
diff --git a/pkg/deb/Makefile.jsc-common b/pkg/deb/Makefile.jsc-common
index 30f777fd..029114a6 100644
--- a/pkg/deb/Makefile.jsc-common
+++ b/pkg/deb/Makefile.jsc-common
@@ -6,7 +6,7 @@ MODULE_SUMMARY_jsc_common=	Java shared packages for NGINX Unit
 MODULE_VERSION_jsc_common=	$(VERSION)
 MODULE_RELEASE_jsc_common=	1
 
-ifneq (,$(findstring $(CODENAME),disco buster))
+ifneq (,$(findstring $(CODENAME),eoan disco buster))
 JAVA_MINVERSION=	11
 else
 JAVA_MINVERSION=	8
diff --git a/pkg/deb/Makefile.python38 b/pkg/deb/Makefile.python38
new file mode 100644
index 00000000..fcabd4d0
--- /dev/null
+++ b/pkg/deb/Makefile.python38
@@ -0,0 +1,46 @@
+MODULES+=			python38
+MODULE_SUFFIX_python38=		python3.8
+
+MODULE_SUMMARY_python38=	Python 3.8 module for NGINX Unit
+
+MODULE_VERSION_python38=	$(VERSION)
+MODULE_RELEASE_python38=	1
+
+MODULE_CONFARGS_python38=	python --config=python3.8-config
+MODULE_MAKEARGS_python38=	python3.8
+MODULE_INSTARGS_python38=	python3.8-install
+
+MODULE_SOURCES_python38=	unit.example-python-app \
+				unit.example-python3.8-config
+
+BUILD_DEPENDS_python38=	python3.8-dev
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_python38)
+
+MODULE_BUILD_DEPENDS_python38=,python3.8-dev
+
+define MODULE_PREINSTALL_python38
+	mkdir -p debian/unit-python3.8/usr/share/doc/unit-python3.8/examples/python-app
+	install -m 644 -p debian/unit.example-python-app debian/unit-python3.8/usr/share/doc/unit-python3.8/examples/python-app/wsgi.py
+	install -m 644 -p debian/unit.example-python3.8-config debian/unit-python3.8/usr/share/doc/unit-python3.8/examples/unit.config
+endef
+export MODULE_PREINSTALL_python38
+
+define MODULE_POST_python38
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_python38) has been installed.
+
+To check out the sample app, run these commands:
+
+ sudo service unit restart
+ cd /usr/share/doc/unit-$(MODULE_SUFFIX_python38)/examples
+ sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
+ curl http://localhost:8400/
+
+Online documentation is available at https://unit.nginx.org
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_python38
diff --git a/pkg/deb/debian.module/unit.example-go1.12-config b/pkg/deb/debian.module/unit.example-go1.12-config
new file mode 100644
index 00000000..b49f0aba
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-go1.12-config
@@ -0,0 +1,15 @@
+{
+	"applications": {
+		"example_go": {
+			"type": "external",
+			"user": "nobody",
+			"executable": "/tmp/go1.12-app"
+		}
+	},
+
+	"listeners": {
+		"*:8500": {
+			"pass": "applications/example_go"
+		}
+	}
+}
diff --git a/pkg/deb/debian.module/unit.example-go1.13-config b/pkg/deb/debian.module/unit.example-go1.13-config
new file mode 100644
index 00000000..7dbffb17
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-go1.13-config
@@ -0,0 +1,15 @@
+{
+	"applications": {
+		"example_go": {
+			"type": "external",
+			"user": "nobody",
+			"executable": "/tmp/go1.13-app"
+		}
+	},
+
+	"listeners": {
+		"*:8500": {
+			"pass": "applications/example_go"
+		}
+	}
+}
diff --git a/pkg/deb/debian.module/unit.example-python3.8-config b/pkg/deb/debian.module/unit.example-python3.8-config
new file mode 100644
index 00000000..435e025f
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-python3.8-config
@@ -0,0 +1,17 @@
+{
+	"applications": {
+		"example_python": {
+			"type": "python 3.8",
+			"user": "nobody",
+			"processes": 2,
+			"path": "/usr/share/doc/unit-python3.8/examples/python-app",
+			"module": "wsgi"
+		}
+	},
+
+	"listeners": {
+		"*:8400": {
+			"pass": "applications/example_python"
+		}
+	}
+}