diff options
Diffstat (limited to 'pkg/deb')
23 files changed, 106 insertions, 24 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index f481ff02..421c4169 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -16,6 +16,19 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= +# Ubuntu 19.04 +ifeq ($(CODENAME),disco) +include Makefile.php +include Makefile.python27 +include Makefile.python37 +include Makefile.go110 +include Makefile.go111 +include Makefile.perl +include Makefile.ruby +include Makefile.jsc-common +include Makefile.jsc11 +endif + # Ubuntu 18.10 ifeq ($(CODENAME),cosmic) include Makefile.php diff --git a/pkg/deb/Makefile.go111 b/pkg/deb/Makefile.go111 new file mode 100644 index 00000000..f8ed5ae8 --- /dev/null +++ b/pkg/deb/Makefile.go111 @@ -0,0 +1,48 @@ +MODULES+= go111 +MODULE_SUFFIX_go111= go1.11 + +MODULE_SUMMARY_go111= Go 1.11 module for NGINX Unit + +MODULE_VERSION_go111= $(VERSION) +MODULE_RELEASE_go111= 1 + +MODULE_CONFARGS_go111= go --go=/usr/lib/go-1.11/bin/go --go-path=/usr/share/gocode +MODULE_MAKEARGS_go111= /usr/lib/go-1.11/bin/go +MODULE_INSTARGS_go111= /usr/lib/go-1.11/bin/go-install + +MODULE_SOURCES_go111= unit.example-go-app \ + unit.example-go1.11-config + +BUILD_DEPENDS_go111= golang-1.11 +BUILD_DEPENDS+= $(BUILD_DEPENDS_go111) + +MODULE_BUILD_DEPENDS_go111=,golang-1.11 +MODULE_DEPENDS_go111=,golang-1.11 + +define MODULE_PREINSTALL_go111 + mkdir -p debian/unit-go1.11/usr/share/doc/unit-go1.11/examples/go-app + install -m 644 -p debian/unit.example-go-app debian/unit-go1.11/usr/share/doc/unit-go1.11/examples/go-app/let-my-people.go + install -m 644 -p debian/unit.example-go1.11-config debian/unit-go1.11/usr/share/doc/unit-go1.11/examples/unit.config +endef +export MODULE_PREINSTALL_go111 + +define MODULE_POST_go111 +cat <<BANNER +---------------------------------------------------------------------- + +The $(MODULE_SUMMARY_go111) has been installed. + +To check out the sample app, run these commands: + + GOPATH=/usr/share/gocode /usr/lib/go-1.11/bin/go build -o /tmp/go1.11-app /usr/share/doc/unit-$(MODULE_SUFFIX_go111)/examples/go-app/let-my-people.go + sudo service unit restart + cd /usr/share/doc/unit-$(MODULE_SUFFIX_go111)/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_go111 diff --git a/pkg/deb/Makefile.jsc-common b/pkg/deb/Makefile.jsc-common index 42fdb12f..080e248f 100644 --- a/pkg/deb/Makefile.jsc-common +++ b/pkg/deb/Makefile.jsc-common @@ -6,11 +6,17 @@ MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit MODULE_VERSION_jsc_common= $(VERSION) MODULE_RELEASE_jsc_common= 1 -MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-8-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ +ifeq ($(CODENAME),disco) +JAVA_MINVERSION= 11 +else +JAVA_MINVERSION= 8 +endif + +MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-$(JAVA_MINVERSION)-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/ MODULE_MAKEARGS_jsc_common= java MODULE_INSTARGS_jsc_common= java-shared-install -BUILD_DEPENDS_jsc_common= openjdk-8-jdk-headless openjdk-8-jre-headless +BUILD_DEPENDS_jsc_common= openjdk-$(JAVA_MINVERSION)-jdk-headless openjdk-$(JAVA_MINVERSION)-jre-headless BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc_common) MODULE_NOARCH_jsc_common= true diff --git a/pkg/deb/debian.module/unit.example-go-config b/pkg/deb/debian.module/unit.example-go-config index 079ce0b8..a2c91e80 100644 --- a/pkg/deb/debian.module/unit.example-go-config +++ b/pkg/deb/debian.module/unit.example-go-config @@ -9,7 +9,7 @@ "listeners": { "*:8500": { - "application": "example_go" + "pass": "applications/example_go" } } } diff --git a/pkg/deb/debian.module/unit.example-go1.10-config b/pkg/deb/debian.module/unit.example-go1.10-config index 29bb9059..61790b73 100644 --- a/pkg/deb/debian.module/unit.example-go1.10-config +++ b/pkg/deb/debian.module/unit.example-go1.10-config @@ -9,7 +9,7 @@ "listeners": { "*:8500": { - "application": "example_go" + "pass": "applications/example_go" } } } diff --git a/pkg/deb/debian.module/unit.example-go1.11-config b/pkg/deb/debian.module/unit.example-go1.11-config new file mode 100644 index 00000000..5e063a4c --- /dev/null +++ b/pkg/deb/debian.module/unit.example-go1.11-config @@ -0,0 +1,15 @@ +{ + "applications": { + "example_go": { + "type": "external", + "user": "nobody", + "executable": "/tmp/go1.11-app" + } + }, + + "listeners": { + "*:8500": { + "pass": "applications/example_go" + } + } +} diff --git a/pkg/deb/debian.module/unit.example-go1.7-config b/pkg/deb/debian.module/unit.example-go1.7-config index bd98fe3a..e1a8e1a4 100644 --- a/pkg/deb/debian.module/unit.example-go1.7-config +++ b/pkg/deb/debian.module/unit.example-go1.7-config @@ -9,7 +9,7 @@ "listeners": { "*:8500": { - "application": "example_go" + "pass": "applications/example_go" } } } diff --git a/pkg/deb/debian.module/unit.example-go1.8-config b/pkg/deb/debian.module/unit.example-go1.8-config index 1c14ca25..e570f38c 100644 --- a/pkg/deb/debian.module/unit.example-go1.8-config +++ b/pkg/deb/debian.module/unit.example-go1.8-config @@ -9,7 +9,7 @@ "listeners": { "*:8500": { - "application": "example_go" + "pass": "applications/example_go" } } } diff --git a/pkg/deb/debian.module/unit.example-go1.9-config b/pkg/deb/debian.module/unit.example-go1.9-config index 341894b7..90ef7d5f 100644 --- a/pkg/deb/debian.module/unit.example-go1.9-config +++ b/pkg/deb/debian.module/unit.example-go1.9-config @@ -9,7 +9,7 @@ "listeners": { "*:8500": { - "application": "example_go" + "pass": "applications/example_go" } } } diff --git a/pkg/deb/debian.module/unit.example-jsc10-config b/pkg/deb/debian.module/unit.example-jsc10-config index 6929356d..969491e5 100644 --- a/pkg/deb/debian.module/unit.example-jsc10-config +++ b/pkg/deb/debian.module/unit.example-jsc10-config @@ -9,7 +9,7 @@ "listeners": { "*:8800": { - "application": "example_java10" + "pass": "applications/example_java10" } } } diff --git a/pkg/deb/debian.module/unit.example-jsc11-config b/pkg/deb/debian.module/unit.example-jsc11-config index 6c1d9549..3f7dd518 100644 --- a/pkg/deb/debian.module/unit.example-jsc11-config +++ b/pkg/deb/debian.module/unit.example-jsc11-config @@ -9,7 +9,7 @@ "listeners": { "*:8800": { - "application": "example_java11" + "pass": "applications/example_java11" } } } diff --git a/pkg/deb/debian.module/unit.example-jsc8-config b/pkg/deb/debian.module/unit.example-jsc8-config index 0254677b..4d79112f 100644 --- a/pkg/deb/debian.module/unit.example-jsc8-config +++ b/pkg/deb/debian.module/unit.example-jsc8-config @@ -9,7 +9,7 @@ "listeners": { "*:8800": { - "application": "example_java8" + "pass": "applications/example_java8" } } } diff --git a/pkg/deb/debian.module/unit.example-jsc9-config b/pkg/deb/debian.module/unit.example-jsc9-config index c64a1aff..a8faa268 100644 --- a/pkg/deb/debian.module/unit.example-jsc9-config +++ b/pkg/deb/debian.module/unit.example-jsc9-config @@ -9,7 +9,7 @@ "listeners": { "*:8800": { - "application": "example_java9" + "pass": "applications/example_java9" } } } diff --git a/pkg/deb/debian.module/unit.example-perl-config b/pkg/deb/debian.module/unit.example-perl-config index 0329b78a..031928ce 100644 --- a/pkg/deb/debian.module/unit.example-perl-config +++ b/pkg/deb/debian.module/unit.example-perl-config @@ -11,7 +11,7 @@ "listeners": { "*:8600": { - "application": "example_perl" + "pass": "applications/example_perl" } } } diff --git a/pkg/deb/debian.module/unit.example-php-config b/pkg/deb/debian.module/unit.example-php-config index 71564df3..8f23c984 100644 --- a/pkg/deb/debian.module/unit.example-php-config +++ b/pkg/deb/debian.module/unit.example-php-config @@ -11,7 +11,7 @@ "listeners": { "*:8300": { - "application": "example_php" + "pass": "applications/example_php" } } } diff --git a/pkg/deb/debian.module/unit.example-python-config b/pkg/deb/debian.module/unit.example-python-config index 2866cc16..d612c89d 100644 --- a/pkg/deb/debian.module/unit.example-python-config +++ b/pkg/deb/debian.module/unit.example-python-config @@ -11,7 +11,7 @@ "listeners": { "*:8400": { - "application": "example_python" + "pass": "applications/example_python" } } } diff --git a/pkg/deb/debian.module/unit.example-python2.7-config b/pkg/deb/debian.module/unit.example-python2.7-config index 70df9d6d..bede8899 100644 --- a/pkg/deb/debian.module/unit.example-python2.7-config +++ b/pkg/deb/debian.module/unit.example-python2.7-config @@ -11,7 +11,7 @@ "listeners": { "*:8400": { - "application": "example_python" + "pass": "applications/example_python" } } } diff --git a/pkg/deb/debian.module/unit.example-python3.4-config b/pkg/deb/debian.module/unit.example-python3.4-config index fbda2886..dd496bd8 100644 --- a/pkg/deb/debian.module/unit.example-python3.4-config +++ b/pkg/deb/debian.module/unit.example-python3.4-config @@ -11,7 +11,7 @@ "listeners": { "*:8400": { - "application": "example_python" + "pass": "applications/example_python" } } } diff --git a/pkg/deb/debian.module/unit.example-python3.5-config b/pkg/deb/debian.module/unit.example-python3.5-config index 495995ef..2be6de4a 100644 --- a/pkg/deb/debian.module/unit.example-python3.5-config +++ b/pkg/deb/debian.module/unit.example-python3.5-config @@ -11,7 +11,7 @@ "listeners": { "*:8400": { - "application": "example_python" + "pass": "applications/example_python" } } } diff --git a/pkg/deb/debian.module/unit.example-python3.6-config b/pkg/deb/debian.module/unit.example-python3.6-config index 1a75fdbf..a77e8e07 100644 --- a/pkg/deb/debian.module/unit.example-python3.6-config +++ b/pkg/deb/debian.module/unit.example-python3.6-config @@ -11,7 +11,7 @@ "listeners": { "*:8400": { - "application": "example_python" + "pass": "applications/example_python" } } } diff --git a/pkg/deb/debian.module/unit.example-python3.7-config b/pkg/deb/debian.module/unit.example-python3.7-config index 00c24f23..9b13c058 100644 --- a/pkg/deb/debian.module/unit.example-python3.7-config +++ b/pkg/deb/debian.module/unit.example-python3.7-config @@ -11,7 +11,7 @@ "listeners": { "*:8400": { - "application": "example_python" + "pass": "applications/example_python" } } } diff --git a/pkg/deb/debian.module/unit.example-ruby-config b/pkg/deb/debian.module/unit.example-ruby-config index 53eee534..15a92735 100644 --- a/pkg/deb/debian.module/unit.example-ruby-config +++ b/pkg/deb/debian.module/unit.example-ruby-config @@ -10,7 +10,7 @@ "listeners": { "*:8700": { - "application": "example_ruby" + "pass": "applications/example_ruby" } } } diff --git a/pkg/deb/debian/unit.example.config b/pkg/deb/debian/unit.example.config index 8d86acbe..5610cb3a 100644 --- a/pkg/deb/debian/unit.example.config +++ b/pkg/deb/debian/unit.example.config @@ -33,19 +33,19 @@ "listeners": { "*:8300": { - "application": "example_php" + "pass": "applications/example_php" }, "*:8400": { - "application": "example_python" + "pass": "applications/example_python" }, "*:8500": { - "application": "example_go" + "pass": "applications/example_go" }, "*:8600": { - "application": "example_perl" + "pass": "applications/example_perl" } } } |