technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Packages: added Ubuntu 21.10 "impish" support.

Browse Source
This commit is contained in:
Andrei Belov
2021-10-21 13:23:25 +03:00
parent 314ca5c8c9
commit 0900edb10d
7 changed files with 193 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
docs/changes.xml
View File

@@ -5,6 +5,32 @@
<change_log title="unit">
<changes apply="unit-jsc18" ver="1.26.0" rev="1"
date="" time=""
packager="Andrei Belov &lt;defan@nginx.com&gt;">
<change>
<para>
Initial release of Java 18 module for NGINX Unit.
</para>
</change>
</changes>
<changes apply="unit-python3.10" ver="1.26.0" rev="1"
date="" time=""
packager="Andrei Belov &lt;defan@nginx.com&gt;">
<change>
<para>
Initial release of Python 3.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 unit-python3.7

16
pkg/deb/Makefile
View File

@@ -19,6 +19,22 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit)
MODULES=
# Ubuntu 21.10
ifeq ($(CODENAME),impish)
include Makefile.php
include Makefile.python27
include Makefile.python39
include Makefile.python310
include Makefile.go
include Makefile.perl
include Makefile.ruby
include Makefile.jsc-common
include Makefile.jsc11
include Makefile.jsc16
include Makefile.jsc17
include Makefile.jsc18
endif
# Ubuntu 21.04
ifeq ($(CODENAME),hirsute)
include Makefile.php

6
pkg/deb/Makefile.jsc-common
View File

@@ -6,10 +6,10 @@ MODULE_SUMMARY_jsc_common= Java shared packages for NGINX Unit
MODULE_VERSION_jsc_common= $(VERSION)
MODULE_RELEASE_jsc_common= 1
ifneq (,$(findstring $(CODENAME),hirsute groovy focal eoan disco buster bullseye))
JAVA_MINVERSION= 11
else
ifneq (,$(findstring $(CODENAME),stretch xenial bionic))
JAVA_MINVERSION= 8
else
JAVA_MINVERSION= 11
endif
MODULE_CONFARGS_jsc_common= java --home=/usr/lib/jvm/java-$(JAVA_MINVERSION)-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/

71
pkg/deb/Makefile.jsc18 Normal file
View File

@@ -0,0 +1,71 @@
MODULES+= jsc18
MODULE_SUFFIX_jsc18= jsc18
MODULE_SUMMARY_jsc18= Java 18 module for NGINX Unit
MODULE_VERSION_jsc18= $(VERSION)
MODULE_RELEASE_jsc18= 1
MODULE_CONFARGS_jsc18= java --module=java18 --home=/usr/lib/jvm/java-18-openjdk-$$\(DEB_HOST_ARCH\) --jars=/usr/share/unit-jsc-common/
MODULE_MAKEARGS_jsc18= java18
MODULE_INSTARGS_jsc18= java18-install
MODULE_SOURCES_jsc18= unit.example-jsc-app \
unit.example-jsc18-config
BUILD_DEPENDS_jsc18= openjdk-18-jdk-headless openjdk-18-jre-headless
BUILD_DEPENDS+= $(BUILD_DEPENDS_jsc18)
MODULE_BUILD_DEPENDS_jsc18=,openjdk-18-jdk-headless
MODULE_DEPENDS_jsc18=,openjdk-18-jre-headless,unit-jsc-common (= $(MODULE_VERSION_jsc_common)-$(MODULE_RELEASE_jsc_common)~$(CODENAME))
define MODULE_PREINSTALL_jsc18
mkdir -p debian/unit-jsc18/usr/share/doc/unit-jsc18/examples/jsc-app
install -m 644 -p debian/unit.example-jsc-app debian/unit-jsc18/usr/share/doc/unit-jsc18/examples/jsc-app/index.jsp
install -m 644 -p debian/unit.example-jsc18-config debian/unit-jsc18/usr/share/doc/unit-jsc18/examples/unit.config
install -m 644 -p src/java/README.JSR-340 debian/unit-jsc18/usr/share/doc/unit-jsc18/
endef
export MODULE_PREINSTALL_jsc18
define MODULE_POSTINSTALL_jsc18
cd $$\(BUILDDIR_unit\) \&\& \
DESTDIR=$$\(INSTALLDIR\) make java-shared-uninstall
endef
export MODULE_POSTINSTALL_jsc18
define MODULE_POST_jsc18
cat <<BANNER
----------------------------------------------------------------------
The $(MODULE_SUMMARY_jsc18) has been installed.
To check out the sample app, run these commands:
sudo service unit restart
cd /usr/share/doc/unit-$(MODULE_SUFFIX_jsc18)/examples
sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
curl http://localhost:8800/
Online documentation is available at https://unit.nginx.org
NOTICE:
This version of Unit code is made available in support of the open source
development process. This is an intermediate build made available for
testing purposes only. This Unit code is untested and presumed incompatible
with the JSR 340 Java Servlet 3.1 specification. You should not deploy or
write to this code. You should instead deploy and write production
applications on pre-built binaries that have been tested and certified
to meet the JSR-340 compatibility requirements such as certified binaries
published for the JSR-340 reference implementation available at
https://javaee.github.io/glassfish/.
Redistribution of any Intermediate Build must retain this notice.
Oracle and Java are registered trademarks of Oracle and/or its affiliates.
Other names may be trademarks of their respective owners.
----------------------------------------------------------------------
BANNER
endef
export MODULE_POST_jsc18

46
pkg/deb/Makefile.python310 Normal file
View File

@@ -0,0 +1,46 @@
MODULES+= python310
MODULE_SUFFIX_python310= python3.10
MODULE_SUMMARY_python310= Python 3.10 module for NGINX Unit
MODULE_VERSION_python310= $(VERSION)
MODULE_RELEASE_python310= 1
MODULE_CONFARGS_python310= python --config=python3.10-config
MODULE_MAKEARGS_python310= python3.10
MODULE_INSTARGS_python310= python3.10-install
MODULE_SOURCES_python310= unit.example-python-app \
unit.example-python3.10-config
BUILD_DEPENDS_python310= python3.10-dev
BUILD_DEPENDS+= $(BUILD_DEPENDS_python310)
MODULE_BUILD_DEPENDS_python310=,python3.10-dev
define MODULE_PREINSTALL_python310
mkdir -p debian/unit-python3.10/usr/share/doc/unit-python3.10/examples/python-app
install -m 644 -p debian/unit.example-python-app debian/unit-python3.10/usr/share/doc/unit-python3.10/examples/python-app/wsgi.py
install -m 644 -p debian/unit.example-python3.10-config debian/unit-python3.10/usr/share/doc/unit-python3.10/examples/unit.config
endef
export MODULE_PREINSTALL_python310
define MODULE_POST_python310
cat <<BANNER
----------------------------------------------------------------------
The $(MODULE_SUMMARY_python310) has been installed.
To check out the sample app, run these commands:
sudo service unit restart
cd /usr/share/doc/unit-$(MODULE_SUFFIX_python310)/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_python310

15
pkg/deb/debian.module/unit.example-jsc18-config Normal file
View File

@@ -0,0 +1,15 @@
{
"applications": {
"example_java18": {
"processes": 1,
"type": "java 18",
"webapp": "/usr/share/doc/unit-jsc18/examples/jsc-app"
}
},
"listeners": {
"*:8800": {
"pass": "applications/example_java18"
}
}
}

16
pkg/deb/debian.module/unit.example-python3.10-config Normal file
View File

@@ -0,0 +1,16 @@
{
"applications": {
"example_python": {
"type": "python 3.10",
"processes": 2,
"path": "/usr/share/doc/unit-python3.10/examples/python-app",
"module": "wsgi"
}
},
"listeners": {
"*:8400": {
"pass": "applications/example_python"
}
}
}