diff --git a/docs/Makefile b/docs/Makefile index 51f3108d..5bc503b9 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -9,7 +9,8 @@ PACKAGES= unit \ unit-php \ unit-python unit-python2.7 unit-python3.4 \ unit-python3.5 unit-python3.6 \ - unit-go unit-go1.7 unit-go1.8 unit-go1.9 + unit-go unit-go1.7 unit-go1.8 unit-go1.9 \ + unit-perl all: changes changelogs diff --git a/docs/changes.xml b/docs/changes.xml index 7909f7c7..13a9d254 100644 --- a/docs/changes.xml +++ b/docs/changes.xml @@ -5,6 +5,19 @@ + + + + +Initial release of Perl module for NGINX Unit. + + + + + + diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index b0daebeb..1f941b44 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -24,6 +24,7 @@ include Makefile.python27 include Makefile.python36 include Makefile.go18 include Makefile.go19 +include Makefile.perl endif # Ubuntu 17.04 @@ -33,6 +34,7 @@ include Makefile.python27 include Makefile.python35 include Makefile.go17 include Makefile.go18 +include Makefile.perl endif # Ubuntu 16.04 @@ -41,12 +43,14 @@ include Makefile.php include Makefile.python27 include Makefile.python35 include Makefile.go +include Makefile.perl endif # Ubuntu 14.04 ifeq ($(CODENAME),trusty) include Makefile.php include Makefile.python +include Makefile.perl endif # Debian 9 @@ -56,6 +60,7 @@ include Makefile.python27 include Makefile.python35 include Makefile.go17 include Makefile.go18 +include Makefile.perl endif # Debian 8 @@ -63,6 +68,7 @@ ifeq ($(CODENAME),jessie) include Makefile.php include Makefile.python27 include Makefile.python34 +include Makefile.perl endif CONFIGURE_ARGS=\ diff --git a/pkg/deb/Makefile.perl b/pkg/deb/Makefile.perl new file mode 100644 index 00000000..a6106de0 --- /dev/null +++ b/pkg/deb/Makefile.perl @@ -0,0 +1,45 @@ +MODULES+= perl +MODULE_SUFFIX_perl= perl + +MODULE_SUMMARY_perl= Perl module for NGINX Unit + +MODULE_VERSION_perl= $(VERSION) +MODULE_RELEASE_perl= 1 + +MODULE_CONFARGS_perl= perl +MODULE_MAKEARGS_perl= perl +MODULE_INSTARGS_perl= perl-install + +MODULE_SOURCES_perl= unit.example-perl-app \ + unit.example-perl-config + +BUILD_DEPENDS_perl= libperl-dev +BUILD_DEPENDS+= $(BUILD_DEPENDS_perl) + +MODULE_BUILD_DEPENDS_perl=,libperl-dev + +define MODULE_PREINSTALL_perl + mkdir -p debian/unit-perl/usr/share/doc/unit-perl/examples/perl-app + install -m 644 -p debian/unit.example-perl-app debian/unit-perl/usr/share/doc/unit-perl/examples/perl-app/index.pl + install -m 644 -p debian/unit.example-perl-config debian/unit-perl/usr/share/doc/unit-perl/examples/unit.config +endef +export MODULE_PREINSTALL_perl + +define MODULE_POST_perl +cat < 'text/plain' ], + [ "Hello from Unit, Perl $^V, environment:\n\n", Dumper($env) ], + ]; +}; diff --git a/pkg/deb/debian.module/unit.example-perl-config b/pkg/deb/debian.module/unit.example-perl-config new file mode 100644 index 00000000..0329b78a --- /dev/null +++ b/pkg/deb/debian.module/unit.example-perl-config @@ -0,0 +1,17 @@ +{ + "applications": { + "example_perl": { + "type": "perl", + "user": "nobody", + "processes": 1, + "working_directory": "/usr/share/doc/unit-perl/examples/perl-app", + "script": "/usr/share/doc/unit-perl/examples/perl-app/index.pl" + } + }, + + "listeners": { + "*:8600": { + "application": "example_perl" + } + } +} diff --git a/pkg/deb/debian/unit.example.config b/pkg/deb/debian/unit.example.config index 6dbae2b6..f3126457 100644 --- a/pkg/deb/debian/unit.example.config +++ b/pkg/deb/debian/unit.example.config @@ -20,6 +20,14 @@ "type": "go", "user": "nobody", "executable": "/tmp/go-app" + }, + + "example_perl": { + "type": "perl", + "user": "nobody", + "processes": 1, + "working_directory": "/usr/share/doc/unit-perl/examples/perl-app", + "script": "/usr/share/doc/unit-perl/examples/perl-app/index.pl" } }, @@ -34,6 +42,10 @@ "*:8500": { "application": "example_go" + }, + + "*:8600": { + "application": "example_perl" } } } diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index 03fa1574..2078fe3b 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -28,6 +28,7 @@ ifneq (,$(findstring $(OSVER),centos6 centos7 amazonlinux2)) include Makefile.php include Makefile.python include Makefile.go +include Makefile.perl endif ifeq ($(OSVER), amazonlinux1) @@ -37,6 +38,7 @@ include Makefile.python34 include Makefile.python35 include Makefile.python36 include Makefile.go +include Makefile.perl endif CONFIGURE_ARGS=\ diff --git a/pkg/rpm/Makefile.perl b/pkg/rpm/Makefile.perl new file mode 100644 index 00000000..b92ea6c7 --- /dev/null +++ b/pkg/rpm/Makefile.perl @@ -0,0 +1,50 @@ +MODULES+= perl + +MODULE_SUMMARY_perl= Perl module for NGINX Unit + +MODULE_VERSION_perl= $(VERSION) +MODULE_RELEASE_perl= 1 + +MODULE_CONFARGS_perl= perl +MODULE_MAKEARGS_perl= perl +MODULE_INSTARGS_perl= perl-install + +MODULE_SOURCES_perl= unit.example-perl-app \ + unit.example-perl-config + +BUILD_DEPENDS_perl= perl-devel perl-libs +BUILD_DEPENDS+= $(BUILD_DEPENDS_perl) + +define MODULE_PREINSTALL_perl +%{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-perl/examples/perl-app +%{__install} -m 644 -p %{SOURCE100} \ + %{buildroot}%{_datadir}/doc/unit-perl/examples/perl-app/index.pl +%{__install} -m 644 -p %{SOURCE101} \ + %{buildroot}%{_datadir}/doc/unit-perl/examples/unit.config +endef +export MODULE_PREINSTALL_perl + +define MODULE_FILES_perl +%{_libdir}/unit/modules/* +%{_libdir}/unit/debug-modules/* +endef +export MODULE_FILES_perl + +define MODULE_POST_perl +cat < 'text/plain' ], + [ "Hello from Unit, Perl $^V, environment:\n\n", Dumper($env) ], + ]; +}; diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-perl-config b/pkg/rpm/rpmbuild/SOURCES/unit.example-perl-config new file mode 100644 index 00000000..0329b78a --- /dev/null +++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-perl-config @@ -0,0 +1,17 @@ +{ + "applications": { + "example_perl": { + "type": "perl", + "user": "nobody", + "processes": 1, + "working_directory": "/usr/share/doc/unit-perl/examples/perl-app", + "script": "/usr/share/doc/unit-perl/examples/perl-app/index.pl" + } + }, + + "listeners": { + "*:8600": { + "application": "example_perl" + } + } +} diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example.config b/pkg/rpm/rpmbuild/SOURCES/unit.example.config index 15fb86f1..a5f31ced 100644 --- a/pkg/rpm/rpmbuild/SOURCES/unit.example.config +++ b/pkg/rpm/rpmbuild/SOURCES/unit.example.config @@ -20,6 +20,14 @@ "type": "go", "user": "nobody", "executable": "/tmp/go-app" + }, + + "example_perl": { + "type": "perl", + "user": "nobody", + "processes": 1, + "working_directory": "/usr/share/doc/unit-perl/examples/perl-app", + "script": "/usr/share/doc/unit-perl/examples/perl-app/index.pl" } }, @@ -34,6 +42,10 @@ "*:8500": { "application": "example_go" + }, + + "*:8600": { + "application": "example_perl" } } }