mf-hosting 2.5.0 → 2.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +21 -12
  2. package/pkg/nginx.conf +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mf-hosting",
3
- "version": "2.5.0",
3
+ "version": "2.7.0",
4
4
  "files": [
5
5
  ".releaserc.json",
6
6
  "pkg/hooks.sh",
@@ -18,10 +18,10 @@
18
18
  "semantic-release-config"
19
19
  ],
20
20
  "devDependencies": {
21
- "@semantic-release/commit-analyzer": "^12.0.0",
21
+ "@semantic-release/commit-analyzer": "^13.0.0",
22
22
  "@semantic-release/exec": "^6.0.3",
23
- "@semantic-release/github": "^10.3.2",
24
- "@semantic-release/release-notes-generator": "^13.0.0",
23
+ "@semantic-release/github": "^10.3.5",
24
+ "@semantic-release/release-notes-generator": "^14.0.1",
25
25
  "semantic-release": "^24.1.1"
26
26
  },
27
27
  "repository": {
@@ -39,7 +39,8 @@
39
39
  "properties": {
40
40
  "systemd": true,
41
41
  "nginx": true,
42
- "nginx.sites.dir": "/etc/nginx/sites/common/"
42
+ "nginx.sites.dir": "/etc/nginx/sites/common/",
43
+ "nginx.content.dir": "/srv/http/"
43
44
  },
44
45
  "arch": [
45
46
  "aarch64"
@@ -57,18 +58,25 @@
57
58
  "properties": {
58
59
  "systemd": true,
59
60
  "nginx": true,
60
- "nginx.sites.dir": "/etc/nginx/sites-available/"
61
+ "nginx.content.dir": "/var/www/html/"
61
62
  },
62
63
  "arch": [
63
64
  "aarch64",
64
65
  "x86_64"
65
- ]
66
+ ],
67
+ "dependencies": {
68
+ "systemd": ">=252.30",
69
+ "nginx": ">=1.22.1"
70
+ },
71
+ "content": {
72
+ "${nginx.sites.dir}${name}.conf": "pkg/nginx.conf",
73
+ "${systemd.unit.dir}${name}.socket": "pkg/systemd.socket"
74
+ }
66
75
  },
67
76
  "rpm": {
68
77
  "properties": {
69
78
  "systemd": true,
70
- "nginx": true,
71
- "nginx.sites.dir": "/etc/nginx/sites-available/"
79
+ "nginx": true
72
80
  },
73
81
  "arch": [
74
82
  "aarch64"
@@ -77,8 +85,7 @@
77
85
  "docker": {
78
86
  "properties": {
79
87
  "install.dir": "/app",
80
- "workdir": "${install.dir}",
81
- "nginx.sites.dir": "/etc/nginx/sites-available/"
88
+ "workdir": "${install.dir}"
82
89
  },
83
90
  "dependencies": {
84
91
  "node": "lts-slim"
@@ -121,13 +128,15 @@
121
128
  "tmpfiles.config.dir": "/usr/lib/tmpfiles.d/",
122
129
  "var.dir": "/var/lib/${name}/",
123
130
  "variant": "mf.linux",
124
- "well-known.content.dir": "/srv/http/.well-known/",
131
+ "well-known.content.dir": "${nginx.content.dir}.well-known/",
125
132
  "wss.api": "${wss.origin}${http.api.path}",
126
133
  "wss.origin": "${http.origin}",
127
134
  "node.exe": "/usr/bin/node",
128
135
  "bun.exe": "/usr/bin/bun",
136
+ "nginx.location.header": "",
129
137
  "nginx.location.trailer": "",
130
138
  "nginx.server.extra": "",
139
+ "nginx.sites.dir": "/etc/nginx/sites-available/",
131
140
  "csp.header": "",
132
141
  "cache-control.header": "private,no-store"
133
142
  },
package/pkg/nginx.conf CHANGED
@@ -1,5 +1,5 @@
1
1
  location {{http.path}} {
2
- rewrite {{http.path}}(.*) $1 break;
2
+ {{nginx.location.header}} rewrite {{http.path}}(.*) $1 break;
3
3
  proxy_set_header X-Real-IP $remote_addr;
4
4
  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
5
5
  proxy_set_header Host $http_host;