From 3d712a7078e6cd85dc7f2961628bea46cfea5236 Mon Sep 17 00:00:00 2001 From: Max Romanov Date: Tue, 24 Dec 2019 17:59:44 +0300 Subject: Packages: making unit-go architecture independent. To support Go modules, the unit-go module should be platform independent. All platform-dependent logic is moved to libunit, so the unit-dev package should be installed before building unit-go. --- pkg/deb/debian.module/unit.example-go1.10-config | 15 --------------- pkg/deb/debian.module/unit.example-go1.11-config | 15 --------------- pkg/deb/debian.module/unit.example-go1.12-config | 15 --------------- pkg/deb/debian.module/unit.example-go1.13-config | 15 --------------- pkg/deb/debian.module/unit.example-go1.7-config | 15 --------------- pkg/deb/debian.module/unit.example-go1.8-config | 15 --------------- pkg/deb/debian.module/unit.example-go1.9-config | 15 --------------- 7 files changed, 105 deletions(-) delete mode 100644 pkg/deb/debian.module/unit.example-go1.10-config delete mode 100644 pkg/deb/debian.module/unit.example-go1.11-config delete mode 100644 pkg/deb/debian.module/unit.example-go1.12-config delete mode 100644 pkg/deb/debian.module/unit.example-go1.13-config delete mode 100644 pkg/deb/debian.module/unit.example-go1.7-config delete mode 100644 pkg/deb/debian.module/unit.example-go1.8-config delete mode 100644 pkg/deb/debian.module/unit.example-go1.9-config (limited to 'pkg/deb/debian.module') diff --git a/pkg/deb/debian.module/unit.example-go1.10-config b/pkg/deb/debian.module/unit.example-go1.10-config deleted file mode 100644 index 61790b73..00000000 --- a/pkg/deb/debian.module/unit.example-go1.10-config +++ /dev/null @@ -1,15 +0,0 @@ -{ - "applications": { - "example_go": { - "type": "external", - "user": "nobody", - "executable": "/tmp/go1.10-app" - } - }, - - "listeners": { - "*:8500": { - "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 deleted file mode 100644 index 5e063a4c..00000000 --- a/pkg/deb/debian.module/unit.example-go1.11-config +++ /dev/null @@ -1,15 +0,0 @@ -{ - "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.12-config b/pkg/deb/debian.module/unit.example-go1.12-config deleted file mode 100644 index b49f0aba..00000000 --- a/pkg/deb/debian.module/unit.example-go1.12-config +++ /dev/null @@ -1,15 +0,0 @@ -{ - "applications": { - "example_go": { - "type": "external", - "user": "nobody", - "executable": "/tmp/go1.12-app" - } - }, - - "listeners": { - "*:8500": { - "pass": "applications/example_go" - } - } -} diff --git a/pkg/deb/debian.module/unit.example-go1.13-config b/pkg/deb/debian.module/unit.example-go1.13-config deleted file mode 100644 index 7dbffb17..00000000 --- a/pkg/deb/debian.module/unit.example-go1.13-config +++ /dev/null @@ -1,15 +0,0 @@ -{ - "applications": { - "example_go": { - "type": "external", - "user": "nobody", - "executable": "/tmp/go1.13-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 deleted file mode 100644 index e1a8e1a4..00000000 --- a/pkg/deb/debian.module/unit.example-go1.7-config +++ /dev/null @@ -1,15 +0,0 @@ -{ - "applications": { - "example_go": { - "type": "external", - "user": "nobody", - "executable": "/tmp/go1.7-app" - } - }, - - "listeners": { - "*:8500": { - "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 deleted file mode 100644 index e570f38c..00000000 --- a/pkg/deb/debian.module/unit.example-go1.8-config +++ /dev/null @@ -1,15 +0,0 @@ -{ - "applications": { - "example_go": { - "type": "external", - "user": "nobody", - "executable": "/tmp/go1.8-app" - } - }, - - "listeners": { - "*:8500": { - "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 deleted file mode 100644 index 90ef7d5f..00000000 --- a/pkg/deb/debian.module/unit.example-go1.9-config +++ /dev/null @@ -1,15 +0,0 @@ -{ - "applications": { - "example_go": { - "type": "external", - "user": "nobody", - "executable": "/tmp/go1.9-app" - } - }, - - "listeners": { - "*:8500": { - "pass": "applications/example_go" - } - } -} -- cgit From f5a2984acf9a562b6b1eb45a21d9af2be2415659 Mon Sep 17 00:00:00 2001 From: Max Romanov Date: Tue, 24 Dec 2019 17:59:52 +0300 Subject: Go: moving source files to the root of the project. This patch includes packaging changes related to files move. --- pkg/deb/debian.module/rules-noarch.in | 1 + pkg/deb/debian.module/rules.in | 1 + 2 files changed, 2 insertions(+) (limited to 'pkg/deb/debian.module') diff --git a/pkg/deb/debian.module/rules-noarch.in b/pkg/deb/debian.module/rules-noarch.in index 823675ba..a24602c4 100644 --- a/pkg/deb/debian.module/rules-noarch.in +++ b/pkg/deb/debian.module/rules-noarch.in @@ -27,6 +27,7 @@ config.env.%: cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/ touch $@ configure.unit: config.env.unit diff --git a/pkg/deb/debian.module/rules.in b/pkg/deb/debian.module/rules.in index 1391e01a..8ee277b3 100755 --- a/pkg/deb/debian.module/rules.in +++ b/pkg/deb/debian.module/rules.in @@ -27,6 +27,7 @@ config.env.%: cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/ cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/ + cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/ touch $@ configure.unit: config.env.unit -- cgit From 693a458b4ea87b7b387bd9d094de2b42be7ecdbd Mon Sep 17 00:00:00 2001 From: Max Romanov Date: Wed, 25 Dec 2019 20:00:32 +0300 Subject: Go: changing import name for "unit.nginx.org/go". This patch includes packaging changes - update unit-go installation directory. --- pkg/deb/debian.module/unit.example-go-app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/deb/debian.module') diff --git a/pkg/deb/debian.module/unit.example-go-app b/pkg/deb/debian.module/unit.example-go-app index 7ca0c9fd..6eec1dbb 100644 --- a/pkg/deb/debian.module/unit.example-go-app +++ b/pkg/deb/debian.module/unit.example-go-app @@ -3,7 +3,7 @@ package main import ( "fmt" "net/http" - "nginx/unit" + "unit.nginx.org/go" ) func handler(w http.ResponseWriter, r *http.Request) { -- cgit