Merged with the default branch.1.14.0-1

10 files changed, 3 insertions, 106 deletions

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
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) {
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"
-		}
-	}
-}