Skip to content

updating #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PoloOnTheGo merged 4 commits into from
Feb 23, 2022
Merged

updating #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d63222
Merge pull request #14 from JATOS/working_branch_poulami
kristian-lange Jan 14, 2022
a0ec1ab
Configure Google Analytics
kristian-lange Jan 19, 2022
2a61e88
Update JATOS-with-Nginx.md
kristian-lange Jan 25, 2022
ba572b9
Rename label 3.7.1 -> 3.7.x
kristian-lange Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions docusaurus.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const config = {
banner: 'unreleased',
},
'3.7.1': {
label: '3.7.1',
label: '3.7.x',
path: '',
banner: 'none',
},
Expand All @@ -56,6 +56,10 @@ const config = {
theme: {
customCss: require.resolve('./src/css/custom.css'),
},
googleAnalytics: {
trackingID: 'UA-57013276-1',
anonymizeIP: true, // Should IPs be anonymized?
},
}),
],
],
Expand Down Expand Up @@ -137,10 +141,6 @@ const config = {
theme: lightCodeTheme,
darkTheme: darkCodeTheme,
},
googleAnalytics: {
trackingID: 'UA-57013276-1',
anonymizeIP: true, // Should IPs be anonymized?
},
}),
};

Expand Down
4 changes: 2 additions & 2 deletions versioned_docs/version-3.7.1/Serving_the_Internet/JATOS-with-Nginx.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ http {
ssl_prefer_server_ciphers on;

# websocket location (JATOS' group and batch channel and the test page)
location ~ "/(jatos/testWebSocket|publix/[\d]+/(group/join|batch/open))" {
location ~ "/(jatos/testWebSocket|publix/[a-z0-9-]+/(group/join|batch/open))" {
proxy_pass http://jatos-backend;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
Expand Down Expand Up @@ -172,7 +172,7 @@ http {
server_name www.example.com;

# websocket location (JATOS' group and batch channel and the test page)
location ~ "^/(jatos/testWebSocket|publix/[\d]+/(group/join|batch/open))" {
location ~ "^/(jatos/testWebSocket|publix/[a-z0-9-]+/(group/join|batch/open))" {
proxy_pass http://jatos-backend;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
Expand Down