diff options
-rw-r--r-- | pkg/rpm/Makefile | 27 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python | 5 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python27 | 50 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python34 | 50 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python35 | 50 | ||||
-rw-r--r-- | pkg/rpm/Makefile.python36 | 50 | ||||
-rw-r--r-- | pkg/rpm/rpmbuild/SOURCES/unit.example-python27-config | 17 | ||||
-rw-r--r-- | pkg/rpm/rpmbuild/SOURCES/unit.example-python34-config | 17 | ||||
-rw-r--r-- | pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config | 17 | ||||
-rw-r--r-- | pkg/rpm/rpmbuild/SOURCES/unit.example-python36-config | 17 | ||||
-rw-r--r-- | pkg/rpm/unit.module.spec.in | 2 | ||||
-rw-r--r-- | pkg/rpm/unit.spec.in | 2 |
12 files changed, 302 insertions, 2 deletions
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index aad26a5a..a5d463c9 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -11,8 +11,33 @@ RELEASE ?= $(DEFAULT_RELEASE) BUILD_DEPENDS_unit = libxml2 libxslt rpm-build rpmlint BUILD_DEPENDS = $(BUILD_DEPENDS_unit) +ifeq ($(shell rpm --eval "%{?rhel}"), 6) +OSVER = centos6 +else ifeq ($(shell rpm --eval "%{?rhel}"), 7) +OSVER = centos7 +else ifeq ($(shell rpm --eval "%{?amzn}"), 1) +OSVER = amazonlinux1 +BUILD_DEPENDS += system-rpm-config +else ifeq ($(shell rpm --eval "%{?amzn}"), 2) +OSVER = amazonlinux2 +endif + MODULES= --include Makefile.* + +ifneq (,$(findstring $(OSVER),centos6 centos7 amazonlinux2)) +include Makefile.php +include Makefile.python +include Makefile.go +endif + +ifeq ($(OSVER), amazonlinux1) +include Makefile.php +include Makefile.python27 +include Makefile.python34 +include Makefile.python35 +include Makefile.python36 +include Makefile.go +endif CONFIGURE_ARGS=\ --prefix=/usr \ diff --git a/pkg/rpm/Makefile.python b/pkg/rpm/Makefile.python index 21ba8a5d..f13179b5 100644 --- a/pkg/rpm/Makefile.python +++ b/pkg/rpm/Makefile.python @@ -12,7 +12,12 @@ MODULE_INSTARGS_python= python-install MODULE_SOURCES_python= unit.example-python-app \ unit.example-python-config +ifeq ($(shell rpm --eval "%{?amzn}"), 1) +BUILD_DEPENDS_python= python26-devel +else BUILD_DEPENDS_python= python-devel +endif + BUILD_DEPENDS+= $(BUILD_DEPENDS_python) define MODULE_PREINSTALL_python diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27 new file mode 100644 index 00000000..327efff8 --- /dev/null +++ b/pkg/rpm/Makefile.python27 @@ -0,0 +1,50 @@ +MODULES+= python27 + +MODULE_SUMMARY_python27= Python 2.7 module for NGINX Unit + +MODULE_VERSION_python27= $(VERSION) +MODULE_RELEASE_python27= 1 + +MODULE_CONFARGS_python27= python --config=python2.7-config +MODULE_MAKEARGS_python27= python2.7 +MODULE_INSTARGS_python27= python2.7-install + +MODULE_SOURCES_python27= unit.example-python-app \ + unit.example-python27-config + +BUILD_DEPENDS_python27= python27-devel +BUILD_DEPENDS+= $(BUILD_DEPENDS_python27) + +define MODULE_PREINSTALL_python27 +%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python27/examples/python-app +%{__install} -m 644 -p %{SOURCE100} \ + %{buildroot}%{_datadir}/doc/unit-python27/examples/python-app/wsgi.py +%{__install} -m 644 -p %{SOURCE101} \ + %{buildroot}%{_datadir}/doc/unit-python27/examples/unit.config +endef +export MODULE_PREINSTALL_python27 + +define MODULE_FILES_python27 +%{_libdir}/unit/modules/* +%{_libdir}/unit/debug-modules/* +endef +export MODULE_FILES_python27 + +define MODULE_POST_python27 +cat <<BANNER +---------------------------------------------------------------------- + +The $(MODULE_SUMMARY_python27) has been installed. + +To check the sample app, run these commands: + + sudo service unit start + sudo service unit loadconfig /usr/share/doc/unit-python27/examples/unit.config + curl http://localhost:8400/ + +Online documentation is available at https://unit.nginx.org + +---------------------------------------------------------------------- +BANNER +endef +export MODULE_POST_python27 diff --git a/pkg/rpm/Makefile.python34 b/pkg/rpm/Makefile.python34 new file mode 100644 index 00000000..f6a5b744 --- /dev/null +++ b/pkg/rpm/Makefile.python34 @@ -0,0 +1,50 @@ +MODULES+= python34 + +MODULE_SUMMARY_python34= Python 3.4 module for NGINX Unit + +MODULE_VERSION_python34= $(VERSION) +MODULE_RELEASE_python34= 1 + +MODULE_CONFARGS_python34= python --config=python3.4-config +MODULE_MAKEARGS_python34= python3.4 +MODULE_INSTARGS_python34= python3.4-install + +MODULE_SOURCES_python34= unit.example-python-app \ + unit.example-python34-config + +BUILD_DEPENDS_python34= python34-devel +BUILD_DEPENDS+= $(BUILD_DEPENDS_python34) + +define MODULE_PREINSTALL_python34 +%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python34/examples/python-app +%{__install} -m 644 -p %{SOURCE100} \ + %{buildroot}%{_datadir}/doc/unit-python34/examples/python-app/wsgi.py +%{__install} -m 644 -p %{SOURCE101} \ + %{buildroot}%{_datadir}/doc/unit-python34/examples/unit.config +endef +export MODULE_PREINSTALL_python34 + +define MODULE_FILES_python34 +%{_libdir}/unit/modules/* +%{_libdir}/unit/debug-modules/* +endef +export MODULE_FILES_python34 + +define MODULE_POST_python34 +cat <<BANNER +---------------------------------------------------------------------- + +The $(MODULE_SUMMARY_python34) has been installed. + +To check the sample app, run these commands: + + sudo service unit start + sudo service unit loadconfig /usr/share/doc/unit-python34/examples/unit.config + curl http://localhost:8400/ + +Online documentation is available at https://unit.nginx.org + +---------------------------------------------------------------------- +BANNER +endef +export MODULE_POST_python34 diff --git a/pkg/rpm/Makefile.python35 b/pkg/rpm/Makefile.python35 new file mode 100644 index 00000000..fc71398d --- /dev/null +++ b/pkg/rpm/Makefile.python35 @@ -0,0 +1,50 @@ +MODULES+= python35 + +MODULE_SUMMARY_python35= Python 3.5 module for NGINX Unit + +MODULE_VERSION_python35= $(VERSION) +MODULE_RELEASE_python35= 1 + +MODULE_CONFARGS_python35= python --config=python3.5-config +MODULE_MAKEARGS_python35= python3.5 +MODULE_INSTARGS_python35= python3.5-install + +MODULE_SOURCES_python35= unit.example-python-app \ + unit.example-python35-config + +BUILD_DEPENDS_python35= python35-devel +BUILD_DEPENDS+= $(BUILD_DEPENDS_python35) + +define MODULE_PREINSTALL_python35 +%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python35/examples/python-app +%{__install} -m 644 -p %{SOURCE100} \ + %{buildroot}%{_datadir}/doc/unit-python35/examples/python-app/wsgi.py +%{__install} -m 644 -p %{SOURCE101} \ + %{buildroot}%{_datadir}/doc/unit-python35/examples/unit.config +endef +export MODULE_PREINSTALL_python35 + +define MODULE_FILES_python35 +%{_libdir}/unit/modules/* +%{_libdir}/unit/debug-modules/* +endef +export MODULE_FILES_python35 + +define MODULE_POST_python35 +cat <<BANNER +---------------------------------------------------------------------- + +The $(MODULE_SUMMARY_python35) has been installed. + +To check the sample app, run these commands: + + sudo service unit start + sudo service unit loadconfig /usr/share/doc/unit-python35/examples/unit.config + curl http://localhost:8400/ + +Online documentation is available at https://unit.nginx.org + +---------------------------------------------------------------------- +BANNER +endef +export MODULE_POST_python35 diff --git a/pkg/rpm/Makefile.python36 b/pkg/rpm/Makefile.python36 new file mode 100644 index 00000000..9d7cd065 --- /dev/null +++ b/pkg/rpm/Makefile.python36 @@ -0,0 +1,50 @@ +MODULES+= python36 + +MODULE_SUMMARY_python36= Python 3.6 module for NGINX Unit + +MODULE_VERSION_python36= $(VERSION) +MODULE_RELEASE_python36= 1 + +MODULE_CONFARGS_python36= python --config=python3.6-config +MODULE_MAKEARGS_python36= python3.6 +MODULE_INSTARGS_python36= python3.6-install + +MODULE_SOURCES_python36= unit.example-python-app \ + unit.example-python36-config + +BUILD_DEPENDS_python36= python36-devel +BUILD_DEPENDS+= $(BUILD_DEPENDS_python36) + +define MODULE_PREINSTALL_python36 +%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python36/examples/python-app +%{__install} -m 644 -p %{SOURCE100} \ + %{buildroot}%{_datadir}/doc/unit-python36/examples/python-app/wsgi.py +%{__install} -m 644 -p %{SOURCE101} \ + %{buildroot}%{_datadir}/doc/unit-python36/examples/unit.config +endef +export MODULE_PREINSTALL_python36 + +define MODULE_FILES_python36 +%{_libdir}/unit/modules/* +%{_libdir}/unit/debug-modules/* +endef +export MODULE_FILES_python36 + +define MODULE_POST_python36 +cat <<BANNER +---------------------------------------------------------------------- + +The $(MODULE_SUMMARY_python36) has been installed. + +To check the sample app, run these commands: + + sudo service unit start + sudo service unit loadconfig /usr/share/doc/unit-python36/examples/unit.config + curl http://localhost:8400/ + +Online documentation is available at https://unit.nginx.org + +---------------------------------------------------------------------- +BANNER +endef +export MODULE_POST_python36 diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python27-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python27-config new file mode 100644 index 00000000..11a11bcf --- /dev/null +++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-python27-config @@ -0,0 +1,17 @@ +{ + "applications": { + "example_python": { + "type": "python 2.7", + "user": "nobody", + "workers": 2, + "path": "/usr/share/doc/unit-python27/examples/python-app", + "module": "wsgi" + } + }, + + "listeners": { + "*:8400": { + "application": "example_python" + } + } +} diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python34-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python34-config new file mode 100644 index 00000000..4adf2d7a --- /dev/null +++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-python34-config @@ -0,0 +1,17 @@ +{ + "applications": { + "example_python": { + "type": "python 3.4", + "user": "nobody", + "workers": 2, + "path": "/usr/share/doc/unit-python34/examples/python-app", + "module": "wsgi" + } + }, + + "listeners": { + "*:8400": { + "application": "example_python" + } + } +} diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config new file mode 100644 index 00000000..651e1437 --- /dev/null +++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-python35-config @@ -0,0 +1,17 @@ +{ + "applications": { + "example_python": { + "type": "python 3.5", + "user": "nobody", + "workers": 2, + "path": "/usr/share/doc/unit-python35/examples/python-app", + "module": "wsgi" + } + }, + + "listeners": { + "*:8400": { + "application": "example_python" + } + } +} diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-python36-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-python36-config new file mode 100644 index 00000000..e662a6a9 --- /dev/null +++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-python36-config @@ -0,0 +1,17 @@ +{ + "applications": { + "example_python": { + "type": "python 3.6", + "user": "nobody", + "workers": 2, + "path": "/usr/share/doc/unit-python36/examples/python-app", + "module": "wsgi" + } + }, + + "listeners": { + "*:8400": { + "application": "example_python" + } + } +} diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in index d49d079f..c222a0f1 100644 --- a/pkg/rpm/unit.module.spec.in +++ b/pkg/rpm/unit.module.spec.in @@ -3,7 +3,7 @@ %%MODULE_DEFINITIONS%% -%if 0%{?rhel} == 7 +%if (0%{?rhel} == 7 && 0%{?amzn} == 0) %define dist .el7 %endif diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 45e93dfd..e44c3952 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -10,8 +10,10 @@ Requires: initscripts >= 8.36 %if 0%{?rhel} == 7 Requires: systemd BuildRequires: systemd-units +%if 0%{?amzn} == 0 %define dist .el7 %endif +%endif %if 0%{?suse_version} == 1315 BuildRequires: systemd |