jonny/chatbridge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' of https://git.jon-e.net/jonny/chatbridge

Browse source
This commit is contained in:
ansible user/allowed to read system logs 2023-07-25 23:21:43 -07:00
commit 174904857a
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/package.json
View file

@ -19,7 +19,7 @@
"web-vitals": "^2.1.4" "web-vitals": "^2.1.4"
}, },
"scripts": { "scripts": {
"start": "NODE_ENV=development webpack serve -c ./config/webpack.dev.js --mode development", "start": "NODE_ENV=development webpack -c ./config/webpack.dev.js --mode development",
"build": "NODE_ENV=production webpack --config ./config/webpack.prod.js", "build": "NODE_ENV=production webpack --config ./config/webpack.prod.js",
"test": "react-scripts test", "test": "react-scripts test",
"eject": "react-scripts eject" "eject": "react-scripts eject"

4
roles/chatbridge/defaults/main.yml
View file

@ -1,5 +1,9 @@
--- ---
# defaults file for chatbridge # defaults file for chatbridge
CHATBRIDGE_MODE: development
# development options
chatbridge_webpack_port: 8080
chatbridge_postgres_user: chatbridge chatbridge_postgres_user: chatbridge
chatbridge_postgres_password: CHANGEME chatbridge_postgres_password: CHANGEME

8
roles/chatbridge/templates/nginx_chatbridge_http.conf.j2
View file

@ -7,6 +7,13 @@ server {
proxy_pass http://127.0.0.1:{{ chatbridge_api_port }}/; proxy_pass http://127.0.0.1:{{ chatbridge_api_port }}/;
} }
{% if CHATBRIDGE_MODE == "development" %}
location {{ chatbridge_webroot }}/ {
proxy_pass http://127.0.0.1:{{ chatbridge_webpack_port }}/;
}
{% else %}
location {{ chatbridge_webroot }} { location {{ chatbridge_webroot }} {
root {{ chatbridge_user_home }}/public; root {{ chatbridge_user_home }}/public;
try_files $uri $uri/ $uri/index.html /index.html index.html; try_files $uri $uri/ $uri/index.html /index.html index.html;
@ -17,5 +24,6 @@ server {
root {{ chatbridge_user_home }}/public; root {{ chatbridge_user_home }}/public;
try_files $uri $uri/ $uri/index.html =404; try_files $uri $uri/ $uri/index.html =404;
} }
{% endif %}
} }

6
server/src/services/groupConfig.service.ts
View file

@ -6,6 +6,6 @@ import {Group} from "../entities/group.entity";
import {AppDataSource} from "../db/data-source"; import {AppDataSource} from "../db/data-source";
export const updateGroup = async(name:string){ // export const updateGroup = async(name:string){
//
} // }