diff options
| -rw-r--r-- | docs/Makefile | 1 | ||||
| -rw-r--r-- | docs/changes.xml | 26 | ||||
| -rw-r--r-- | pkg/deb/Makefile | 14 | ||||
| -rw-r--r-- | pkg/deb/Makefile.go112 | 48 | ||||
| -rw-r--r-- | pkg/deb/Makefile.go113 | 48 | ||||
| -rw-r--r-- | pkg/deb/Makefile.jsc-common | 2 | ||||
| -rw-r--r-- | pkg/deb/debian.module/unit.example-go1.12-config | 15 | ||||
| -rw-r--r-- | pkg/deb/debian.module/unit.example-go1.13-config | 15 |
8 files changed, 168 insertions, 1 deletions
diff --git a/docs/Makefile b/docs/Makefile index f9ae3177..bb4a1446 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -11,6 +11,7 @@ PACKAGES= unit \ unit-python3.5 unit-python3.6 unit-python3.7 \ unit-python3.8 \ unit-go unit-go1.7 unit-go1.8 unit-go1.9 unit-go1.10 \ + unit-go1.12 unit-go1.13 \ unit-perl \ unit-ruby \ unit-jsc-common unit-jsc8 unit-jsc10 unit-jsc11 diff --git a/docs/changes.xml b/docs/changes.xml index 0ac817ac..59106de1 100644 --- a/docs/changes.xml +++ b/docs/changes.xml @@ -5,6 +5,32 @@ <change_log title="unit"> +<changes apply="unit-go1.13" ver="1.13.0" rev="1" + date="2019-11-20" time="09:00:00 +0300" + packager="Andrei Belov <defan@nginx.com>"> + +<change> +<para> +Initial release of Go 1.13 module for NGINX Unit. +</para> +</change> + +</changes> + + +<changes apply="unit-go1.12" ver="1.13.0" rev="1" + date="2019-11-20" time="09:00:00 +0300" + packager="Andrei Belov <defan@nginx.com>"> + +<change> +<para> +Initial release of Go 1.12 module for NGINX Unit. +</para> +</change> + +</changes> + + <changes apply="unit-python3.8" ver="1.13.0" rev="1" date="2019-11-18" time="14:20:00 +0300" packager="Andrei Belov <defan@nginx.com>"> diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index d93f193a..855dd6f7 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -16,6 +16,20 @@ 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 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/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" + } + } +} |