diff options
author | Andrei Belov <defan@nginx.com> | 2018-12-27 11:07:24 +0300 |
---|---|---|
committer | Andrei Belov <defan@nginx.com> | 2018-12-27 11:07:24 +0300 |
commit | be049932b100c7a64c0dd261d21b73ea817f8100 (patch) | |
tree | 054bcbec7759ce50fdaf1d1c8deb430245182053 | |
parent | 325421eac71e83a95edf178fc6ea5ee36c8da1bb (diff) | |
download | unit-be049932b100c7a64c0dd261d21b73ea817f8100.tar.gz unit-be049932b100c7a64c0dd261d21b73ea817f8100.tar.bz2 |
Packages: Ubuntu 18.10 "cosmic" support added.
-rw-r--r-- | docs/Makefile | 2 | ||||
-rw-r--r-- | docs/changes.xml | 13 | ||||
-rw-r--r-- | pkg/deb/Makefile | 12 | ||||
-rw-r--r-- | pkg/deb/Makefile.python37 | 46 | ||||
-rw-r--r-- | pkg/deb/debian.module/unit.example-python3.7-config | 17 |
5 files changed, 89 insertions, 1 deletions
diff --git a/docs/Makefile b/docs/Makefile index 52ed1c65..1f0ba451 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -8,7 +8,7 @@ XSLS?= xslscript.pl PACKAGES= unit \ unit-php \ unit-python unit-python2.7 unit-python3.4 \ - unit-python3.5 unit-python3.6 \ + unit-python3.5 unit-python3.6 unit-python3.7 \ 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 7443795b..6a1f8a9b 100644 --- a/docs/changes.xml +++ b/docs/changes.xml @@ -5,6 +5,19 @@ <change_log title="unit"> +<changes apply="unit-python3.7" ver="1.7" rev="1" + date="2018-12-25" time="10:30:00 +0300" + packager="Andrei Belov <defan@nginx.com>"> + +<change> +<para> +Initial release of Python 3.7 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 2dcf6f50..1a16b6ee 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -17,6 +17,18 @@ BUILD_DEPENDS = $(BUILD_DEPENDS_unit) MODULES= +# Ubuntu 18.10 +ifeq ($(CODENAME),cosmic) +include Makefile.php +include Makefile.python27 +include Makefile.python36 +include Makefile.python37 +include Makefile.go19 +include Makefile.go110 +include Makefile.perl +include Makefile.ruby +endif + # Ubuntu 18.04 ifeq ($(CODENAME),bionic) include Makefile.php diff --git a/pkg/deb/Makefile.python37 b/pkg/deb/Makefile.python37 new file mode 100644 index 00000000..54dd8c4c --- /dev/null +++ b/pkg/deb/Makefile.python37 @@ -0,0 +1,46 @@ +MODULES+= python37 +MODULE_SUFFIX_python37= python3.7 + +MODULE_SUMMARY_python37= Python 3.7 module for NGINX Unit + +MODULE_VERSION_python37= $(VERSION) +MODULE_RELEASE_python37= 1 + +MODULE_CONFARGS_python37= python --config=python3.7-config +MODULE_MAKEARGS_python37= python3.7 +MODULE_INSTARGS_python37= python3.7-install + +MODULE_SOURCES_python37= unit.example-python-app \ + unit.example-python3.7-config + +BUILD_DEPENDS_python37= python3.7-dev +BUILD_DEPENDS+= $(BUILD_DEPENDS_python37) + +MODULE_BUILD_DEPENDS_python37=,python3.7-dev + +define MODULE_PREINSTALL_python37 + mkdir -p debian/unit-python3.7/usr/share/doc/unit-python3.7/examples/python-app + install -m 644 -p debian/unit.example-python-app debian/unit-python3.7/usr/share/doc/unit-python3.7/examples/python-app/wsgi.py + install -m 644 -p debian/unit.example-python3.7-config debian/unit-python3.7/usr/share/doc/unit-python3.7/examples/unit.config +endef +export MODULE_PREINSTALL_python37 + +define MODULE_POST_python37 +cat <<BANNER +---------------------------------------------------------------------- + +The $(MODULE_SUMMARY_python37) has been installed. + +To check out the sample app, run these commands: + + sudo service unit restart + cd /usr/share/doc/unit-$(MODULE_SUFFIX_python37)/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_python37 diff --git a/pkg/deb/debian.module/unit.example-python3.7-config b/pkg/deb/debian.module/unit.example-python3.7-config new file mode 100644 index 00000000..00c24f23 --- /dev/null +++ b/pkg/deb/debian.module/unit.example-python3.7-config @@ -0,0 +1,17 @@ +{ + "applications": { + "example_python": { + "type": "python 3.7", + "user": "nobody", + "processes": 2, + "path": "/usr/share/doc/unit-python3.7/examples/python-app", + "module": "wsgi" + } + }, + + "listeners": { + "*:8400": { + "application": "example_python" + } + } +} |