Skip to content

[Automated] Merge 5.x into master #264

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
bytestream merged 2 commits into from
Jul 21, 2025
Merged

[Automated] Merge 5.x into master #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
000e818
chore(linux): drop ubuntu focal support (#261)
bytestream Jun 16, 2025
b6294ba
fix(docker-compose): update ws nginx config (#263)
bytestream Jul 21, 2025
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
1 change: 0 additions & 1 deletion .github/workflows/linux-verify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
os:
- quay.io/centos/centos:stream9
- quay.io/centos/centos:stream10
- ubuntu:20.04
- ubuntu:22.04
- ubuntu:24.04
- debian:11
Expand Down
5 changes: 4 additions & 1 deletion configs/gateway/base.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ location ~ \.php($|/) {

location @ws {
proxy_pass http://${WS_SERVICE_NAME}:6001;
proxy_set_header Host $host;
proxy_read_timeout 60;
proxy_connect_timeout 60;
proxy_redirect off;
Expand All @@ -56,5 +55,9 @@ location @ws {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header Host $host;
proxy_set_header Scheme $scheme;
proxy_set_header SERVER_PORT $server_port;
proxy_set_header REMOTE_ADDR $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_cache_bypass $http_upgrade;
}
4 changes: 2 additions & 2 deletions templates/linux/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version="0.6.0"

supported="The following Linux OSs are supported, on x86_64 only:
* RHEL 9, 10
* Ubuntu 20.04 LTS (focal), 22.04 LTS (jammy) & 24.04 LTS (noble)
* Ubuntu 22.04 LTS (jammy) & 24.04 LTS (noble)
* Debian 11 (bullseye) & 12 (bookworm)"

usage="Usage: curl -LsS https://raw.githubusercontent.com/supportpal/helpdesk-install/master/templates/linux/setup.sh | sudo bash -s -- [options]
Expand Down Expand Up @@ -107,7 +107,7 @@ identify_os() {
trusty) error 'Ubuntu version 14.04 LTS has reached End of Life and is no longer supported.' ;;
xenial) error 'Ubuntu version 16.04 LTS has reached End of Life and is no longer supported.' ;;
bionic) error 'Ubuntu version 18.04 LTS has reached End of Life and is no longer supported.' ;;
focal) ;;
focal) error 'Ubuntu version 20.04 LTS has reached End of Life and is no longer supported.' ;;
jammy) ;;
noble) ;;
*) error "Detected Ubuntu but version ($os_version) is not supported." "Only Ubuntu LTS releases are supported." ;;
Expand Down
Loading