Skip to content

Commit fd6aec4

Browse files
danc094codetogetherdanc094codetogether
authored
Merge branch 'main' into dev
2 parents 54402d5 + 0f4189f commit fd6aec4

4 files changed

Lines changed: 177 additions & 15 deletions

File tree

‎charts/intel/templates/ai-config.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@ metadata:
99
data:
1010
ai_provider: {{ .Values.ai.provider | quote }}
1111
ai_url: {{ .Values.ai.url | quote }}
12-
{{- end }}
13-
14-
12+
{{- end }}

‎compose/cthq.properties‎

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,40 @@ hq.collab.secret=${INTEL_SECRET}
66
# Fill in values specific to your deployment
77

88
# If you want to run with multiple SSO providers, add their names separated with commas
9-
hq.sso.tenants=github
9+
# hq.sso.tenants=github
1010

1111
# GitHub SSO
12-
hq.sso.github.provider=github
13-
hq.sso.github.label=GitHub
14-
hq.sso.github.client.id=<github_client_id>
15-
hq.sso.github.client.secret=<github_client_secret>
16-
hq.sso.github.redirect.uri=https://${INTEL_FQDN}/api/v1/auth/sso/success/insights
17-
hq.sso.github.auth.uri=https://github.com/login/oauth/authorize
18-
hq.sso.github.token.uri=https://github.com/login/oauth/access_token
19-
hq.sso.github.info.uri=https://api.github.com/user
20-
hq.sso.github.jwt.set.uri=https://token.actions.githubusercontent.com/.well-known/jwks
21-
hq.sso.github.logout.uri=https://github.com/logout
12+
# hq.sso.github.provider=github
13+
# hq.sso.github.label=GitHub
14+
# hq.sso.github.client.id=Iv1.45b9336a78ce2476
15+
# hq.sso.github.client.secret=c4446ad126ec65b3d926e37de3fe880246aff371
16+
# hq.sso.github.redirect.uri=https://${INTEL_FQDN}/api/v1/auth/sso/success/insights
17+
# hq.sso.github.auth.uri=https://github.com/login/oauth/authorize
18+
# hq.sso.github.token.uri=https://github.com/login/oauth/access_token
19+
# hq.sso.github.info.uri=https://api.github.com/user
20+
# hq.sso.github.jwt.set.uri=https://token.actions.githubusercontent.com/.well-known/jwks
21+
# hq.sso.github.logout.uri=https://github.com/logout
22+
23+
hq.sso.provider=keycloak
24+
hq.sso.client.id=codetogether
25+
hq.sso.client.secret=eFl6XSKwMMsEW1yRTY9pHjBrCTHDEY64
26+
hq.sso.client.issuer.url=http://codetogether-keycloak:8080/realms/codetogether
27+
hq.sso.redirect.uri=https://${INTEL_FQDN}/api/v1/auth/sso/success/insights
28+
hq.sso.client.authentication.method=client_secret_post
29+
30+
# hq.sso.provider=keycloak
31+
# hq.sso.client.id=YOUR_CLIENT_ID
32+
# hq.sso.client.secret=YOUR_CLIENT_SECRET
33+
# hq.sso.client.issuer.url=http://codetogether-keycloak:8080/realms/codetogether
34+
# hq.sso.redirect.uri=https://${INTEL_FQDN}/api/v1/auth/sso/success/insights
35+
# hq.sso.client.authentication.method=client_secret_post
36+
37+
# hq.sso.provider=keycloak
38+
# hq.sso.client.id=YOUR_CLIENT_ID
39+
# hq.sso.client.secret=YOUR_CLIENT_SECRET
40+
# hq.sso.client.issuer.url=http://codetogether-keycloak:8080/realms/codetogether
41+
# hq.sso.redirect.uri=https://${INTEL_FQDN}/api/v1/auth/sso/success/insights
42+
# hq.sso.client.authentication.method=client_secret_post
2243

2344
# These values do not need to be changed, though secrets can be updated
2445
hq.db.type=CASSANDRA

‎compose/keycloak/.env-template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ KEYCLOAK_DB_USERNAME=keycloak
66
KEYCLOAK_DB_PASSWORD=keycloak
77

88
KC_BOOTSTRAP_ADMIN_PASSWORD=keycloak
9-
KC_BOOTSTRAP_ADMIN_USERNAME=admin
9+
KC_BOOTSTRAP_ADMIN_USERNAME=admin

‎compose/nginx/ssl/nginx-with-keycloak.conf.template‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
### To use this file rename it to nginx.conf.template so it is picked up by the compose.yml file.
2+
events {
3+
worker_connections 1024;
4+
}
5+
6+
http {
7+
include mime.types;
8+
default_type application/octet-stream;
9+
sendfile on;
10+
keepalive_timeout 65;
11+
server {
12+
listen 443 ssl http2;
13+
server_name ${COLLAB_FQDN};
14+
proxy_buffer_size 128k;
15+
proxy_buffers 4 256k;
16+
ssl_certificate /etc/nginx/ssl/${SSL_COLLAB_CERT};
17+
ssl_certificate_key /etc/nginx/ssl/${SSL_COLLAB_KEY};
18+
ssl_dhparam /etc/nginx/ssl/${DHPARAM_PEM};
19+
ssl_prefer_server_ciphers on;
20+
ssl_protocols TLSv1.2;
21+
ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
22+
location / {
23+
# Similar proxy logic for headers
24+
set $realIP $remote_addr;
25+
set $forwardTo $proxy_add_x_forwarded_for;
26+
set $reqHost $http_host;
27+
if ($http_x_real_ip != '') {
28+
set $realIP $http_x_real_ip;
29+
}
30+
if ($http_x_forwarded_for != '') {
31+
set $forwardTo $http_x_forwarded_for;
32+
}
33+
add_header C-Real-IP $realIP;
34+
add_header C-Forwarded-For $forwardTo;
35+
add_header C-Request-Host $reqHost;
36+
proxy_set_header X-Real-IP $realIP;
37+
proxy_set_header X-Forwarded-For $forwardTo;
38+
proxy_set_header Host $reqHost;
39+
proxy_set_header X-NginX-Proxy true;
40+
proxy_http_version 1.1;
41+
proxy_redirect off;
42+
proxy_pass http://codetogether-collab:1080;
43+
proxy_set_header Upgrade $http_upgrade;
44+
proxy_set_header Connection "upgrade";
45+
proxy_read_timeout 360;
46+
proxy_connect_timeout 360;
47+
proxy_send_timeout 360;
48+
}
49+
}
50+
server {
51+
server_name ${INTEL_FQDN};
52+
listen 443 ssl http2;
53+
54+
# configure proxy buffer sizes
55+
proxy_buffer_size 128k;
56+
proxy_buffers 4 256k;
57+
58+
# setup the SSL certificate
59+
ssl_certificate /etc/nginx/ssl/${SSL_INTEL_CERT};
60+
ssl_certificate_key /etc/nginx/ssl/${SSL_INTEL_KEY};
61+
ssl_dhparam /etc/nginx/ssl/${DHPARAM_PEM};
62+
ssl_prefer_server_ciphers on;
63+
ssl_protocols TLSv1.2;
64+
ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
65+
66+
# create the passthrough to the CodeTogether Intel container
67+
location / {
68+
69+
# set passthru parameters for the CodeTogether Intel container
70+
set $realIP $remote_addr;
71+
set $forwardTo $proxy_add_x_forwarded_for;
72+
set $reqHost $http_host;
73+
client_max_body_size 32M;
74+
if ($http_x_real_ip != '') {
75+
set $realIP $http_x_real_ip;
76+
}
77+
if ($http_x_forwarded_for != '') {
78+
set $forwardTo $http_x_forwarded_for;
79+
}
80+
proxy_set_header X-Real-IP $realIP;
81+
proxy_set_header X-Forwarded-For $forwardTo;
82+
proxy_set_header Host $reqHost;
83+
84+
# setup the backend to service the HQ requests
85+
proxy_pass http://codetogether-intel:1080;
86+
proxy_set_header X-NginX-Proxy true;
87+
proxy_http_version 1.1;
88+
proxy_redirect off;
89+
proxy_set_header Upgrade $http_upgrade;
90+
proxy_set_header Connection "upgrade";
91+
proxy_read_timeout 360;
92+
proxy_connect_timeout 360;
93+
proxy_send_timeout 360;
94+
}
95+
}
96+
server {
97+
server_name ${KEYCLOAK_FQDN};
98+
listen 443 ssl http2;
99+
100+
# configure proxy buffer sizes
101+
proxy_buffer_size 128k;
102+
proxy_buffers 4 256k;
103+
104+
# setup the SSL certificate
105+
ssl_certificate /etc/nginx/ssl/${SSL_KEYCLOAK_CERT};
106+
ssl_certificate_key /etc/nginx/ssl/${SSL_KEYCLOAK_KEY};
107+
# ssl_dhparam /etc/nginx/ssl/${DHPARAM_PEM};
108+
ssl_prefer_server_ciphers on;
109+
ssl_protocols TLSv1.2;
110+
ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
111+
112+
# create the passthrough to the CodeTogether Intel container
113+
location / {
114+
115+
# set passthru parameters for the CodeTogether Intel container
116+
set $realIP $remote_addr;
117+
set $forwardTo $proxy_add_x_forwarded_for;
118+
set $reqHost $http_host;
119+
client_max_body_size 32M;
120+
if ($http_x_real_ip != '') {
121+
set $realIP $http_x_real_ip;
122+
}
123+
if ($http_x_forwarded_for != '') {
124+
set $forwardTo $http_x_forwarded_for;
125+
}
126+
proxy_set_header X-Real-IP $realIP;
127+
proxy_set_header X-Forwarded-For $forwardTo;
128+
proxy_set_header Host $reqHost;
129+
proxy_set_header X-Forwarded-Proto https;
130+
131+
# setup the backend to service the HQ requests
132+
proxy_pass http://codetogether-keycloak:8080;
133+
proxy_set_header X-NginX-Proxy true;
134+
proxy_http_version 1.1;
135+
proxy_redirect off;
136+
proxy_set_header Upgrade $http_upgrade;
137+
proxy_set_header Connection "upgrade";
138+
proxy_read_timeout 360;
139+
proxy_connect_timeout 360;
140+
proxy_send_timeout 360;
141+
}
142+
}
143+
}

0 commit comments

Comments
 (0)