Packages: Ubuntu 18.10 "bionic" support added.

5 files changed, 89 insertions, 1 deletions

diff --git a/docs/Makefile b/docs/Makefile
index 189fd95c..52ed1c65 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -9,7 +9,7 @@ PACKAGES=	unit 							\
 		unit-php 						\
 		unit-python unit-python2.7 unit-python3.4		\
 		unit-python3.5 unit-python3.6				\
-		unit-go unit-go1.7 unit-go1.8 unit-go1.9		\
+		unit-go unit-go1.7 unit-go1.8 unit-go1.9 unit-go1.10	\
 		unit-perl						\
 		unit-ruby
 
diff --git a/docs/changes.xml b/docs/changes.xml
index 32766116..4d320521 100644
--- a/docs/changes.xml
+++ b/docs/changes.xml
@@ -5,6 +5,19 @@
 <change_log title="unit">
 
 
+<changes apply="unit-go1.10" ver="1.1" rev="1"
+         date="2018-05-14" time="18:00:00 +0300"
+         packager="Andrei Belov &lt;defan@nginx.com&gt;">
+
+<change>
+<para>
+Initial release of Go 1.10 module for NGINX Unit.
+</para>
+</change>
+
+</changes>
+
+
 <changes apply="unit-php
                 unit-python unit-python2.7
                 unit-python3.4 unit-python3.5 unit-python3.6
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index 73ff2b8d..54fd6475 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -17,6 +17,17 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
 
 MODULES=
 
+# Ubuntu 18.04
+ifeq ($(CODENAME),bionic)
+include Makefile.php
+include Makefile.python27
+include Makefile.python36
+include Makefile.go19
+include Makefile.go110
+include Makefile.perl
+include Makefile.ruby
+endif
+
 # Ubuntu 17.10
 ifeq ($(CODENAME),artful)
 include Makefile.php
diff --git a/pkg/deb/Makefile.go110 b/pkg/deb/Makefile.go110
new file mode 100644
index 00000000..2465b772
--- /dev/null
+++ b/pkg/deb/Makefile.go110
@@ -0,0 +1,49 @@
+MODULES+=		go110
+MODULE_SUFFIX_go110=	go1.10
+
+MODULE_SUMMARY_go110=	Go 1.10 module for NGINX Unit
+
+MODULE_VERSION_go110=	$(VERSION)
+MODULE_RELEASE_go110=	1
+
+MODULE_CONFARGS_go110=	go --go=/usr/lib/go-1.10/bin/go --go-path=/usr/share/gocode
+MODULE_MAKEARGS_go110=	/usr/lib/go-1.10/bin/go
+MODULE_INSTARGS_go110=	/usr/lib/go-1.10/bin/go-install
+
+MODULE_SOURCES_go110=	unit.example-go-app \
+			unit.example-go1.10-config
+
+BUILD_DEPENDS_go110=	golang-1.10
+BUILD_DEPENDS+=		$(BUILD_DEPENDS_go110)
+
+MODULE_BUILD_DEPENDS_go110=,golang-1.10
+MODULE_DEPENDS_go110=,golang-1.10
+
+MODULE_NOARCH_go110=	true
+
+define MODULE_PREINSTALL_go110
+	mkdir -p debian/unit-go1.10/usr/share/doc/unit-go1.10/examples/go-app
+	install -m 644 -p debian/unit.example-go-app debian/unit-go1.10/usr/share/doc/unit-go1.10/examples/go-app/let-my-people.go
+	install -m 644 -p debian/unit.example-go1.10-config debian/unit-go1.10/usr/share/doc/unit-go1.10/examples/unit.config
+endef
+export MODULE_PREINSTALL_go110
+
+define MODULE_POST_go110
+cat <<BANNER
+----------------------------------------------------------------------
+
+The $(MODULE_SUMMARY_go110) has been installed.
+
+To check out the sample app, run these commands:
+
+ GOPATH=/usr/share/gocode /usr/lib/go-1.10/bin/go build -o /tmp/go1.10-app /usr/share/doc/unit-go1.10/examples/go-app/let-my-people.go
+ sudo service unit restart
+ sudo service unit loadconfig /usr/share/doc/unit-go1.10/examples/unit.config
+ curl http://localhost:8500/
+
+Online documentation is available at https://unit.nginx.org
+
+----------------------------------------------------------------------
+BANNER
+endef
+export MODULE_POST_go110
diff --git a/pkg/deb/debian.module/unit.example-go1.10-config b/pkg/deb/debian.module/unit.example-go1.10-config
new file mode 100644
index 00000000..68733256
--- /dev/null
+++ b/pkg/deb/debian.module/unit.example-go1.10-config
@@ -0,0 +1,15 @@
+{

+	"applications": {

+		"example_go": {

+			"type": "go",

+			"user": "nobody",

+			"executable": "/tmp/go1.10-app"

+		}

+	},

+

+	"listeners": {

+		"*:8500": {

+			"application": "example_go"

+		}

+	}

+}