Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
holi-chat-server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Operate
Terraform modules
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
app
holi-chat-server
Commits
a5e86fd4
Commit
a5e86fd4
authored
5 months ago
by
Malte Finsterwalder
Browse files
Options
Downloads
Plain Diff
Merge branch 'main' into production
parents
f9848e27
180801cc
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
data-push-gateway/sygnal.yaml.template
+4
-0
4 additions, 0 deletions
data-push-gateway/sygnal.yaml.template
terraform/environments/deployment_server.tf
+1
-0
1 addition, 0 deletions
terraform/environments/deployment_server.tf
with
5 additions
and
0 deletions
data-push-gateway/sygnal.yaml.template
+
4
−
0
View file @
a5e86fd4
...
@@ -210,6 +210,10 @@ apps:
...
@@ -210,6 +210,10 @@ apps:
api_version: v1
api_version: v1
project_id: holi-shared
project_id: holi-shared
service_account_file: ${FCM_KEYFILE}
service_account_file: ${FCM_KEYFILE}
fcm_options:
notification:
title: 'holi Chat'
body: 'You have a new message or invitation'
#
#
# # This is the maximum number of connections to GCM servers at any one time
# # This is the maximum number of connections to GCM servers at any one time
# # the default is 20.
# # the default is 20.
...
...
This diff is collapsed.
Click to expand it.
terraform/environments/deployment_server.tf
+
1
−
0
View file @
a5e86fd4
...
@@ -139,6 +139,7 @@ resource "google_cloud_run_service" "chat_server" {
...
@@ -139,6 +139,7 @@ resource "google_cloud_run_service" "chat_server" {
# possible values: all-traffic/private-ranges-only(default) https://cloud.google.com/sdk/gcloud/reference/run/services/update#--vpc-egress
# possible values: all-traffic/private-ranges-only(default) https://cloud.google.com/sdk/gcloud/reference/run/services/update#--vpc-egress
# this needs to be set to all-traffic in order to route a cloud run url correctly, since it does resolve to a non-private ip address.
# this needs to be set to all-traffic in order to route a cloud run url correctly, since it does resolve to a non-private ip address.
"run.googleapis.com/vpc-access-egress"
=
"all-traffic"
"run.googleapis.com/vpc-access-egress"
=
"all-traffic"
"run.googleapis.com/startup-cpu-boost"
=
"true"
}
}
# labels set on the revision level
# labels set on the revision level
labels
=
{
labels
=
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment