Skip to content

Commit 03979e5

Browse files
zhaojing1987zhaojing1987
authored
Merge pull request #2082 from Websoft9/dev
Merge the Dev branch
2 parents 0bea4d4 + 1c8daf3 commit 03979e5

45 files changed

Lines changed: 886 additions & 529 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎add_apps.json‎

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,24 @@
11
[
22
{
3-
"name": "safeline",
4-
"trademark": "SafeLine",
3+
"name": "databasus",
4+
"trademark": "Databasus",
55
"release": false,
6-
"fork_url": "https://github.com/chaitin/SafeLine",
7-
"version_from": "swr.cn-east-3.myhuaweicloud.com/chaitin-safeline/safeline-mgt-g",
6+
"fork_url": "https://github.com/databasus/databasus",
7+
"version_from": "https://hub.docker.com/r/databasus/databasus/tags",
88
"edition": [
99
{
1010
"dist": "community",
1111
"version": [
12-
"9.3.2"
12+
"v3.9.0",
13+
"latest"
1314
]
1415
}
1516
],
1617
"requirements": {
1718
"cpu": "2",
1819
"memory": "4",
1920
"disk": "10",
20-
"url": "https://safepoint.cloud"
21-
}
22-
},
23-
{
24-
"name": "moltbot",
25-
"trademark": "Moltbot",
26-
"release": false,
27-
"fork_url": "https://github.com/moltbot/moltbot",
28-
"version_from": "ghcr.io/moltbot/clawdbot:main",
29-
"edition": [
30-
{
31-
"dist": "community",
32-
"version": [
33-
"9.3.2"
34-
]
35-
}
36-
],
37-
"requirements": {
38-
"cpu": "2",
39-
"memory": "4",
40-
"disk": "10",
41-
"url": "https://clawd.bot"
21+
"url": "https://databasus.com"
4222
}
4323
}
4424
]

‎apps/databasus/.env‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
W9_REPO="databasus/databasus"
2+
W9_DIST=community
3+
W9_VERSION="latest"
4+
5+
W9_HTTP_PORT_SET=9001
6+
W9_ID=databasus
7+
W9_HTTP_PORT=4005
8+
W9_URL=internet_ip:$W9_HTTP_PORT_SET
9+
W9_NETWORK=websoft9
10+
11+
#### ----------------------------------------------------------------------------------------- ####

apps/moltbot/CHANGELOG.md renamed to apps/databasus/CHANGELOG.md

File renamed without changes.

apps/moltbot/Notes.md renamed to apps/databasus/Notes.md

File renamed without changes.

‎apps/databasus/docker-compose.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# image,docs: https://databasus.com/installation
2+
3+
services:
4+
databasus:
5+
image: $W9_REPO:$W9_VERSION
6+
container_name: $W9_ID
7+
env_file: .env
8+
ports:
9+
- "$W9_HTTP_PORT_SET:4005"
10+
volumes:
11+
- databasus-data:/databasus-data
12+
restart: unless-stopped
13+
14+
volumes:
15+
databasus-data:
16+
17+
networks:
18+
default:
19+
name: $W9_NETWORK
20+
external: true

apps/moltbot/src/README.md renamed to apps/databasus/src/README.md

File renamed without changes.

‎apps/databasus/src/nginx-proxy.conf.template‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
proxy_busy_buffers_size 512k;
2+
proxy_buffers 4 512k;
3+
proxy_buffer_size 256k;
4+
client_max_body_size 50m;
5+
# override default location /
6+
location / {
7+
add_header X-Served-By $host;
8+
proxy_set_header Host $host;
9+
proxy_set_header X-Forwarded-Scheme $scheme;
10+
proxy_set_header X-Forwarded-Proto $scheme;
11+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
12+
proxy_set_header X-Real-IP $remote_addr;
13+
proxy_pass $forward_scheme://$server:$port$request_uri;
14+
proxy_set_header Upgrade $http_upgrade;
15+
proxy_set_header Connection upgrade;
16+
}
17+
18+
location /console {
19+
proxy_pass http://$server:8080;
20+
proxy_http_version 1.1;
21+
proxy_set_header Host $http_host;
22+
proxy_set_header X-Real-IP $remote_addr;
23+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
24+
proxy_set_header X-Forwarded-Proto $scheme;
25+
}
26+
27+
# for echo some useful information
28+
location / {
29+
default_type text/plain;
30+
return 200 'Hello World';
31+
}
32+
33+
location /oida/ {
34+
# this is the address and port of the ORDS installation
35+
proxy_pass http://127.0.0.1:8080/ords/;
36+
37+
# set Origin to blank to avoid Chrome problems with CORS
38+
proxy_set_header Origin "" ;
39+
40+
# pass along some header variables with the public host name/port/and so on
41+
proxy_set_header Host $host;
42+
proxy_set_header X-Forwarded-Host $host:$server_port;
43+
proxy_set_header X-Real-IP $remote_addr;
44+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
45+
proxy_set_header X-Forwarded-Proto $scheme;
46+
47+
# this reverse proxies any "location" headers being passed in the response
48+
proxy_redirect http://$host/ords/ https://$host/oida/;
49+
50+
# also tell cookies their public path
51+
proxy_cookie_path /ords/ /oida/;
52+
53+
# reverse proxy links included in response (ie from ORDS webservice)
54+
sub_filter_types application/json ;
55+
sub_filter http://$host/ords/ https://$host/oida/;
56+
sub_filter_once off;
57+
}

‎apps/databasus/src/php_exra.ini‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
file_uploads = On
2+
max_input_time = 800
3+
max_execution_time = 300
4+
memory_limit = 600M
5+
upload_max_filesize = 900M
6+
post_max_size = 900M
7+
max_file_uploads = 200
8+
error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT

‎apps/databasus/variables.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"name": "databasus",
3+
"trademark": "Databasus",
4+
"release": false,
5+
"fork_url": "https://github.com/databasus/databasus",
6+
"version_from": "https://hub.docker.com/r/databasus/databasus/tags",
7+
"edition": [
8+
{
9+
"dist": "community",
10+
"version": [
11+
"v3.9.0",
12+
"latest"
13+
]
14+
}
15+
],
16+
"requirements": {
17+
"cpu": "2",
18+
"memory": "4",
19+
"disk": "10",
20+
"url": "https://databasus.com"
21+
}
22+
}

‎apps/erpnext/.env‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
W9_REPO=frappe/erpnext
22
W9_DIST=community
3-
W9_VERSION=v15.34.1
3+
W9_VERSION=v16.7.3
4+
W9_HRMS_BRANCH=version-16
45

56
W9_ID=erpnext
67
W9_POWER_PASSWORD=1PrMxExC45LsCT

0 commit comments

Comments
 (0)